From: J William Piggott <elseifthen@gmx.com>
To: Karel Zak <kzak@redhat.com>
Cc: util-linux@vger.kernel.org
Subject: [PATCH 09/12] hwclock: add --update-drift check
Date: Sun, 18 Jun 2017 20:47:24 -0400 [thread overview]
Message-ID: <7d4b3895-4b1b-eabe-e09a-eccb5b8b8fb9@gmx.com> (raw)
In-Reply-To: <011634ef-e5e7-354e-6064-3191450b4fc8@gmx.com>
Only allow --update-drift for --set or --systohc
Signed-off-by: J William Piggott <elseifthen@gmx.com>
---
sys-utils/hwclock.8.in | 3 +--
sys-utils/hwclock.c | 7 ++++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/sys-utils/hwclock.8.in b/sys-utils/hwclock.8.in
index cf33e63..72b842e 100644
--- a/sys-utils/hwclock.8.in
+++ b/sys-utils/hwclock.8.in
@@ -376,9 +376,8 @@ in learning about the internal operations of hwclock.
.B \-\-update\-drift
Update the Hardware Clock's drift factor in
.IR @ADJTIME_PATH@ .
-It is used with
+It can only be used with
.BR \-\-set " or " \%\-\-systohc ,
-otherwise it is ignored.
.sp
A minimum four hour period between settings is required. This is to
avoid invalid calculations. The longer the period, the more precise the
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 5868ad6..7d69b7a 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1233,7 +1233,7 @@ usage(const struct hwclock_control *ctl, FILE *out)
#if defined(__linux__) && defined(__alpha__)
fputs(_(" --epoch <year> epoch input for --setepoch\n"), out);
#endif
- fputs(_(" --update-drift update drift factor (requires --set or --systohc)\n"), out);
+ fputs(_(" --update-drift update the RTC drift factor\n"), out);
fprintf(out, _(
" --noadjfile do not use %1$s\n"
" --adjfile <file> use an alternate file to %1$s\n"), _PATH_ADJTIME);
@@ -1465,6 +1465,11 @@ int main(int argc, char **argv)
if (!ctl.adj_file_name)
ctl.adj_file_name = _PATH_ADJTIME;
+ if (ctl.update && !ctl.set && !ctl.systohc) {
+ warnx(_("--update-drift requires --set or --systohc"));
+ hwclock_exit(&ctl, EX_USAGE);
+ }
+
if (ctl.noadjfile && !ctl.utc && !ctl.local_opt) {
warnx(_("With --noadjfile, you must specify "
"either --utc or --localtime"));
next prev parent reply other threads:[~2017-06-19 0:47 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-19 0:35 [PATCH 00/12] pull request J William Piggott
2017-06-19 0:37 ` [PATCH 01/12] hwclock: remove dead code in usage() J William Piggott
2017-06-19 0:38 ` [PATCH 02/12] hwclock: update usage() to util-linux style J William Piggott
2017-06-19 0:40 ` [PATCH 03/12] hwclock: update usage() FILE name J William Piggott
2017-06-19 0:41 ` [PATCH 04/12] hwclock: add usage() functions heading J William Piggott
2017-06-20 8:36 ` Karel Zak
2017-06-21 0:59 ` J William Piggott
2017-06-21 12:21 ` Ruediger Meier
2017-06-21 15:59 ` J William Piggott
2017-06-19 0:42 ` [PATCH 05/12] include: update pathnames.h J William Piggott
2017-06-20 8:44 ` Karel Zak
2017-06-21 0:53 ` J William Piggott
2017-06-19 0:44 ` [PATCH 06/12] hwclock: use RTC in help output J William Piggott
2017-06-19 0:45 ` [PATCH 07/12] hwclock: update --help content and grammar J William Piggott
2017-06-20 8:51 ` Karel Zak
2017-06-21 0:53 ` J William Piggott
2017-06-21 13:05 ` Ruediger Meier
2017-06-21 14:55 ` Karel Zak
2017-06-21 15:30 ` J William Piggott
2017-06-22 2:04 ` Ruediger Meier
2017-06-22 18:46 ` J William Piggott
2017-06-21 15:01 ` Karel Zak
2017-06-21 17:02 ` J William Piggott
2017-06-19 0:46 ` [PATCH 08/12] hwclock: slice up the usage text J William Piggott
2017-06-19 0:47 ` J William Piggott [this message]
2017-06-19 0:48 ` [PATCH 10/12] Docs: update howto-usage-function.txt J William Piggott
2017-06-19 0:49 ` [PATCH 11/12] hwclock: remove unused usage() FILE argument J William Piggott
2017-06-20 8:56 ` Karel Zak
2017-06-21 0:52 ` J William Piggott
2017-06-28 19:29 ` fputs() vs puts() (was: [PATCH] hwclock: remove unused usage() FILE argument) Ruediger Meier
2017-06-29 8:51 ` Karel Zak
2017-06-29 10:37 ` Ruediger Meier
2017-06-29 10:53 ` Karel Zak
2017-06-29 14:46 ` fputs() vs puts() J William Piggott
2017-06-29 20:12 ` Karel Zak
2017-06-30 18:29 ` J William Piggott
2017-07-03 8:30 ` Ruediger Meier
2017-07-03 12:07 ` Karel Zak
2017-07-03 12:38 ` Ruediger Meier
2017-07-03 14:25 ` Karel Zak
2017-07-03 15:09 ` Bernhard Voelker
2017-07-03 15:15 ` Bernhard Voelker
2017-06-29 10:37 ` fputs() vs puts() (was: [PATCH] hwclock: remove unused usage() FILE argument) Karel Zak
2017-06-21 9:26 ` [PATCH 11/12] hwclock: remove unused usage() FILE argument Karel Zak
2017-06-21 15:48 ` J William Piggott
2017-06-25 21:39 ` J William Piggott
2017-06-19 0:51 ` [PATCH 12/12] hwclock: remove unused stdarg.h J William Piggott
2017-06-21 9:27 ` [PATCH 00/12] pull request Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7d4b3895-4b1b-eabe-e09a-eccb5b8b8fb9@gmx.com \
--to=elseifthen@gmx.com \
--cc=kzak@redhat.com \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).