diff options
| author | Lukas Fleischer <lfleischer@calcurse.org> | 2016-03-27 12:54:10 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@calcurse.org> | 2016-03-27 13:06:18 +0200 |
| commit | 9e160fac16e81c42ac368f450b9cc4df29753e00 (patch) | |
| tree | 9fe79f9b549f840b0d93cdfd79554e32f8e62dc1 /src | |
| parent | e1b6d226692ddaa8a9f077796a23317d36cd5d10 (diff) | |
| download | calcurse-9e160fac16e81c42ac368f450b9cc4df29753e00.zip | |
Do not assume that days always have 86400 seconds
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/apoint.c | 3 | ||||
| -rw-r--r-- | src/calcurse.h | 1 | ||||
| -rw-r--r-- | src/event.c | 2 | ||||
| -rw-r--r-- | src/recur.c | 4 | ||||
| -rw-r--r-- | src/utils.c | 24 |
5 files changed, 29 insertions, 5 deletions
diff --git a/src/apoint.c b/src/apoint.c index cb23ead..409e889 100644 --- a/src/apoint.c +++ b/src/apoint.c @@ -119,8 +119,7 @@ struct apoint *apoint_new(char *mesg, char *note, long start, long dur, unsigned apoint_inday(struct apoint *i, long *start) { - return (i->start <= *start + DAYINSEC - && i->start + i->dur > *start); + return (date_cmp_day(i->start, *start) == 0); } void apoint_sec2str(struct apoint *o, long day, char *start, char *end) diff --git a/src/calcurse.h b/src/calcurse.h index d337145..3aab885 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -1111,6 +1111,7 @@ int get_item_min(long); struct tm date2tm(struct date, unsigned, unsigned); time_t date2sec(struct date, unsigned, unsigned); time_t utcdate2sec(struct date, unsigned, unsigned); +int date_cmp_day(time_t, time_t); char *date_sec2date_str(long, const char *); void date_sec2date_fmt(long, const char *, char *); int date_change(struct tm *, int, int); diff --git a/src/event.c b/src/event.c index ad26f19..4f6965c 100644 --- a/src/event.c +++ b/src/event.c @@ -107,7 +107,7 @@ struct event *event_new(char *mesg, char *note, long day, int id) /* Check if the event belongs to the selected day */ unsigned event_inday(struct event *i, long *start) { - return (i->day < *start + DAYINSEC && i->day >= *start); + return (date_cmp_day(i->day, *start) == 0); } char *event_tostr(struct event *o) diff --git a/src/recur.c b/src/recur.c index 186acbe..10a2623 100644 --- a/src/recur.c +++ b/src/recur.c @@ -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) diff --git a/src/utils.c b/src/utils.c index 4300b59..50f2507 100644 --- a/src/utils.c +++ b/src/utils.c @@ -418,6 +418,30 @@ time_t utcdate2sec(struct date day, unsigned hour, unsigned min) return t; } +/* Compare two dates (without comparing times). */ +int date_cmp_day(time_t d1, time_t d2) +{ + struct tm lt1, lt2; + + localtime_r((time_t *)&d1, <1); + localtime_r((time_t *)&d2, <2); + + if (lt1.tm_year < lt2.tm_year) + return -1; + if (lt1.tm_year > lt2.tm_year) + return 1; + if (lt1.tm_mon < lt2.tm_mon) + return -1; + if (lt1.tm_mon > lt2.tm_mon) + return 1; + if (lt1.tm_mday < lt2.tm_mday) + return -1; + if (lt1.tm_mday > lt2.tm_mday) + return 1; + + return 0; +} + /* Return a string containing the date, given a date in seconds. */ char *date_sec2date_str(long sec, const char *datefmt) { |