date: factor out date parsing (in preparation for touch -d)
[oweals/busybox.git] / util-linux / hwclock.c
index c4b793ef89f566702af78975a858c8dbf147f8fc..2cdb186c51ff226c8e8dce8a77e5d38b290dc30e 100644 (file)
@@ -7,26 +7,9 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
 */
 
-//#include <sys/ioctl.h>
 #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   */
+#include "rtc_.h"
 
 #if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS
 # ifndef _GNU_SOURCE
@@ -36,143 +19,70 @@ 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));
-       if (ioctl(rtc, RTC_RD_TIME, &tm) < 0)
-               bb_perror_msg_and_die("cannot read time from RTC");
-       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");
-               setenv("TZ", "UTC 0", 1);
-               tzset();
-       }
-
-       t = mktime(&tm);
-
-       if (utc) {
-               if (oldtz)
-                       setenv("TZ", oldtz, 1);
-               else
-                       unsetenv("TZ");
-               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;
 
-       if (ioctl(rtc, RTC_SET_TIME, &tm) < 0)
-               bb_perror_msg_and_die("cannot set the RTC time");
+       xioctl(rtc, RTC_SET_TIME, &tm);
 
        close(rtc);
 }
 
-static int show_clock(int utc)
+static void show_clock(int utc)
 {
-       struct tm *ptm;
+       //struct tm *ptm;
        time_t t;
-       RESERVE_CONFIG_BUFFER(buffer, 64);
+       char *cp;
 
        t = read_rtc(utc);
-       ptm = localtime(&t);  /* Sets 'tzname[]' */
-
-       safe_strncpy(buffer, ctime(&t), 64);
-       if (buffer[0])
-               buffer[strlen(buffer) - 1] = 0;
+       //ptm = localtime(&t);  /* Sets 'tzname[]' */
 
-       //printf("%s  %.6f seconds %s\n", buffer, 0.0, utc ? "" : (ptm->tm_isdst ? tzname[1] : tzname[0]));
-       printf( "%s  %.6f seconds\n", buffer, 0.0);
-       RELEASE_CONFIG_BUFFER(buffer);
+       cp = ctime(&t);
+       if (cp[0])
+               cp[strlen(cp) - 1] = '\0';
 
-       return 0;
+       //printf("%s  %.6f seconds %s\n", cp, 0.0, utc ? "" : (ptm->tm_isdst ? tzname[1] : tzname[0]));
+       printf("%s  0.000000 seconds\n", cp);
 }
 
-static int to_sys_clock(int utc)
+static void to_sys_clock(int utc)
 {
-       struct timeval tv = { 0, 0 };
+       struct timeval tv;
        const struct timezone tz = { timezone/60 - 60*daylight, 0 };
 
        tv.tv_sec = read_rtc(utc);
-
+       tv.tv_usec = 0;
        if (settimeofday(&tv, &tz))
                bb_perror_msg_and_die("settimeofday() failed");
-
-       return 0;
 }
 
-static int from_sys_clock(int utc)
+static void from_sys_clock(int utc)
 {
-       struct timeval tv = { 0, 0 };
-       struct timezone tz = { 0, 0 };
-
-       if (gettimeofday(&tv, &tz))
-               bb_perror_msg_and_die("gettimeofday() failed");
+       struct timeval tv;
 
+       gettimeofday(&tv, NULL);
+       //if (gettimeofday(&tv, NULL))
+       //      bb_perror_msg_and_die("gettimeofday() failed");
        write_rtc(tv.tv_sec, utc);
-       return 0;
-}
-
-#ifdef CONFIG_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
@@ -182,40 +92,39 @@ static int check_utc(void)
 #define HWCLOCK_OPT_SYSTOHC     0x10
 #define HWCLOCK_OPT_RTCFILE     0x20
 
-int hwclock_main(int argc, char **argv );
-int hwclock_main(int argc, char **argv )
+int hwclock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int hwclock_main(int argc UNUSED_PARAM, char **argv)
 {
        unsigned opt;
        int utc;
 
 #if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS
-       static const struct option hwclock_long_options[] = {
-               { "localtime", 0, 0, 'l' },
-               { "utc",       0, 0, 'u' },
-               { "show",      0, 0, 'r' },
-               { "hctosys",   0, 0, 's' },
-               { "systohc",   0, 0, 'w' },
-               { "file",      1, 0, 'f' },
-               { 0,           0, 0, 0 }
-       };
-       applet_long_options = hwclock_long_options;
+       static const char hwclock_longopts[] ALIGN1 =
+               "localtime\0" No_argument "l"
+               "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"
+               ;
+       applet_long_options = hwclock_longopts;
 #endif
-       opt_complementary = "?:r--ws:w--rs:s--wr:l--u:u--l";
-       opt = getopt32(argc, argv, "lurswf:", &rtcname);
+       opt_complementary = "r--ws:w--rs:s--wr:l--u:u--l";
+       opt = getopt32(argv, "lurswf:", &rtcname);
 
        /* 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 = rtc_adjtime_is_utc();
+
+       if (opt & HWCLOCK_OPT_HCTOSYS)
+               to_sys_clock(utc);
+       else if (opt & HWCLOCK_OPT_SYSTOHC)
+               from_sys_clock(utc);
        else
-               utc = check_utc();
-
-       if (opt & HWCLOCK_OPT_HCTOSYS) {
-               return to_sys_clock(utc);
-       }
-       else if (opt & HWCLOCK_OPT_SYSTOHC) {
-               return from_sys_clock(utc);
-       } else {
                /* default HWCLOCK_OPT_SHOW */
-               return show_clock(utc);
-       }
+               show_clock(utc);
+
+       return 0;
 }