diff options
| author | Lars Henriksen <LarsHenriksen@get2net.dk> | 2018-10-30 19:53:55 +0100 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@calcurse.org> | 2018-11-10 12:19:28 +0100 |
| commit | e6cffdc6bd58e0ddefbb0b21e8bbe841963bce48 (patch) | |
| tree | 68855a9ab9bd9daae131588ba24b85fe24658aac /src | |
| parent | 4263a2850431b7328699c713b4e97667f9ba02e2 (diff) | |
| download | calcurse-e6cffdc6bd58e0ddefbb0b21e8bbe841963bce48.tar.gz calcurse-e6cffdc6bd58e0ddefbb0b21e8bbe841963bce48.zip | |
DST fix: daylength v. DAYINSEC
The number of seconds in a day and daylength in seconds differ when
Daylight Saving Time is in effect on two days of the year. The day when DST
takes effect is 23 hours long, and the day when DST ends is 25 hours long.
In the latter case the date changing thread wóuld enter a loop in the last hour
before midnight (in the former it would set the date an hour too late).
The next midnight is calculated through mktime(), invoked by date2sec().
Wrong daylength prevented appointments from being stored in the day vector and
caused them to be displayed wrongly in the appts panel.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/apoint.c | 2 | ||||
| -rw-r--r-- | src/calcurse.h | 6 | ||||
| -rw-r--r-- | src/day.c | 2 | ||||
| -rw-r--r-- | src/ui-calendar.c | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/src/apoint.c b/src/apoint.c index c485477..d200cf3 100644 --- a/src/apoint.c +++ b/src/apoint.c @@ -137,7 +137,7 @@ void apoint_sec2str(struct apoint *o, long day, char *start, char *end) snprintf(start, HRMIN_SIZE, "%02u:%02u", lt.tm_hour, lt.tm_min); } - if (o->start + o->dur > day + DAYINSEC) { + if (o->start + o->dur > day + DAYLEN(day)) { strncpy(end, "..:..", 6); } else { t = o->start + o->dur; diff --git a/src/calcurse.h b/src/calcurse.h index fb20da7..616d954 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -144,7 +144,13 @@ #define WEEKINMIN (WEEKINHOURS * HOURINMIN) #define WEEKINSEC (WEEKINMIN * MININSEC) #define DAYINMIN (DAYINHOURS * HOURINMIN) +/* + * Note the difference between the number of seconds in a day and daylength + * in seconds. The two may differ when DST is in effect (daylength is either + * 23, 24 or 25 hours. The argument to DAYLEN is of type time_t. + */ #define DAYINSEC (DAYINMIN * MININSEC) +#define DAYLEN(date) (date_sec_change((date), 0, 1) - (date)) #define HOURINSEC (HOURINMIN * MININSEC) #define MAXDAYSPERMONTH 31 @@ -294,7 +294,7 @@ static int day_store_apoints(long date) p.apt = apt; - if (apt->start >= date + DAYINSEC) + if (apt->start >= date + DAYLEN(date)) break; day_add_item(APPT, apt->start, p); diff --git a/src/ui-calendar.c b/src/ui-calendar.c index 7d464dd..a668efb 100644 --- a/src/ui-calendar.c +++ b/src/ui-calendar.c @@ -97,7 +97,7 @@ static void *ui_calendar_date_thread(void *arg) time_t actual, tomorrow; for (;;) { - tomorrow = (time_t) (get_today() + DAYINSEC); + tomorrow = date2sec(today, 24, 0); while ((actual = time(NULL)) < tomorrow) sleep(tomorrow - actual); |