From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 08/10] kill: tell what is wrong rather than output usage()
Date: Sun, 9 Mar 2014 15:30:21 -0500 [thread overview]
Message-ID: <1394397023-7050-8-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1394397023-7050-1-git-send-email-kerolasa@iki.fi>
Getting usage as error message is not specific enough. As a user I want
to know what is wrong, and if it is unclear after error message how to
recover then I run command with --help.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
misc-utils/kill.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 34bd00e..30c209f 100644
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -212,7 +212,7 @@ int main(int argc, char **argv)
return EXIT_SUCCESS;
}
if (2 < argc)
- usage(stderr);
+ errx(EXIT_FAILURE, _("too many arguments"));
/* argc == 2, accept "kill -l $?" */
arg = argv[1];
if ((ctl.numsig = arg_to_signum(arg, 1)) < 0)
@@ -236,15 +236,15 @@ int main(int argc, char **argv)
if (!strcmp(arg, "-p") || !strcmp(arg, "--pid")) {
ctl.do_pid = 1;
if (ctl.do_kill)
- usage(stderr);
+ errx(EXIT_FAILURE, _("%s and %s are mutually exclusive"), "--pid", "--signal");
continue;
}
if (!strcmp(arg, "-s") || !strcmp(arg, "--signal")) {
if (argc < 2)
- usage(stderr);
+ errx(EXIT_FAILURE, _("not enough arguments"));
ctl.do_kill = 1;
if (ctl.do_pid)
- usage(stderr);
+ errx(EXIT_FAILURE, _("%s and %s are mutually exclusive"), "--pid", "--signal");
argc--, argv++;
arg = *argv;
if ((ctl.numsig = arg_to_signum(arg, 0)) < 0) {
@@ -255,7 +255,7 @@ int main(int argc, char **argv)
}
if (!strcmp(arg, "-q") || !strcmp(arg, "--queue")) {
if (argc < 2)
- usage(stderr);
+ errx(EXIT_FAILURE, _("option '%s' requires an argument"), arg);
argc--, argv++;
arg = *argv;
#ifdef HAVE_SIGQUEUE
@@ -277,14 +277,14 @@ int main(int argc, char **argv)
break;
arg++;
if ((ctl.numsig = arg_to_signum(arg, 0)) < 0)
- usage(stderr);
+ errx(EXIT_FAILURE, _("invalid sigval argument"));
ctl.do_kill = 1;
if (ctl.do_pid)
- usage(stderr);
+ errx(EXIT_FAILURE, _("%s and %s are mutually exclusive"), "--pid", "--signal");
continue;
}
if (!*argv)
- usage(stderr);
+ errx(EXIT_FAILURE, _("not enough arguments"));
if (ctl.do_pid)
ctl.numsig = -1;
--
1.9.0
next prev parent reply other threads:[~2014-03-09 20:30 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-09 20:30 [PATCH 01/10] findfs: use symbolic exit values, and tell about them in manual Sami Kerola
2014-03-09 20:30 ` [PATCH 02/10] kill: fix coding style Sami Kerola
2014-04-07 9:36 ` Karel Zak
2014-04-07 14:09 ` Sami Kerola
2014-03-09 20:30 ` [PATCH 03/10] kill: flip all comparions to be in smaller - greater order Sami Kerola
2014-03-19 12:32 ` Benno Schulenberg
2014-03-19 19:35 ` Sami Kerola
2014-03-19 20:30 ` Benno Schulenberg
2014-03-09 20:30 ` [PATCH 04/10] kill: move magic numbers in beginning of the file Sami Kerola
2014-03-09 20:30 ` [PATCH 05/10] kill: make usage() not to return Sami Kerola
2014-03-19 12:37 ` Benno Schulenberg
2014-03-19 19:02 ` Sami Kerola
2014-03-09 20:30 ` [PATCH 06/10] kill: leeway deprecation of --pid invocation as command name Sami Kerola
2014-03-11 7:21 ` Bernhard Voelker
2014-03-11 12:13 ` Sami Kerola
2014-04-07 8:30 ` Karel Zak
2014-03-09 20:30 ` [PATCH 07/10] kill: use control structure to pass user input to functions Sami Kerola
2014-04-07 9:28 ` Karel Zak
2014-03-09 20:30 ` Sami Kerola [this message]
2014-03-09 20:30 ` [PATCH 09/10] kill: add parse_arguments() function Sami Kerola
2014-03-09 20:30 ` [PATCH 10/10] kill: move sigqueue inputs to control struct Sami Kerola
2014-03-12 10:37 ` [PATCH 01/10] findfs: use symbolic exit values, and tell about them in manual Karel Zak
2014-03-13 16:49 ` Sami Kerola
2014-03-26 11:19 ` 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=1394397023-7050-8-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--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