emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some corrections from vodz:

Browse Source 
- Make -u/-l mutually exclusive
- Minor size reduction
This commit is contained in:
Robert Griebl 2004-03-22 21:27:39 +00:00
parent c8685ead57
commit 6bb80870b8
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
util-linux/hwclock.c
View File

@ -191,7 +191,7 @@ static int check_utc(void)
extern int hwclock_main ( int argc, char **argv ) extern int hwclock_main ( int argc, char **argv )
{ {
unsigned long opt; unsigned long opt;
int utc = 0; int utc;
#ifdef CONFIG_FEATURE_HWCLOCK_LONGOPTIONS #ifdef CONFIG_FEATURE_HWCLOCK_LONGOPTIONS
static const struct option hwclock_long_options[] = { static const struct option hwclock_long_options[] = {
@ -205,23 +205,18 @@ static const struct option hwclock_long_options[] = {
bb_applet_long_options = hwclock_long_options; bb_applet_long_options = hwclock_long_options;
#endif #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"); opt = bb_getopt_ulflags(argc, argv, "lursw");
/* Check only one mode was given */ /* Check only one mode was given */
if(opt & 0x80000000UL) { if(opt & 0x80000000UL) {
bb_show_usage(); bb_show_usage();
} }
/* If -u or -l wasnt give check if we are using utc */ /* If -u or -l wasn't given check if we are using utc */
if (opt & HWCLOCK_OPT_UTC) { if (opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME))
utc = 1; utc = opt & HWCLOCK_OPT_UTC;
} else
else if (opt & HWCLOCK_OPT_LOCALTIME) {
utc = 0;
}
else {
utc = check_utc(); utc = check_utc();
}
if (opt & HWCLOCK_OPT_HCTOSYS) { if (opt & HWCLOCK_OPT_HCTOSYS) {
return to_sys_clock ( utc ); return to_sys_clock ( utc );