From a269665db0cdfafe306624e8bad6a2385bab95af Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 6 Sep 1996 03:18:46 +0000 Subject: [PATCH] revert last change --- lib/strftime.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/lib/strftime.c b/lib/strftime.c index 8b7f2a887..abcae166c 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -472,37 +472,27 @@ strftime (s, maxsize, format, tp) case 'z': { struct tm tml = *tp; + time_t t = mktime (&tml); struct tm tmg; - time_t t; - time_t offset = 0; int diff; - t = __mktime_internal (&tml, __localtime_r, &offset); + tml = *localtime (&t); /* Canonicalize the local time. */ + tmg = *gmtime (&t); - /* Canonicalize the local time. */ - if (t == (time_t) -1 || __localtime_r (&t, &tml) == NULL) - /* We didn't managed to get the local time. Assume it - GMT as a reasonable default value. */ - diff = 0; - else + /* Compute the difference. */ + diff = tml.tm_min - tmg.tm_min; + diff += 60 * (tml.tm_hour - tmg.tm_hour); + + if (tml.tm_mon != tmg.tm_mon) { - __gmtime_r (&t, &tmg); - - /* Compute the difference. */ - diff = tml.tm_min - tmg.tm_min; - diff += 60 * (tml.tm_hour - tmg.tm_hour); - - if (tml.tm_mon != tmg.tm_mon) - { - /* We assume no timezone differs from UTC by more - than +- 23 hours. This should be safe. */ - if (tmg.tm_mday == 1) - tml.tm_mday = 0; - else /* tml.tm_mday == 1 */ - tmg.tm_mday = 0; - } - diff += 1440 * (tml.tm_mday - tmg.tm_mday); + /* We assume no timezone differs from UTC by more than + +- 23 hours. This should be safe. */ + if (tmg.tm_mday == 1) + tml.tm_mday = 0; + else /* tml.tm_mday == 1 */ + tmg.tm_mday = 0; } + diff += 1440 * (tml.tm_mday - tmg.tm_mday); if (diff < 0) { -- 2.11.0