summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2014-02-25 16:52:10 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2014-02-25 16:52:10 (GMT)
commit589051b56553788546c757a0b38996a1a8c49a11 (patch)
tree8a7ec2641575fe56d558409eb1e6eddfea2e1b2f
parent18b699c30f1cd2d55bd094c10c44cfc3102f895c (diff)
downloadbusybox-589051b56553788546c757a0b38996a1a8c49a11.tar.gz
busybox-589051b56553788546c757a0b38996a1a8c49a11.tar.bz2
hwclock: fix setting of tz_minuteswest. Closes 5414
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--util-linux/hwclock.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 379eeb2..3f53155 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -97,7 +97,11 @@ static void to_sys_clock(const char **pp_rtcname, int utc)
struct timeval tv;
struct timezone tz;
- tz.tz_minuteswest = timezone/60 - 60*daylight;
+ tz.tz_minuteswest = timezone/60;
+ /* ^^^ used to also subtract 60*daylight, but it's wrong:
+ * daylight!=0 means "this timezone has some DST
+ * during the year", not "DST is in effect now".
+ */
tz.tz_dsttime = 0;
tv.tv_sec = read_rtc(pp_rtcname, NULL, utc);
@@ -248,7 +252,7 @@ static void set_system_clock_timezone(int utc)
gettimeofday(&tv, NULL);
broken = localtime(&tv.tv_sec);
tz.tz_minuteswest = timezone / 60;
- if (broken->tm_isdst)
+ if (broken->tm_isdst > 0)
tz.tz_minuteswest -= 60;
tz.tz_dsttime = 0;
gettimeofday(&tv, NULL);
@@ -305,6 +309,10 @@ int hwclock_main(int argc UNUSED_PARAM, char **argv)
;
applet_long_options = hwclock_longopts;
#endif
+
+ /* Initialize "timezone" (libc global variable) */
+ tzset();
+
opt_complementary = "r--wst:w--rst:s--wrt:t--rsw:l--u:u--l";
opt = getopt32(argv, "lurswtf:", &rtcname);