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

Do not assume that days always have 86400 seconds

Browse Source 
Make that date membership is computed correctly, even if a day has less
than 86400 seconds (e.g. after changing clocks).

Reported-by: Hakan Jerning <jerning@home.se>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer
2016-03-27 12:54:10 +02:00
parent e1b6d22669
commit 9e160fac16
8 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/recur.c
View File

@@ -683,7 +683,7 @@ static long diff_years(struct tm lt_start, struct tm lt_end)
static int exc_inday(struct excp *exc, long *day_start)
{
return (exc->st >= *day_start && exc->st < *day_start + DAYINSEC);
return (date_cmp_day(exc->st, *day_start) == 0);
}
/*
@@ -706,7 +706,7 @@ recur_item_find_occurrence(long item_start, long item_dur,
struct tm lt_day, lt_item, lt_item_day;
time_t t;
if (day_start < item_start - DAYINSEC + 1)
if (date_cmp_day(day_start, item_start) < 0)
return 0;
if (rpt_until != 0 && day_start >= rpt_until + item_dur)