From 3752694299815a5253dc9f0589d284ed43cf370b Mon Sep 17 00:00:00 2001
From: Rasmus Villemoes
Date: Wed, 31 May 2017 20:25:16 +0200
Subject: hwclock: allow -l as alias for --localtime

For symmetry with --utc where a short form is already allowed, and to
make it easier to write scripts that will work with both util-linux'
and busybox' hwclock, make -l another spelling of
--localtime. (Busybox also understands --localtime, but only if it has
been compiled with long option support.)
---
 sys-utils/hwclock.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'sys-utils/hwclock.c')

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index e890cb8c1..603146079 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1242,7 +1242,7 @@ static void usage(const struct hwclock_control *ctl, const char *fmt, ...)
 
 	fputs(USAGE_OPTIONS, usageto);
 	fputs(_(" -u, --utc            the hardware clock is kept in UTC\n"
-		"     --localtime      the hardware clock is kept in local time\n"), usageto);
+		" -l, --localtime      the hardware clock is kept in local time\n"), usageto);
 #ifdef __linux__
 	fputs(_(" -f, --rtc <file>     special /dev/... file to use instead of default\n"), usageto);
 #endif
@@ -1302,7 +1302,6 @@ int main(int argc, char **argv)
 		OPT_EPOCH,
 		OPT_GET,
 		OPT_GETEPOCH,
-		OPT_LOCALTIME,
 		OPT_NOADJFILE,
 		OPT_PREDICT,
 		OPT_SET,
@@ -1315,6 +1314,7 @@ int main(int argc, char **argv)
 	static const struct option longopts[] = {
 		{ "adjust",       no_argument,       NULL, 'a'            },
 		{ "help",         no_argument,       NULL, 'h'            },
+		{ "localtime",    no_argument,       NULL, 'l'            },
 		{ "show",         no_argument,       NULL, 'r'            },
 		{ "hctosys",      no_argument,       NULL, 's'            },
 		{ "utc",          no_argument,       NULL, 'u'            },
@@ -1328,7 +1328,6 @@ int main(int argc, char **argv)
 		{ "epoch",        required_argument, NULL, OPT_EPOCH      },
 #endif
 		{ "noadjfile",    no_argument,       NULL, OPT_NOADJFILE  },
-		{ "localtime",    no_argument,       NULL, OPT_LOCALTIME  },
 		{ "directisa",    no_argument,       NULL, OPT_DIRECTISA  },
 		{ "test",         no_argument,       NULL, OPT_TEST       },
 		{ "date",         required_argument, NULL, OPT_DATE       },
@@ -1347,7 +1346,7 @@ int main(int argc, char **argv)
 		{ 'a','r','s','w',
 		  OPT_GET, OPT_GETEPOCH, OPT_PREDICT,
 		  OPT_SET, OPT_SETEPOCH, OPT_SYSTZ },
-		{ 'u', OPT_LOCALTIME},
+		{ 'l', 'u' },
 		{ OPT_ADJFILE, OPT_NOADJFILE },
 		{ OPT_NOADJFILE, OPT_UPDATE },
 		{ 0 }
@@ -1383,7 +1382,7 @@ int main(int argc, char **argv)
 	atexit(close_stdout);
 
 	while ((c = getopt_long(argc, argv,
-				"?hvVDarsuwAJSFf:", longopts, NULL)) != -1) {
+				"?hvVDalrsuwAJSFf:", longopts, NULL)) != -1) {
 
 		err_exclusive_options(c, longopts, excl, excl_st);
 
@@ -1396,6 +1395,9 @@ int main(int argc, char **argv)
 			ctl.show = 0;
 			ctl.hwaudit_on = 1;
 			break;
+		case 'l':
+			ctl.local_opt = 1;	/* --localtime */
+			break;
 		case 'r':
 			ctl.show = 1;
 			break;
@@ -1435,9 +1437,6 @@ int main(int argc, char **argv)
 		case OPT_NOADJFILE:
 			ctl.noadjfile = 1;
 			break;
-		case OPT_LOCALTIME:
-			ctl.local_opt = 1;	/* --localtime */
-			break;
 		case OPT_DIRECTISA:
 			ctl.directisa = 1;
 			break;
-- 
cgit v1.2.3-55-g7522