ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

setarch: use program_invocation_short_name 

Trust that the c.h is setting program name correctly.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-08-28 12:01:51 +02:00
parent 745627993b
commit cf1377a431
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys-utils/setarch.c
View File

@ -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") ? " <arch>" : "");
program_invocation_short_name, !strcmp(program_invocation_short_name, "setarch") ? " <arch>" : "");
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);
}