From 46d2cda500242caae2ccf7cee71200d4bfe7c7a5 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Tue, 10 Oct 2017 18:16:08 -0500 Subject: Tweak help_exit() to show "See %s --help" message on the same line. --- lib/lib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/lib.c b/lib/lib.c index fae71566..80570ed1 100644 --- a/lib/lib.c +++ b/lib/lib.c @@ -12,7 +12,9 @@ void verror_msg(char *msg, int err, va_list va) fprintf(stderr, "%s: ", toys.which->name); if (msg) vfprintf(stderr, msg, va); else s+=2; - if (err) fprintf(stderr, s, strerror(err)); + if (err>0) fprintf(stderr, s, strerror(err)); + if (err<0 && CFG_TOYBOX_HELP) + fprintf(stderr, " (See \"%s --help\")", toys.which->name); if (msg || err) putc('\n', stderr); if (!toys.exitval) toys.exitval++; } @@ -66,12 +68,10 @@ void help_exit(char *msg, ...) { va_list va; - if (CFG_TOYBOX_HELP) - fprintf(stderr, "See %s --help\n", toys.which->name); - - if (msg) { + if (!msg) show_help(stdout); + else { va_start(va, msg); - verror_msg(msg, 0, va); + verror_msg(msg, -1, va); va_end(va); } -- cgit v1.2.3