From 92258541449581302e180d05e827e27d35030a18 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 1 Nov 2006 10:25:35 +0000 Subject: mostly style fixes --- util-linux/hwclock.c | 131 +++++++++++++++++++++++++-------------------------- 1 file changed, 63 insertions(+), 68 deletions(-) (limited to 'util-linux/hwclock.c') diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c index 1aff87c11..3a087725e 100644 --- a/util-linux/hwclock.c +++ b/util-linux/hwclock.c @@ -10,14 +10,7 @@ #include #include -#include -#include #include -#include -#include -#include -#include -#include #include "busybox.h" /* Copied from linux/rtc.h to eliminate the kernel dependency */ @@ -42,59 +35,62 @@ struct linux_rtc_time { # endif #endif -static time_t read_rtc(int utc) +static int xopen_rtc(int flags) { int rtc; + rtc = open("/dev/rtc", flags); + if (rtc < 0) { + rtc = open("/dev/misc/rtc", flags); + if (rtc < 0) + bb_perror_msg_and_die("cannot access RTC"); + } + return rtc; +} + +static time_t read_rtc(int utc) +{ struct tm tm; char *oldtz = 0; time_t t = 0; + int rtc = xopen_rtc(O_RDONLY); - if (( rtc = open ( "/dev/rtc", O_RDONLY )) < 0 ) { - if (( rtc = open ( "/dev/misc/rtc", O_RDONLY )) < 0 ) - bb_perror_msg_and_die ( "cannot access RTC" ); - } - memset ( &tm, 0, sizeof( struct tm )); - if ( ioctl ( rtc, RTC_RD_TIME, &tm ) < 0 ) - bb_perror_msg_and_die ( "cannot read time from RTC" ); + 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 */ - close ( rtc ); + close(rtc); - if ( utc ) { - oldtz = getenv ( "TZ" ); - setenv ( "TZ", "UTC 0", 1 ); - tzset ( ); + if (utc) { + oldtz = getenv("TZ"); + setenv("TZ", "UTC 0", 1); + tzset(); } - t = mktime ( &tm ); + t = mktime(&tm); - if ( utc ) { - if ( oldtz ) - setenv ( "TZ", oldtz, 1 ); + if (utc) { + if (oldtz) + setenv("TZ", oldtz, 1); else - unsetenv ( "TZ" ); - tzset ( ); + unsetenv("TZ"); + tzset(); } return t; } static void write_rtc(time_t t, int utc) { - int rtc; struct tm tm; + int rtc = xopen_rtc(O_WRONLY); - if (( rtc = open ( "/dev/rtc", O_WRONLY )) < 0 ) { - if (( rtc = open ( "/dev/misc/rtc", O_WRONLY )) < 0 ) - bb_perror_msg_and_die ( "cannot access RTC" ); - } - - tm = *( utc ? gmtime ( &t ) : localtime ( &t )); + tm = *(utc ? gmtime(&t) : localtime(&t)); tm.tm_isdst = 0; - if ( ioctl ( rtc, RTC_SET_TIME, &tm ) < 0 ) - bb_perror_msg_and_die ( "cannot set the RTC time" ); + if (ioctl(rtc, RTC_SET_TIME, &tm) < 0) + bb_perror_msg_and_die("cannot set the RTC time"); - close ( rtc ); + close(rtc); } static int show_clock(int utc) @@ -103,15 +99,15 @@ static int show_clock(int utc) time_t t; RESERVE_CONFIG_BUFFER(buffer, 64); - t = read_rtc ( utc ); - ptm = localtime ( &t ); /* Sets 'tzname[]' */ + t = read_rtc(utc); + ptm = localtime(&t); /* Sets 'tzname[]' */ - safe_strncpy ( buffer, ctime ( &t ), 64); - if ( buffer [0] ) - buffer [strlen ( buffer ) - 1] = 0; + safe_strncpy(buffer, ctime(&t), 64); + if (buffer[0]) + buffer[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 ); + //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); return 0; @@ -122,10 +118,10 @@ 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 ); + tv.tv_sec = read_rtc(utc); - if ( settimeofday ( &tv, &tz )) - bb_perror_msg_and_die ( "settimeofday() failed" ); + if (settimeofday(&tv, &tz)) + bb_perror_msg_and_die("settimeofday() failed"); return 0; } @@ -135,10 +131,10 @@ static int 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" ); + if (gettimeofday(&tv, &tz)) + bb_perror_msg_and_die("gettimeofday() failed"); - write_rtc ( tv.tv_sec, utc ); + write_rtc(tv.tv_sec, utc); return 0; } @@ -150,43 +146,43 @@ static int from_sys_clock(int utc) static int check_utc(void) { int utc = 0; - FILE *f = fopen ( ADJTIME_PATH, "r" ); + FILE *f = fopen(ADJTIME_PATH, "r"); - if ( f ) { + if (f) { RESERVE_CONFIG_BUFFER(buffer, 128); - while ( fgets ( buffer, sizeof( buffer ), f )) { - int len = strlen ( buffer ); + while (fgets(buffer, sizeof(buffer), f)) { + int len = strlen(buffer); - while ( len && isspace ( buffer [len - 1] )) + while (len && isspace(buffer[len - 1])) len--; - buffer [len] = 0; + buffer[len] = 0; - if ( strncmp ( buffer, "UTC", 3 ) == 0 ) { + if (strncmp(buffer, "UTC", 3) == 0 ) { utc = 1; break; } } - fclose ( f ); + fclose(f); RELEASE_CONFIG_BUFFER(buffer); } 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 +#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 -int hwclock_main ( int argc, char **argv ) +int hwclock_main(int argc, char **argv ) { unsigned opt; int utc; #if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS -static const struct option hwclock_long_options[] = { + static const struct option hwclock_long_options[] = { { "localtime", 0, 0, 'l' }, { "utc", 0, 0, 'u' }, { "show", 0, 0, 'r' }, @@ -196,7 +192,6 @@ static const struct option hwclock_long_options[] = { }; applet_long_options = hwclock_long_options; #endif - opt_complementary = "?:r--ws:w--rs:s--wr:l--u:u--l"; opt = getopt32(argc, argv, "lursw"); @@ -207,12 +202,12 @@ static const struct option hwclock_long_options[] = { utc = check_utc(); if (opt & HWCLOCK_OPT_HCTOSYS) { - return to_sys_clock ( utc ); + return to_sys_clock(utc); } else if (opt & HWCLOCK_OPT_SYSTOHC) { - return from_sys_clock ( utc ); + return from_sys_clock(utc); } else { /* default HWCLOCK_OPT_SHOW */ - return show_clock ( utc ); + return show_clock(utc); } } -- cgit v1.2.3