From cf1377a4314b91f63f05fe1f9dd565166607f348 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sun, 28 Aug 2011 12:01:51 +0200 Subject: setarch: use program_invocation_short_name Trust that the c.h is setting program name correctly. Signed-off-by: Sami Kerola --- sys-utils/setarch.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'sys-utils/setarch.c') diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c index 865867075..1469f3672 100644 --- a/sys-utils/setarch.c +++ b/sys-utils/setarch.c @@ -89,13 +89,8 @@ enum { static void __attribute__((__noreturn__)) show_help(void) { - const char *p = program_invocation_short_name; - - if (!*p) - p = "setarch"; - printf(_("Usage: %s%s [options] [program [program arguments]]\n\nOptions:\n"), - p, !strcmp(p, "setarch") ? " " : ""); + program_invocation_short_name, !strcmp(program_invocation_short_name, "setarch") ? " " : ""); printf(_( " -h, --help displays this help text\n" @@ -122,13 +117,7 @@ show_help(void) static void __attribute__((__noreturn__)) show_usage(const char *s) { - const char *p = program_invocation_short_name; - - if (!*p) - p = "setarch"; - - fprintf(stderr, _("%s: %s\nTry `%s --help' for more information.\n"), p, s, p); - exit(EXIT_FAILURE); + errx(EXIT_FAILURE, _("%s\nTry `%s --help' for more information."), s, program_invocation_short_name); } -- cgit v1.2.3-55-g7522