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

Fix print_date()

Browse Source 
In print_date(date, day, ...) it is silently assumed that day is
midnight (beginning) of the day to be printed. Assume only that it
belongs to the day.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen 2018-11-14 19:04:39 +01:00 committed by Lukas Fleischer
parent ad183c61a9
commit daa30ef3bb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/utils.c
View File

@ -1593,7 +1593,10 @@ static enum format_specifier parse_fs(const char **s, char *extformat)
} }
} }
/* Print a formatted date to stdout. */ /*
* Print date to stdout, formatted to be displayed for day.
* The "day" argument may be any time belonging to that day.
*/
static void print_date(long date, long day, const char *extformat) static void print_date(long date, long day, const char *extformat)
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];
@ -1601,14 +1604,14 @@ static void print_date(long date, long day, const char *extformat)
if (!strcmp(extformat, "epoch")) { if (!strcmp(extformat, "epoch")) {
printf("%ld", date); printf("%ld", date);
} else { } else {
time_t day_end = date_sec_change(day, 0, 1); time_t day_start = update_time_in_date(day, 0, 0);
time_t t = date; time_t day_end = date_sec_change(day_start, 0, 1);
struct tm lt; struct tm lt;
localtime_r((time_t *) & t, &lt); localtime_r((time_t *) &date, &lt);
if (extformat[0] == '\0' || !strcmp(extformat, "default")) { if (extformat[0] == '\0' || !strcmp(extformat, "default")) {
if (date >= day && date <= day_end) if (date >= day_start && date <= day_end)
strftime(buf, BUFSIZ, "%H:%M", &lt); strftime(buf, BUFSIZ, "%H:%M", &lt);
else else
strftime(buf, BUFSIZ, "..:..", &lt); strftime(buf, BUFSIZ, "..:..", &lt);