aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorRobert Griebl <griebl@gmx.de>2004-03-21 18:01:46 +0000
committerRobert Griebl <griebl@gmx.de>2004-03-21 18:01:46 +0000
commitc8685ead5770b55d66c01df5bc3fe26053caea54 (patch)
tree36c11517eea69903876560919c6821d475c12fc9 /util-linux
parentbfb51574ae1c289766716ba695a36afcbfd8855a (diff)
downloadbusybox-c8685ead5770b55d66c01df5bc3fe26053caea54.tar.gz
The utc variable was not modified according to the -u/-l command line
parameters.
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/hwclock.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index fae511f9c..cf631131b 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -213,10 +213,16 @@ static const struct option hwclock_long_options[] = {
}
/* If -u or -l wasnt give check if we are using utc */
- if ((opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME)) == 0) {
+ if (opt & HWCLOCK_OPT_UTC) {
+ utc = 1;
+ }
+ else if (opt & HWCLOCK_OPT_LOCALTIME) {
+ utc = 0;
+ }
+ else {
utc = check_utc();
}
-
+
if (opt & HWCLOCK_OPT_HCTOSYS) {
return to_sys_clock ( utc );
}