commiting:

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

diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index e089b1d81238d403b92070fadad3dbae2cfe9975..3c26839537caba155dceff4a0b17fcc9f97f68ab 100644 (file)
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include "busybox.h"
 
-/* Copied from linux/rtc.h to eliminate the kernel dependancy */
+/* Copied from linux/rtc.h to eliminate the kernel dependency */
 struct linux_rtc_time {
        int tm_sec;
        int tm_min;
@@ -46,7 +46,7 @@ struct linux_rtc_time {
        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   */
 
@@ -71,17 +71,17 @@ static time_t read_rtc(int utc)
        if ( ioctl ( rtc, RTC_RD_TIME, &tm ) < 0 )
                bb_perror_msg_and_die ( "Could not read time from RTC" );
        tm. tm_isdst = -1; // not known
-       
+
        close ( rtc );
 
-       if ( utc ) {    
+       if ( utc ) {
                oldtz = getenv ( "TZ" );
                setenv ( "TZ", "UTC 0", 1 );
                tzset ( );
        }
-       
+
        t = mktime ( &tm );
-       
+
        if ( utc ) {
                if ( oldtz )
                        setenv ( "TZ", oldtz, 1 );
@@ -101,13 +101,13 @@ static void write_rtc(time_t t, int utc)
                if (( rtc = open ( "/dev/misc/rtc", O_WRONLY )) < 0 )
                        bb_perror_msg_and_die ( "Could not access RTC" );
        }
-       
+
        tm = *( utc ? gmtime ( &t ) : localtime ( &t ));
        tm. tm_isdst = 0;
-       
+
        if ( ioctl ( rtc, RTC_SET_TIME, &tm ) < 0 )
                bb_perror_msg_and_die ( "Could not set the RTC time" );
-       
+
        close ( rtc );
 }
 
@@ -117,16 +117,16 @@ static int show_clock(int utc)
        time_t t;
        char buffer [64];
 
-       t = read_rtc ( utc );           
+       t = read_rtc ( utc );
        ptm = localtime ( &t );  /* Sets 'tzname[]' */
-       
+
        safe_strncpy ( buffer, ctime ( &t ), sizeof( buffer ));
        if ( buffer [0] )
                buffer [bb_strlen ( buffer ) - 1] = 0;
-       
+
        //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 );
-       
+
        return 0;
 }
 
@@ -134,7 +134,7 @@ static int to_sys_clock(int utc)
 {
        struct timeval tv = { 0, 0 };
        const struct timezone tz = { timezone/60 - 60*daylight, 0 };
-       
+
        tv. tv_sec = read_rtc ( utc );
 
        if ( settimeofday ( &tv, &tz ))
@@ -160,18 +160,18 @@ static int check_utc(void)
 {
        int utc = 0;
        FILE *f = fopen ( "/var/lib/hwclock/adjtime", "r" );
-       
+
        if ( f ) {
                char buffer [128];
-       
+
                while ( fgets ( buffer, sizeof( buffer ), f )) {
                        int len = bb_strlen ( buffer );
-                       
+
                        while ( len && isspace ( buffer [len - 1] ))
                                len--;
-                               
+
                        buffer [len] = 0;
-               
+
                        if ( strncmp ( buffer, "UTC", 3 ) == 0 ) {
                                utc = 1;
                                break;
@@ -182,16 +182,16 @@ static int check_utc(void)
        return utc;
 }
 
-#define HWCLOCK_OPT_LOCALTIME  1
-#define HWCLOCK_OPT_UTC        2
-#define HWCLOCK_OPT_SHOW       4
-#define HWCLOCK_OPT_HCTOSYS    8
-#define HWCLOCK_OPT_SYSTOHC    16
+#define HWCLOCK_OPT_LOCALTIME  0x01
+#define HWCLOCK_OPT_UTC        0x02
+#define HWCLOCK_OPT_SHOW       0x04
+#define HWCLOCK_OPT_HCTOSYS    0x08
+#define HWCLOCK_OPT_SYSTOHC    0x10
 
 extern int hwclock_main ( int argc, char **argv )
 {
        unsigned long opt;
-       int utc = 0;
+       int utc;
 
 #ifdef CONFIG_FEATURE_HWCLOCK_LONGOPTIONS
 static const struct option hwclock_long_options[] = {
@@ -205,17 +205,18 @@ static const struct option hwclock_long_options[] = {
        bb_applet_long_options = hwclock_long_options;
 #endif
 
-       bb_opt_complementaly = "r~ws:w~rs:s~wr";
+       bb_opt_complementaly = "r~ws:w~rs:s~wr:l~u:u~l";
        opt = bb_getopt_ulflags(argc, argv, "lursw");
        /* Check only one mode was given */
-       if(opt & 0x80000000UL) {
+       if(opt & BB_GETOPT_ERROR) {
                bb_show_usage();
        }
 
-       /* If -u or -l wasnt give check if we are using utc */
-       if ((opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME)) == 0) {
+       /* 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;
+       else
                utc = check_utc();
-       }
 
        if (opt & HWCLOCK_OPT_HCTOSYS) {
                return to_sys_clock ( utc );
@@ -224,6 +225,6 @@ static const struct option hwclock_long_options[] = {
                return from_sys_clock ( utc );
        } else {
                /* default HWCLOCK_OPT_SHOW */
-               return show_clock ( utc );      
+               return show_clock ( utc );
        }
 }