From: Robert Griebl <griebl@gmx.de>
Date: Sun, 21 Mar 2004 18:01:46 +0000 (-0000)
Subject: The utc variable was not modified according to the -u/-l command line
X-Git-Tag: 1_00_pre9~56
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c8685ead5770b55d66c01df5bc3fe26053caea54;p=oweals%2Fbusybox.git

The utc variable was not modified according to the -u/-l command line
parameters.
---

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 );
 	}