Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/hwclock.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/hwclock.c (modified) (4 diffs)

branches/3.3/mindi-busybox/util-linux/hwclock.c

@@ -70 +70 @@
 #else
     char *cp = ctime(&t);
-    strchrnul(cp, '\n')[0] = '\0';
+    chomp(cp);
 #endif
 
@@ -98 +98 @@
     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;
 
@@ -249 +253 @@
     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;
@@ -306 +310 @@
     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);