mkfs_ext2: further work by Vladimir

[oweals/busybox.git] / util-linux / hwclock.c

diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index f91379bed90f8b1b224326445e38d49b43d8fdba..6dff57f094a5ff9192337f6c3278938cbf960642 100644 (file)
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -7,25 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
 */
 
-#include <sys/utsname.h>
-#include <getopt.h>
 #include "libbb.h"
-
-/* Copied from linux/rtc.h to eliminate the kernel dependency */
-struct linux_rtc_time {
-       int tm_sec;
-       int tm_min;
-       int tm_hour;
-       int tm_mday;
-       int tm_mon;
-       int tm_year;
-       int tm_wday;
-       int tm_yday;
-       int tm_isdst;
-};
-
-#define RTC_SET_TIME   _IOW('p', 0x0a, struct linux_rtc_time) /* Set RTC time    */
-#define RTC_RD_TIME    _IOR('p', 0x09, struct linux_rtc_time) /* Read RTC time   */
+/* After libbb.h, since it needs sys/types.h on some systems */
+#include <sys/utsname.h>
+#include "rtc_.h"
 
 #if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS
 # ifndef _GNU_SOURCE
@@ -35,58 +20,27 @@ struct linux_rtc_time {
 
 static const char *rtcname;
 
-static int xopen_rtc(int flags)
-{
-       int rtc;
-
-       if (!rtcname) {
-               rtc = open("/dev/rtc", flags);
-               if (rtc >= 0)
-                       return rtc;
-               rtc = open("/dev/rtc0", flags);
-               if (rtc >= 0)
-                       return rtc;
-               rtcname = "/dev/misc/rtc";
-       }
-       return xopen(rtcname, flags);
-}
-
 static time_t read_rtc(int utc)
 {
-       struct tm tm;
-       char *oldtz = 0;
-       time_t t = 0;
-       int rtc = xopen_rtc(O_RDONLY);
-
-       memset(&tm, 0, sizeof(struct tm));
-       xioctl(rtc, RTC_RD_TIME, &tm);
-       tm.tm_isdst = -1; /* not known */
+       time_t ret;
+       int fd;
 
-       close(rtc);
+       fd = rtc_xopen(&rtcname, O_RDONLY);
+       ret = rtc_read_time(fd, utc);
+       close(fd);
 
-       if (utc) {
-               oldtz = getenv("TZ");
-               putenv((char*)"TZ=UTC0");
-               tzset();
-       }
-
-       t = mktime(&tm);
-
-       if (utc) {
-               unsetenv("TZ");
-               if (oldtz)
-                       putenv(oldtz - 3);
-               tzset();
-       }
-       return t;
+       return ret;
 }
 
 static void write_rtc(time_t t, int utc)
 {
        struct tm tm;
-       int rtc = xopen_rtc(O_WRONLY);
+       int rtc = rtc_xopen(&rtcname, O_WRONLY);
 
-       tm = *(utc ? gmtime(&t) : localtime(&t));
+       if (utc)
+               gmtime_r(&t, &tm);
+       else
+               localtime_r(&t, &tm);
        tm.tm_isdst = 0;
 
        xioctl(rtc, RTC_SET_TIME, &tm);
@@ -114,7 +68,10 @@ static void show_clock(int utc)
 static void to_sys_clock(int utc)
 {
        struct timeval tv;
-       const struct timezone tz = { timezone/60 - 60*daylight, 0 };
+       struct timezone tz;
+
+       tz.tz_minuteswest = timezone/60 - 60*daylight;
+       tz.tz_dsttime = 0;
 
        tv.tv_sec = read_rtc(utc);
        tv.tv_usec = 0;
@@ -132,38 +89,6 @@ static void from_sys_clock(int utc)
        write_rtc(tv.tv_sec, utc);
 }
 
-#if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS
-# define ADJTIME_PATH "/var/lib/hwclock/adjtime"
-#else
-# define ADJTIME_PATH "/etc/adjtime"
-#endif
-static int check_utc(void)
-{
-       int utc = 0;
-       FILE *f = fopen(ADJTIME_PATH, "r");
-
-       if (f) {
-               RESERVE_CONFIG_BUFFER(buffer, 128);
-
-               while (fgets(buffer, sizeof(buffer), f)) {
-                       int len = strlen(buffer);
-
-                       while (len && isspace(buffer[len - 1]))
-                               len--;
-
-                       buffer[len] = 0;
-
-                       if (strncmp(buffer, "UTC", 3) == 0) {
-                               utc = 1;
-                               break;
-                       }
-               }
-               fclose(f);
-               RELEASE_CONFIG_BUFFER(buffer);
-       }
-       return utc;
-}
-
 #define HWCLOCK_OPT_LOCALTIME   0x01
 #define HWCLOCK_OPT_UTC         0x02
 #define HWCLOCK_OPT_SHOW        0x04
@@ -172,7 +97,7 @@ static int check_utc(void)
 #define HWCLOCK_OPT_RTCFILE     0x20
 
 int hwclock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int hwclock_main(int argc, char **argv)
+int hwclock_main(int argc UNUSED_PARAM, char **argv)
 {
        unsigned opt;
        int utc;
@@ -193,19 +118,17 @@ int hwclock_main(int argc, char **argv)
 
        /* If -u or -l wasn't given check if we are using utc */
        if (opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME))
-               utc = opt & HWCLOCK_OPT_UTC;
+               utc = (opt & HWCLOCK_OPT_UTC);
        else
-               utc = check_utc();
+               utc = rtc_adjtime_is_utc();
 
-       if (opt & HWCLOCK_OPT_HCTOSYS) {
+       if (opt & HWCLOCK_OPT_HCTOSYS)
                to_sys_clock(utc);
-               return 0;
-       }
-       if (opt & HWCLOCK_OPT_SYSTOHC) {
+       else if (opt & HWCLOCK_OPT_SYSTOHC)
                from_sys_clock(utc);
-               return 0;
-       }
-       /* default HWCLOCK_OPT_SHOW */
-       show_clock(utc);
+       else
+               /* default HWCLOCK_OPT_SHOW */
+               show_clock(utc);
+
        return 0;
 }