Merge branch 'hwclock-localtime' of https://github.com/Villemoes/util-linux

diff --git a/sys-utils/hwclock.8.in b/sys-utils/hwclock.8.in
index f11df801f810ccef81a094a0aaacedfa76c18380..cf33e632937ee7c96a31e194b6f4a90395e440d1 100644 (file)
--- a/sys-utils/hwclock.8.in
+++ b/sys-utils/hwclock.8.in
@@ -329,7 +329,7 @@ use the first one found in this order:
 .in
 .
 .TP
-.B \-\-localtime
+.BR \-l , \ \-\-localtime
 .TQ
 .BR \-u ", " \-\-utc
 Indicate which timescale the Hardware Clock is set to.

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index e890cb8c18a44114ed949d4b54ee1bf60076154f..6031460796dbc5f20c0f2ce2c59fa461af51213f 100644 (file)
--- 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;