diff options
| author | Sami Kerola | 2016-07-10 21:09:55 +0200 |
|---|---|---|
| committer | Sami Kerola | 2017-02-03 23:31:18 +0100 |
| commit | 12f1cdda3d49ccb8bed8703247270b5d13d1b257 (patch) | |
| tree | 0fde7509e9bb347f97a077577abb75be51bdd032 /sys-utils/hwclock.c | |
| parent | libmount: make rootfs lookup by parent-id more robust (diff) | |
| download | kernel-qcow2-util-linux-12f1cdda3d49ccb8bed8703247270b5d13d1b257.tar.gz kernel-qcow2-util-linux-12f1cdda3d49ccb8bed8703247270b5d13d1b257.tar.xz kernel-qcow2-util-linux-12f1cdda3d49ccb8bed8703247270b5d13d1b257.zip | |
hwclock: remove UTC-0 localization hack
Use timegm(3) instead rather than re-implement same functionality with
mktime(3) combined with removal of TZ localization.
Reviewed-by: J William Piggott <elseifthen@gmx.com>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'sys-utils/hwclock.c')
| -rw-r--r-- | sys-utils/hwclock.c | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index 10d9e37e9..1d193a5da 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -389,27 +389,11 @@ static void mktime_tz(struct tm tm, const bool universal, bool * valid_p, time_t * systime_p) { - time_t mktime_result; /* The value returned by our mktime() call */ - char *zone; /* Local time zone name */ - - /* - * We use the C library function mktime(), but since it only works - * on local time zone input, we may have to fake it out by - * temporarily changing the local time zone to UTC. - */ - zone = getenv("TZ"); /* remember original time zone */ - if (universal) { - /* Set timezone to UTC */ - xsetenv("TZ", "", TRUE); - /* - * Note: tzset() gets called implicitly by the time code, - * but only the first time. When changing the environment - * variable, better call tzset() explicitly. - */ - tzset(); - } - mktime_result = mktime(&tm); - if (mktime_result == -1) { + if (universal) + *systime_p = timegm(&tm); + else + *systime_p = mktime(&tm); + if (*systime_p == -1) { /* * This apparently (not specified in mktime() documentation) * means the 'tm' structure does not contain valid values @@ -417,7 +401,6 @@ mktime_tz(struct tm tm, const bool universal, * mktime() returns -1). */ *valid_p = FALSE; - *systime_p = 0; if (debug) printf(_("Invalid values in hardware clock: " "%4d/%.2d/%.2d %.2d:%.2d:%.2d\n"), @@ -425,7 +408,6 @@ mktime_tz(struct tm tm, const bool universal, tm.tm_hour, tm.tm_min, tm.tm_sec); } else { *valid_p = TRUE; - *systime_p = mktime_result; if (debug) printf(_ ("Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = " @@ -433,12 +415,6 @@ mktime_tz(struct tm tm, const bool universal, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, (long)*systime_p); } - /* now put back the original zone. */ - if (zone) - xsetenv("TZ", zone, TRUE); - else - unsetenv("TZ"); - tzset(); } /* |