Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/hwclock.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

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

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

@@ -44 +44 @@
             rtc_read_tm(&tm_time, fd);
             gettimeofday(sys_tv, NULL);
-            if (before != tm_time.tm_sec)
+            if (before != (int)tm_time.tm_sec)
                 break;
         }
@@ -61 +61 @@
     struct timeval sys_tv;
 #endif
-    time_t t;
-    char *cp;
-
-    t = read_rtc(pp_rtcname, &sys_tv, utc);
-    cp = ctime(&t);
+    time_t t = read_rtc(pp_rtcname, &sys_tv, utc);
+
+#if ENABLE_LOCALE_SUPPORT
+    /* Standard hwclock uses locale-specific output format */
+    char cp[64];
+    struct tm *ptm = localtime(&t);
+    strftime(cp, sizeof(cp), "%c", ptm);
+#else
+    char *cp = ctime(&t);
     strchrnul(cp, '\n')[0] = '\0';
+#endif
+
 #if !SHOW_HWCLOCK_DIFF
     printf("%s  0.000000 seconds\n", cp);
@@ -73 +79 @@
         long diff = sys_tv.tv_sec - t;
         if (diff < 0 /*&& tv.tv_usec != 0*/) {
-            /* Why? */
-            /* diff >= 0 is ok:   diff < 0, can't just use tv.tv_usec: */
-            /*   45.520820          43.520820 */
-            /* - 44.000000        - 45.000000 */
-            /* =  1.520820        = -1.479180, not -2.520820! */
+            /* Why we need diff++? */
+            /* diff >= 0 is ok: | diff < 0, can't just use tv.tv_usec: */
+            /*   45.520820      |   43.520820 */
+            /* - 44.000000      | - 45.000000 */
+            /* =  1.520820      | = -1.479180, not -2.520820! */
             diff++;
-            /* should be 1000000 - tv.tv_usec, but then we must check tv.tv_usec != 0 */
+            /* Should be 1000000 - tv.tv_usec, but then we must check tv.tv_usec != 0 */
             sys_tv.tv_usec = 999999 - sys_tv.tv_usec;
         }
@@ -224 +230 @@
 }
 
+/*
+ * At system boot, kernel may set system time from RTC,
+ * but it knows nothing about timezones. If RTC is in local time,
+ * then system time is wrong - it is offset by timezone.
+ * This option corrects system time if RTC is in local time,
+ * and (always) sets in-kernel timezone.
+ *
+ * This is an alternate option to --hctosys that does not read the
+ * hardware clock.
+ */
+static void set_system_clock_timezone(int utc)
+{
+    struct timeval tv;
+    struct tm *broken;
+    struct timezone tz;
+
+    gettimeofday(&tv, NULL);
+    broken = localtime(&tv.tv_sec);
+    tz.tz_minuteswest = timezone / 60;
+    if (broken->tm_isdst)
+        tz.tz_minuteswest -= 60;
+    tz.tz_dsttime = 0;
+    gettimeofday(&tv, NULL);
+    if (!utc)
+        tv.tv_sec += tz.tz_minuteswest * 60;
+    if (settimeofday(&tv, &tz))
+        bb_perror_msg_and_die("settimeofday");
+}
+
+//usage:#define hwclock_trivial_usage
+//usage:    IF_FEATURE_HWCLOCK_LONG_OPTIONS(
+//usage:       "[-r|--show] [-s|--hctosys] [-w|--systohc] [-t|--systz]"
+//usage:       " [-l|--localtime] [-u|--utc]"
+//usage:       " [-f|--rtc FILE]"
+//usage:    )
+//usage:    IF_NOT_FEATURE_HWCLOCK_LONG_OPTIONS(
+//usage:       "[-r] [-s] [-w] [-t] [-l] [-u] [-f FILE]"
+//usage:    )
+//usage:#define hwclock_full_usage "\n\n"
+//usage:       "Query and set hardware clock (RTC)\n"
+//usage:     "\n    -r  Show hardware clock time"
+//usage:     "\n    -s  Set system time from hardware clock"
+//usage:     "\n    -w  Set hardware clock from system time"
+//usage:     "\n    -t  Set in-kernel timezone, correct system time"
+//usage:     "\n        if hardware clock is in local time"
+//usage:     "\n    -u  Assume hardware clock is kept in UTC"
+//usage:     "\n    -l  Assume hardware clock is kept in local time"
+//usage:     "\n    -f FILE Use specified device (e.g. /dev/rtc2)"
+
 #define HWCLOCK_OPT_LOCALTIME   0x01
 #define HWCLOCK_OPT_UTC         0x02
@@ -229 +284 @@
 #define HWCLOCK_OPT_HCTOSYS     0x08
 #define HWCLOCK_OPT_SYSTOHC     0x10
-#define HWCLOCK_OPT_RTCFILE     0x20
+#define HWCLOCK_OPT_SYSTZ       0x20
+#define HWCLOCK_OPT_RTCFILE     0x40
 
 int hwclock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -240 +296 @@
 #if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS
     static const char hwclock_longopts[] ALIGN1 =
-        "localtime\0" No_argument "l"
+        "localtime\0" No_argument "l" /* short opt is non-standard */
         "utc\0"       No_argument "u"
         "show\0"      No_argument "r"
         "hctosys\0"   No_argument "s"
         "systohc\0"   No_argument "w"
-        "file\0"      Required_argument "f"
+        "systz\0"     No_argument "t" /* short opt is non-standard */
+        "rtc\0"       Required_argument "f"
         ;
     applet_long_options = hwclock_longopts;
 #endif
-    opt_complementary = "r--ws:w--rs:s--wr:l--u:u--l";
-    opt = getopt32(argv, "lurswf:", &rtcname);
+    opt_complementary = "r--wst:w--rst:s--wrt:t--rsw:l--u:u--l";
+    opt = getopt32(argv, "lurswtf:", &rtcname);
 
     /* If -u or -l wasn't given check if we are using utc */
@@ -262 +319 @@
     else if (opt & HWCLOCK_OPT_SYSTOHC)
         from_sys_clock(&rtcname, utc);
+    else if (opt & HWCLOCK_OPT_SYSTZ)
+        set_system_clock_timezone(utc);
     else
         /* default HWCLOCK_OPT_SHOW */