fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle dates past January 19th, 2038

Browse Source 
Try to support dates past year 2038 on systems with 64-bit time_t.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2015-01-19 23:47:55 +01:00
parent 4fd8f0b11e
commit a12833ec08
5 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/args.c
View File

@@ -310,7 +310,7 @@ date_arg_from_to(long from, long to, int add_line, const char *fmt_apt,
}
}
static int parse_datearg(const char *str)
static long parse_datearg(const char *str)
{
struct date day;
@@ -329,7 +329,7 @@ static int parse_datearg(const char *str)
return -1;
}
static int parse_datetimearg(const char *str)
static long parse_datetimearg(const char *str)
{
char *date = mem_strdup(str);
char *time;

8
src/ui-calendar.c
View File

@@ -630,9 +630,7 @@ void ui_calendar_change_day(int datefmt)
char *outstr;
int dday, dmonth, dyear;
int wrong_day = 1;
const char *mesg_line1 =
_("The day you entered is not valid "
"(should be between 01/01/1902 and 12/31/2037)");
const char *mesg_line1 = _("The day you entered is not valid");
const char *mesg_line2 = _("Press [ENTER] to continue");
const char *request_date =
_("Enter the day to go to [ENTER for today] : %s");
@@ -739,10 +737,6 @@ void ui_calendar_move(enum move move, int count)
t.tm_mday = 1;
t.tm_mon = 0;
t.tm_year = 2;
} else if (t.tm_year > 137) {
t.tm_mday = 31;
t.tm_mon = 11;
t.tm_year = 137;
}
slctd_day.dd = t.tm_mday;

6
src/utils.c
View File

@@ -651,10 +651,8 @@ char *new_tempfile(const char *prefix)
*/
int check_date(unsigned year, unsigned month, unsigned day)
{
return (year >= 1902 && year <= 2037 && month >= 1 && month <= 12
&& day >= 1 && day <= days[month - 1] + (month == 2
&& ISLEAP(year)) ?
1 : 0);
return (year >= 1902 && month >= 1 && month <= 12 && day >= 1 &&
day <= days[month - 1] + (month == 2 && ISLEAP(year)) ? 1 : 0);
}
/*