ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

timeutils: match today day and this year correctly 

Assumption all years since 1970 have been exactly 365 days long has it's
problems when leap years happen.  Lets use struct tm fields that are
provided by localtime_r(), making year and day to be correctly compared even
when it's late new years eve somewhere else than UTC-0.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2019-01-05 21:32:23 +00:00
parent 1a83c00d88
commit d393c00c6c
No known key found for this signature in database
GPG Key ID: 0D46FEF7E61DBB46
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/timeutils.h
View File

@ -82,9 +82,6 @@ int strtime_iso(const time_t *t, int flags, char *buf, size_t bufsz);
#define UL_SHORTTIME_THISYEAR_HHMM (1 << 1)
int time_is_today(const time_t *t, struct timeval *now);
int time_is_thisyear(const time_t *t, struct timeval *now);
int strtime_short(const time_t *t, struct timeval *now, int flags, char *buf, size_t bufsz);
#ifndef HAVE_TIMEGM

27
lib/timeutils.c
View File

@ -503,34 +503,37 @@ int strtime_iso(const time_t *t, int flags, char *buf, size_t bufsz)
}
/* relative time functions */
int time_is_today(const time_t *t, struct timeval *now)
static inline int time_is_thisyear(struct tm const *const tm,
struct tm const *const tmnow)
{
if (now->tv_sec == 0)
gettimeofday(now, NULL);
return *t / (3600 * 24) == now->tv_sec / (3600 * 24);
return tm->tm_year == tmnow->tm_year;
}
int time_is_thisyear(const time_t *t, struct timeval *now)
static inline int time_is_today(struct tm const *const tm,
struct tm const *const tmnow)
{
if (now->tv_sec == 0)
gettimeofday(now, NULL);
return *t / (3600 * 24 * 365) == now->tv_sec / (3600 * 24 * 365);
return (tm->tm_yday == tmnow->tm_yday &&
time_is_thisyear(tm, tmnow));
}
int strtime_short(const time_t *t, struct timeval *now, int flags, char *buf, size_t bufsz)
{
struct tm tm;
struct tm tm, tmnow;
int rc = 0;
localtime_r(t, &tm);
if (now->tv_sec == 0)
gettimeofday(now, NULL);
if (time_is_today(t, now)) {
localtime_r(t, &tm);
localtime_r(&now->tv_sec, &tmnow);
if (time_is_today(&tm, &tmnow)) {
rc = snprintf(buf, bufsz, "%02d:%02d", tm.tm_hour, tm.tm_min);
if (rc < 0 || (size_t) rc > bufsz)
return -1;
rc = 1;
} else if (time_is_thisyear(t, now)) {
} else if (time_is_thisyear(&tm, &tmnow)) {
if (flags & UL_SHORTTIME_THISYEAR_HHMM)
rc = strftime(buf, bufsz, "%b%d/%H:%M", &tm);
else