diff options
| author | Karel Zak | 2016-12-19 13:13:34 +0100 |
|---|---|---|
| committer | Karel Zak | 2016-12-19 13:13:34 +0100 |
| commit | 677ec86cef983a106c6e5d175f44b125858c3016 (patch) | |
| tree | b993641faa65700acd62768da189a103da4c40ec /term-utils | |
| parent | include/c.h: add errtryhelp() (diff) | |
| download | kernel-qcow2-util-linux-677ec86cef983a106c6e5d175f44b125858c3016.tar.gz kernel-qcow2-util-linux-677ec86cef983a106c6e5d175f44b125858c3016.tar.xz kernel-qcow2-util-linux-677ec86cef983a106c6e5d175f44b125858c3016.zip | |
Use --help suggestion on invalid option
The current default is to print all usage() output. This is overkill
in many case.
Addresses: https://github.com/karelzak/util-linux/issues/338
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'term-utils')
| -rw-r--r-- | term-utils/mesg.c | 2 | ||||
| -rw-r--r-- | term-utils/script.c | 2 | ||||
| -rw-r--r-- | term-utils/scriptreplay.c | 4 | ||||
| -rw-r--r-- | term-utils/setterm.c | 2 | ||||
| -rw-r--r-- | term-utils/wall.c | 2 | ||||
| -rw-r--r-- | term-utils/write.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/term-utils/mesg.c b/term-utils/mesg.c index 4181a5874..af9a81ebc 100644 --- a/term-utils/mesg.c +++ b/term-utils/mesg.c @@ -115,7 +115,7 @@ int main(int argc, char *argv[]) case 'h': usage(stdout); default: - usage(stderr); + errtryhelp(EXIT_FAILURE); } argc -= optind; diff --git a/term-utils/script.c b/term-utils/script.c index e90644aed..a1bf9a608 100644 --- a/term-utils/script.c +++ b/term-utils/script.c @@ -731,7 +731,7 @@ int main(int argc, char **argv) usage(stdout); break; default: - usage(stderr); + errtryhelp(EXIT_FAILURE); } argc -= optind; argv += optind; diff --git a/term-utils/scriptreplay.c b/term-utils/scriptreplay.c index 146133518..5fd3ecb16 100644 --- a/term-utils/scriptreplay.c +++ b/term-utils/scriptreplay.c @@ -174,7 +174,7 @@ main(int argc, char *argv[]) case 'h': usage(stdout); default: - usage(stderr); + errtryhelp(EXIT_FAILURE); } argc -= optind; argv += optind; @@ -182,7 +182,7 @@ main(int argc, char *argv[]) if ((argc < 1 && !tname) || argc > 3) { warnx(_("wrong number of arguments")); - usage(stderr); + errtryhelp(EXIT_FAILURE); } if (!tname) tname = argv[idx++]; diff --git a/term-utils/setterm.c b/term-utils/setterm.c index f1cdd2407..abcf8b291 100644 --- a/term-utils/setterm.c +++ b/term-utils/setterm.c @@ -670,7 +670,7 @@ static void parse_option(struct setterm_control *ctl, int ac, char **av) case OPT_HELP: usage(stdout); default: - usage(stderr); + errtryhelp(EXIT_FAILURE); } } } diff --git a/term-utils/wall.c b/term-utils/wall.c index 481af7271..fe72e1e1d 100644 --- a/term-utils/wall.c +++ b/term-utils/wall.c @@ -217,7 +217,7 @@ int main(int argc, char **argv) case 'h': usage(stdout); default: - usage(stderr); + errtryhelp(EXIT_FAILURE); } } argc -= optind; diff --git a/term-utils/write.c b/term-utils/write.c index 2b05e89d9..13d4745f9 100644 --- a/term-utils/write.c +++ b/term-utils/write.c @@ -362,7 +362,7 @@ int main(int argc, char **argv) do_write(&ctl); break; default: - usage(stderr); + errtryhelp(EXIT_FAILURE); } free(ctl.dst_tty_path); return EXIT_SUCCESS; |