From: Ruediger Meier <ruediger.meier@xxxxxxxxxxx>
Signed-off-by: Ruediger Meier <ruediger.meier@xxxxxxxxxxx>
---
sys-utils/setarch.c | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index 6481eb2..9aec34f 100644
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -84,7 +84,7 @@
static int archwrapper;
-static void __attribute__((__noreturn__)) show_help(void)
+static void __attribute__((__noreturn__)) usage(void)
{
fputs(USAGE_HEADER, stdout);
if (!archwrapper)
@@ -121,17 +121,6 @@ static void __attribute__((__noreturn__)) show_help(void)
exit(EXIT_SUCCESS);
}
-static void __attribute__((__noreturn__)) show_usage(const char *s)
-{
- if (s)
- errx(EXIT_FAILURE,
- _("%s\nTry `%s --help' for more information."), s,
- program_invocation_short_name);
- else
- errx(EXIT_FAILURE, _("Try `%s --help' for more information."),
- program_invocation_short_name);
-}
-
static void __attribute__((__noreturn__))
show_version(void)
{
@@ -301,9 +290,10 @@ int main(int argc, char *argv[])
textdomain(PACKAGE);
atexit(close_stdout);
- if (argc < 2)
- show_usage(_("Not enough arguments"));
-
+ if (argc < 2) {
+ warnx(_("Not enough arguments"));
+ errtryhelp(EXIT_FAILURE);
+ }
archwrapper = strcmp(program_invocation_short_name, "setarch") != 0;
if (archwrapper)
arch = program_invocation_short_name; /* symlinks to setarch */
@@ -328,7 +318,7 @@ int main(int argc, char *argv[])
while ((c = getopt_long(argc, argv, "+hVv3BFILRSTXZ", longopts, NULL)) != -1) {
switch (c) {
case 'h':
- show_help();
+ usage();
break;
case 'V':
show_version();
--
1.8.5.6
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
