From 3732dd355dce17c54c47d51c16da4318774bf9e3 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 21 May 2017 01:07:20 +0200 Subject: mscan: use %H:%M timestamp for all mails newer than 24h --- mscan.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'mscan.c') diff --git a/mscan.c b/mscan.c index d6607f3..9264587 100644 --- a/mscan.c +++ b/mscan.c @@ -29,7 +29,7 @@ static int alias_idx; static int Iflag; static int nflag; static int curyear; -static int curyday; +static time_t now; static char default_fflag[] = "%c%u%r %-3n %10d %17f %t %2i%s"; static char *fflag = default_fflag; @@ -137,14 +137,14 @@ fmt_date(struct message *msg, int w, int iso) } else if (w < 10) { if (tm->tm_year != curyear) strftime(date, sizeof date, "%b%y", tm); - else if (tm->tm_yday != curyday) + else if (t > now || now - t > 86400) strftime(date, sizeof date, "%d%b", tm); else strftime(date, sizeof date, "%H:%M", tm); } else { if (tm->tm_year != curyear) strftime(date, sizeof date, "%Y-%m-%d", tm); - else if (tm->tm_yday != curyday) + else if (t > now || now - t > 86400) strftime(date, sizeof date, "%a %b %e", tm); else strftime(date, sizeof date, "%a %H:%M", tm); @@ -507,10 +507,9 @@ main(int argc, char *argv[]) return 0; } - time_t now = time(0); + now = time(0); struct tm *tm = localtime(&now); curyear = tm->tm_year; - curyday = tm->tm_yday; setlocale(LC_ALL, ""); // for wcwidth later if (wcwidth(0xfffd) > 0) -- cgit 1.4.1