X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fhwclock.c;h=3c26839537caba155dceff4a0b17fcc9f97f68ab;hb=3f11b1bf634536cb01d9913d1a3d10da5bf24541;hp=06c3d89b919896ade6a8d860ca80ca5ede7f8d53;hpb=8882ea53d5c0349e5570c5044e7f1a34a2ee6e5f;p=oweals%2Fbusybox.git diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c index 06c3d89b9..3c2683953 100644 --- a/util-linux/hwclock.c +++ b/util-linux/hwclock.c @@ -21,23 +21,34 @@ */ +#include +#include #include -#include -#include -#include -#include #include #include -#include +#include +#include +#include +#include #include -#include +#include #include "busybox.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; +}; -/* Copied from linux/rtc.h to eliminate the kernel dependancy */ -#define RTC_SET_TIME _IOW('p', 0x0a, struct tm) /* Set RTC time */ -#define RTC_RD_TIME _IOR('p', 0x09, struct tm) /* Read RTC time */ - +#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 */ #ifdef CONFIG_FEATURE_HWCLOCK_LONGOPTIONS # ifndef _GNU_SOURCE @@ -45,17 +56,7 @@ # endif #endif -#include - - -enum OpMode { - SHOW, - SYSTOHC, - HCTOSYS -}; - - -time_t read_rtc ( int utc ) +static time_t read_rtc(int utc) { int rtc; struct tm tm; @@ -64,23 +65,23 @@ time_t read_rtc ( int utc ) if (( rtc = open ( "/dev/rtc", O_RDONLY )) < 0 ) { if (( rtc = open ( "/dev/misc/rtc", O_RDONLY )) < 0 ) - perror_msg_and_die ( "Could not access RTC" ); + bb_perror_msg_and_die ( "Could not access RTC" ); } memset ( &tm, 0, sizeof( struct tm )); if ( ioctl ( rtc, RTC_RD_TIME, &tm ) < 0 ) - perror_msg_and_die ( "Could not read time from RTC" ); + 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 ); @@ -91,90 +92,86 @@ time_t read_rtc ( int utc ) return t; } -void write_rtc ( time_t t, int utc ) +static void write_rtc(time_t t, int utc) { int rtc; struct tm tm; if (( rtc = open ( "/dev/rtc", O_WRONLY )) < 0 ) { if (( rtc = open ( "/dev/misc/rtc", O_WRONLY )) < 0 ) - perror_msg_and_die ( "Could not access RTC" ); + bb_perror_msg_and_die ( "Could not access RTC" ); } - - printf ( "1\n" ); - + tm = *( utc ? gmtime ( &t ) : localtime ( &t )); tm. tm_isdst = 0; - - printf ( "2\n") ; - + if ( ioctl ( rtc, RTC_SET_TIME, &tm ) < 0 ) - perror_msg_and_die ( "Could not set the RTC time" ); - + bb_perror_msg_and_die ( "Could not set the RTC time" ); + close ( rtc ); } -int show_clock ( int utc ) +static int show_clock(int utc) { struct tm *ptm; 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 [xstrlen ( buffer ) - 1] = 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; } -int to_sys_clock ( int utc ) +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 )) - perror_msg_and_die ( "settimeofday() failed" ); + bb_perror_msg_and_die ( "settimeofday() failed" ); return 0; } -int from_sys_clock ( int utc ) +static int from_sys_clock(int utc) { struct timeval tv = { 0, 0 }; struct timezone tz = { 0, 0 }; if ( gettimeofday ( &tv, &tz )) - perror_msg_and_die ( "gettimeofday() failed" ); + bb_perror_msg_and_die ( "gettimeofday() failed" ); write_rtc ( tv. tv_sec, utc ); return 0; } -int check_utc ( void ) +static int check_utc(void) { int utc = 0; - FILE *f = fopen ( "/etc/adjtime", "r" ); - + FILE *f = fopen ( "/var/lib/hwclock/adjtime", "r" ); + if ( f ) { char buffer [128]; - + while ( fgets ( buffer, sizeof( buffer ), f )) { - int len = xstrlen ( buffer ); - + int len = bb_strlen ( buffer ); + while ( len && isspace ( buffer [len - 1] )) len--; - + buffer [len] = 0; - + if ( strncmp ( buffer, "UTC", 3 ) == 0 ) { utc = 1; break; @@ -185,65 +182,49 @@ int check_utc ( void ) return utc; } +#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 ) { - int opt; - enum OpMode mode = SHOW; - int utc = 0; - int utc_arg = 0; + unsigned long opt; + int utc; #ifdef CONFIG_FEATURE_HWCLOCK_LONGOPTIONS - struct option long_options[] = { - { "show", 0, 0, 'r' }, - { "utc", 0, 0, 'u' }, +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' }, { 0, 0, 0, 0 } }; - - while (( opt = getopt_long ( argc, argv, "rwsul", long_options, 0 )) != EOF ) { -#else - while (( opt = getopt ( argc, argv, "rwsul" )) != EOF ) { + bb_applet_long_options = hwclock_long_options; #endif - switch ( opt ) { - case 'r': - mode = SHOW; - break; - case 'w': - mode = SYSTOHC; - break; - case 's': - mode = HCTOSYS; - break; - case 'u': - utc = 1; - utc_arg = 1; - break; - case 'l': // -l is not supported by the normal hwclock (only --localtime) - utc = 0; - utc_arg = 1; - break; - default: - show_usage(); - break; - } + + 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 & BB_GETOPT_ERROR) { + bb_show_usage(); } - if ( !utc_arg ) - utc = check_utc ( ); - - switch ( mode ) { - case SYSTOHC: - return from_sys_clock ( utc ); + /* 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(); - case HCTOSYS: + if (opt & HWCLOCK_OPT_HCTOSYS) { return to_sys_clock ( utc ); - - case SHOW: - default: - return show_clock ( utc ); - } + } + else if (opt & HWCLOCK_OPT_SYSTOHC) { + return from_sys_clock ( utc ); + } else { + /* default HWCLOCK_OPT_SHOW */ + return show_clock ( utc ); + } } - -