From: J William Piggott <elseifthen@gmx.com>
To: Karel Zak <kzak@redhat.com>
Cc: util-linux@vger.kernel.org
Subject: [PATCH 2/2] hwclock: fix regression from c3ae785
Date: Tue, 18 Jul 2017 16:01:57 -0400 [thread overview]
Message-ID: <13448500-dbe1-b7f8-3514-651d448f00d1@gmx.com> (raw)
In-Reply-To: <b8d24f10-1bea-aa80-0a28-9f573dd81d2a@gmx.com>
hwclock --get foobar
hwclock: 3 too many arguments given
Fixed:
hwclock --get foobar
hwclock: 1 too many arguments given
Signed-off-by: J William Piggott <elseifthen@gmx.com>
---
sys-utils/hwclock.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 9745158..9b313cf 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1448,9 +1448,10 @@ int main(int argc, char **argv)
}
}
- if (argc > optind) {
+ argc -= optind;
+ if (argc > 0) {
warnx(_("%d too many arguments given"), argc);
- errtryhelp(EXIT_FAILURE);
+ errtryhelp(EX_USAGE);
}
if (!ctl.adj_file_name)
next prev parent reply other threads:[~2017-07-18 20:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-18 19:59 [PATCH 0/2] Pull Request J William Piggott
2017-07-18 20:00 ` [PATCH 1/2] hwclock: remove unused epoch_option J William Piggott
2017-07-18 20:01 ` J William Piggott [this message]
2017-07-18 20:33 ` [PATCH 2/2] hwclock: fix regression from c3ae785 Ruediger Meier
2017-07-18 20:46 ` Ruediger Meier
2017-07-19 1:25 ` J William Piggott
2017-07-19 1:20 ` J William Piggott
2017-07-20 1:14 ` [v3 PATCH " J William Piggott
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=13448500-dbe1-b7f8-3514-651d448f00d1@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