]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Use --help suggestion on invalid option
authorKarel Zak <kzak@redhat.com>
Mon, 19 Dec 2016 12:13:34 +0000 (13:13 +0100)
committerKarel Zak <kzak@redhat.com>
Mon, 19 Dec 2016 12:13:34 +0000 (13:13 +0100)
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>
93 files changed:
Documentation/boilerplate.c
disk-utils/addpart.c
disk-utils/cfdisk.c
disk-utils/delpart.c
disk-utils/fdformat.c
disk-utils/fdisk.c
disk-utils/fsck.cramfs.c
disk-utils/fsck.minix.c
disk-utils/isosize.c
disk-utils/mkfs.bfs.c
disk-utils/mkfs.cramfs.c
disk-utils/mkfs.minix.c
disk-utils/mkswap.c
disk-utils/partx.c
disk-utils/raw.c
disk-utils/resizepart.c
disk-utils/sfdisk.c
disk-utils/swaplabel.c
include/c.h
login-utils/chfn.c
login-utils/chsh.c
login-utils/last.c
login-utils/lslogins.c
login-utils/newgrp.c
login-utils/nologin.c
login-utils/su-common.c
login-utils/utmpdump.c
misc-utils/blkid.c
misc-utils/cal.c
misc-utils/findmnt.c
misc-utils/logger.c
misc-utils/look.c
misc-utils/lslocks.c
misc-utils/mcookie.c
misc-utils/namei.c
misc-utils/rename.c
misc-utils/test_uuidd.c
misc-utils/uuidd.c
misc-utils/uuidgen.c
misc-utils/wipefs.c
schedutils/chrt.c
schedutils/ionice.c
schedutils/taskset.c
sys-utils/blkdiscard.c
sys-utils/chcpu.c
sys-utils/chmem.c
sys-utils/ctrlaltdel.c
sys-utils/dmesg.c
sys-utils/eject.c
sys-utils/fallocate.c
sys-utils/flock.c
sys-utils/fsfreeze.c
sys-utils/fstrim.c
sys-utils/hwclock.c
sys-utils/ipcmk.c
sys-utils/ipcrm.c
sys-utils/ipcs.c
sys-utils/ldattach.c
sys-utils/losetup.c
sys-utils/lscpu.c
sys-utils/lsmem.c
sys-utils/lsns.c
sys-utils/mount.c
sys-utils/mountpoint.c
sys-utils/nsenter.c
sys-utils/pivot_root.c
sys-utils/prlimit.c
sys-utils/readprofile.c
sys-utils/setarch.c
sys-utils/setpriv.c
sys-utils/setsid.c
sys-utils/swapoff.c
sys-utils/swapon.c
sys-utils/tunelp.c
sys-utils/umount.c
sys-utils/unshare.c
sys-utils/wdctl.c
sys-utils/zramctl.c
term-utils/mesg.c
term-utils/script.c
term-utils/scriptreplay.c
term-utils/setterm.c
term-utils/wall.c
term-utils/write.c
text-utils/col.c
text-utils/colcrt.c
text-utils/colrm.c
text-utils/column.c
text-utils/hexdump.c
text-utils/line.c
text-utils/rev.c
text-utils/tailf.c
text-utils/ul.c

index fe2fc13ac158b04434be4812bebd90448f5a72cb..ed2a192e7b8ed3aa8f7c107495c96c2d268978b5 100644 (file)
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        return EXIT_SUCCESS;
index 73fd1ff4e60962c9b2d0709587d151654fcc645c..e003b18b5fea4ccdad13070708fded695a4c1513 100644 (file)
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        if (argc != 5)
index 5e70a234b554bb6144fd12909fbf7a2a0190c9a6..4e1f13b5f0d0a693d8b031582379624a14ef4af2 100644 (file)
@@ -2587,6 +2587,8 @@ int main(int argc, char *argv[])
                case 'z':
                        cf->zero_start = 1;
                        break;
+               default:
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index efa7a70ef5ebaf9777c31426e9a6ae88bba180fb..d39401f6ff123c93f08acfaf4008e93ff81a1b92 100644 (file)
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        if (argc != 3)
index 66e1bb90d6d3b26caa83141f9f5720397782a730..ad6b62b50d4f1b8ce9e7bf43374bec6ec487d8d3 100644 (file)
@@ -209,7 +209,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        argc -= optind;
index df7f0ceb349e57c8b2fc082af381095bb544ab85..a2b4daa36f0a994a12b97455dd92ee61f9aa56c3 100644 (file)
@@ -926,7 +926,7 @@ int main(int argc, char **argv)
                        fdisk_set_size_unit(cxt, FDISK_SIZEUNIT_BYTES);
                        break;
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 915c0c93c35c2e22d28babe8b066c54563dccca0..9e7bab898e5422cd613bd221c2288b805d1daa9e 100644 (file)
@@ -684,7 +684,7 @@ int main(int argc, char **argv)
                        blksize = strtou32_or_err(optarg, _("invalid blocksize argument"));
                        break;
                default:
-                       usage(FSCK_EX_USAGE);
+                       errtryhelp(FSCK_EX_USAGE);
                }
 
        if ((argc - optind) != 1)
index 97e558b76862d26aab9e510a4aab649a79016fe3..34fbfdf72fa626f0b2b31bc5448560076834cfab 100644 (file)
@@ -1323,7 +1323,7 @@ main(int argc, char **argv) {
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(FSCK_EX_USAGE);
                }
        argc -= optind;
        argv += optind;
index e35be6c7cb3f574004a424abfc9a11a42022a491..cd8a16fc8101eb8d282318b1a512cfc197dc4aa5 100644 (file)
@@ -218,7 +218,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        ct = argc - optind;
index d66da14eb31b9e782522e4b6c0eaa9974c623df1..0bf18509edd6032b693d9736f1c363a85e8c1a74 100644 (file)
@@ -172,7 +172,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index bf7f00838745118f9c10627c029f53d9937c06f2..3c7d0f599ae19729d1d01694a0fa61eeaffed0b0 100644 (file)
@@ -769,7 +769,7 @@ int main(int argc, char **argv)
                        opt_holes = 1;
                        break;
                default:
-                       usage(FSCK_EX_USAGE);
+                       errtryhelp(MKFS_EX_USAGE);
                }
        }
 
index 0e26966e5dfa70160959b3b0eb3d8a61e4425406..613a06997c7a754d1b11ec23707731448b2fac08 100644 (file)
@@ -793,7 +793,7 @@ int main(int argc, char ** argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(MKFS_EX_USAGE);
                }
        argc -= optind;
        argv += optind;
index 93a15deac7dee7842f74bfd37d285c0f86c840af..b367117dd2c68a1ce52f65daecae57935eb91e01 100644 (file)
@@ -402,7 +402,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index cff160fbe57998771c3a85d37a1c0f04ea52ef8a..d74a52a6ea5ee4e6e39073167ecba01fa872370b 100644 (file)
@@ -876,9 +876,8 @@ int main(int argc, char **argv)
                case 'V':
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
-               case '?':
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index b8dbe72fa9fbeee152a9ba01e968e14c4a8e7895..77945bc0fcdbe94d4f850a6b8f1bcc0abd995c16 100644 (file)
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
                case 'h':
                        usage(EXIT_SUCCESS);
                default:
-                       usage(EXIT_FAILURE);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        /*
index 9a6235b5dc269eeef731eb64230f290629ba87d0..5c6c0497a270838e2adc2881dabb4dd2115ab400 100644 (file)
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        if (argc != 4)
index 2d6597434ff9184b3084fbba3336c1892dc54953..fb9fa499a60f92f42b3aee432cca9fbd5ee2d8e7 100644 (file)
@@ -2102,7 +2102,7 @@ int main(int argc, char *argv[])
                        sf->notell = 1;
                        break;
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 89be2aed6777c785a02f1f583fb43917a07cae53..046efb49585d1c6afbc6fd0da34429986618043c 100644 (file)
@@ -168,8 +168,7 @@ int main(int argc, char *argv[])
 #endif
                        break;
                default:
-                       usage(stderr);
-                       break;
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index bf11d61acbef80ae0476357e3d069d74910b53c4..3f47dbdcb3ebfb1f5f830ddc69293b2f53bd3995 100644 (file)
@@ -212,6 +212,12 @@ errmsg(char doexit, int excode, char adderr, const char *fmt, ...)
        exit(eval); \
 })
 
+#define errtryh(eval) __extension__ ({ \
+       fprintf(stderr, _("Try '%s -h' for more information.\n"), \
+                       program_invocation_short_name); \
+       exit(eval); \
+})
+
 
 static inline __attribute__((const)) int is_power_of_2(unsigned long num)
 {
index 89e6bd7ecdfe7c9ee4effe8f1f565319c3329b6e..7f00f79a37b44be935505b1f22403e89e6203ecf 100644 (file)
@@ -175,7 +175,7 @@ static void parse_argv(struct chfn_control *ctl, int argc, char **argv)
                case 'u':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
                ctl->changed = 1;
                ctl->interactive = 0;
index e9e51832d822e9f53cbef4d567d185af17ff506c..79fc19d2c0b0936c6862a9ed569882ba50fe381b 100644 (file)
@@ -153,7 +153,7 @@ static void parse_argv(int argc, char **argv, struct sinfo *pinfo)
                        pinfo->shell = optarg;
                        break;
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
        /* done parsing arguments.  check for a username. */
index 75eff5b942de74aa609ad7ddf26c5656d9281e0f..7c243f1473e2a1e5afc13ea04f0fd16afa15c408 100644 (file)
@@ -1002,8 +1002,7 @@ int main(int argc, char **argv)
                        ctl.time_fmt = which_time_format(optarg);
                        break;
                default:
-                       usage(&ctl, stderr);
-                       break;
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index a08db6252151a1a8cb297fb1c6f1a8ea68f0c136..f7acac9b9da5282e9e07bcef9bc0a0ffa95fe46a 100644 (file)
@@ -1443,7 +1443,7 @@ int main(int argc, char *argv[])
                        break;
                }
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 56639d1f0bc679a6ec3782b9d91d1a8b3efc92c1..367333ec3bbc318ce614b694265eb96c7e8f06e4 100644 (file)
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        if (!(pw_entry = getpwuid(getuid())))
index 0a06ef8b6c00ce88b513030fc812a14b5588306c..cd62c36771eaaa836fa0165408ade55e279baeb2 100644 (file)
@@ -59,8 +59,7 @@ int main(int argc, char *argv[])
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_FAILURE;
                default:
-                       usage(stderr);
-                       break;
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 0928a2b1affdafdd464b50cf2f2255bc68eec591..6a50222efc5ee54d7e16e944b9f1733ef4828833 100644 (file)
@@ -856,7 +856,7 @@ su_main (int argc, char **argv, int mode)
          exit(EXIT_SUCCESS);
 
        default:
-         usage (EXIT_FAILURE);
+         errtryhelp(EXIT_FAILURE);
        }
     }
 
index fd90b5e10b9e4a6b31afa42cc5a5364f43da2094..91eb4fb557b104fb22c32da44267e889f1b516b9 100644 (file)
@@ -365,7 +365,7 @@ int main(int argc, char **argv)
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 8e86200949d9e6c12eeda10ccf18a9526eccb7fb..436d34d9d5257e0951d8a9512d49a61fb4cf55de 100644 (file)
@@ -765,10 +765,10 @@ int main(int argc, char **argv)
                        /* ignore - backward compatibility */
                        break;
                case 'h':
-                       err = 0;
-                       /* fallthrough */
+                       usage(0);
+                       break;
                default:
-                       usage(err);
+                       errtryh(EXIT_FAILURE);
                }
        }
 
index 0e2f0d4a04179f1437d7b01fd27d551c4830c832..8df397cbd8aed385b6b351d2e0cecf472d33dec8 100644 (file)
@@ -394,9 +394,8 @@ int main(int argc, char **argv)
                        return EXIT_SUCCESS;
                case 'h':
                        usage(stdout);
-               case '?':
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 564c74cc3c9ed2632234b7207d64104de9fcb80b..aff2847288c90b31ea5a7d7edf7d9a183b0f2a2a 100644 (file)
@@ -1477,8 +1477,7 @@ int main(int argc, char *argv[])
                        force_tree = 1;
                        break;
                default:
-                       usage(stderr);
-                       break;
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 0e1ebfffcb11b77d4785e6df7a62ba6ca0ad28d7..8111a927ebd99cab6089d856ac46a17cc92b030a 100644 (file)
@@ -1196,9 +1196,8 @@ int main(int argc, char **argv)
                                errx(EXIT_FAILURE, _("invalid structured data parameter: '%s'"), optarg);
                        add_structured_data_param(get_user_structured_data(&ctl), optarg);
                        break;
-               case '?':
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
        argc -= optind;
index 93c388e6a91f06f9d1acb0d79edff24af7a0ae53..58cb83b601571959940c346d504b24e32c98ed3a 100644 (file)
@@ -127,9 +127,8 @@ main(int argc, char *argv[])
                        return EXIT_SUCCESS;
                case 'h':
                        usage(stdout);
-               case '?':
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        argc -= optind;
        argv += optind;
index 684de082bfea5c4b0d46e4ceccd8fb5d78680ac5..639db313fb2366398e82435a78bbdc1407b37564 100644 (file)
@@ -586,9 +586,8 @@ int main(int argc, char *argv[])
                case 'u':
                        disable_columns_truncate();
                        break;
-               case '?':
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index ffeb36abee367b7cf51bc295fafa9698bd9300da..cc2d7ce6a38b18e059b96e5d088b96392108856f 100644 (file)
@@ -169,7 +169,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index df678e003879b7ae3f006469d926bb6f8aef7fb7..97e4d567406a80311243c098673795449ce214d9 100644 (file)
@@ -400,7 +400,7 @@ main(int argc, char **argv)
                        flags |= NAMEI_VERTICAL;
                        break;
                default:
-                       usage(EXIT_FAILURE);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index c8a4f8ca579def4e00ddafc746f8ee0ccee1e04d..f53b236e284f859857f8e95c6ca73c9c55571474 100644 (file)
@@ -164,7 +164,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        argc -= optind;
index 4a2daf936deb6b2f2389ce1b08134dcab6ec7899..34bb246da9dd122ca8043153ecdd1b72f4acd900 100644 (file)
@@ -37,6 +37,7 @@
 #include "c.h"
 #include "xalloc.h"
 #include "strutils.h"
+#include "nls.h"
 
 #define LOG(level,args) if (loglev >= level) { fprintf args; }
 
@@ -279,8 +280,7 @@ int main(int argc, char *argv[])
                        usage(stdout);
                        break;
                default:
-                       usage(stderr);
-                       break;
+                       errtryh(EXIT_FAILURE);
                }
        }
 
index 49cf9dc51e3289458d9a4f3af956bd715cf5a2a0..313a4afe0c1974de26fb59f6e6e79499c89a88e6 100644 (file)
@@ -641,7 +641,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 40b00ffeb250f3578ef40e89e9dfa6b572486518..911fead72e35e3be1b69fcc262ace85e0e027c04 100644 (file)
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        switch (do_type) {
index 0021e76e60c86f6ba0cc5229af97e8be6b7b8dea..2845b18f7d3e2cc1c7bf6671f09884b1f0e21939 100644 (file)
@@ -546,8 +546,7 @@ main(int argc, char **argv)
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                default:
-                       usage(stderr);
-                       break;
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 73d1ffa9b49f41c7f26a510c4569a4b2c92b5b2b..b52aec137454cd970915b50bf299ad321717ee7a 100644 (file)
@@ -439,8 +439,6 @@ int main(int argc, char **argv)
 
        while((c = getopt_long(argc, argv, "+abdD:fiphmoP:T:rRvV", longopts, NULL)) != -1)
        {
-               int ret = EXIT_FAILURE;
-
                switch (c) {
                case 'a':
                        ctl->all_tasks = 1;
@@ -496,10 +494,9 @@ int main(int argc, char **argv)
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                case 'h':
-                       ret = EXIT_SUCCESS;
-                       /* fallthrough */
+                       show_usage(EXIT_SUCCESS);
                default:
-                       show_usage(ret);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 5528afed562f2d64032646e74aa58064ba6ed13d..38a6846f9b8452efc5516f3a0159a87ae61d3351 100644 (file)
@@ -203,7 +203,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        switch (ioclass) {
index d6b21e45c0397d9c834a976ca6e771331b2e5cb1..199d625667384ebb95fd78ab55af210a9434f810 100644 (file)
@@ -172,8 +172,7 @@ int main(int argc, char **argv)
                        usage(stdout);
                        break;
                default:
-                       usage(stderr);
-                       break;
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index c83e12f20d437a76d00efc510deceb3a1b1d3e7b..2bfa7f85645682ca3a24ef50d18919187f8de49d 100644 (file)
@@ -163,8 +163,7 @@ int main(int argc, char **argv)
                        act = ACT_ZEROOUT;
                        break;
                default:
-                       usage(stderr);
-                       break;
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 50b834c0aded9fc6733ecaf13d2dcf3b07437df5..92019a91290c228a2a6bff5645c18f405538bb9c 100644 (file)
@@ -333,7 +333,7 @@ int main(int argc, char *argv[])
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 14f5aa48d2b7e15990bdf3aa7d64ee9aa2927008..ad394ac4c4f21198977e3dee1c59823769195d17 100644 (file)
@@ -308,6 +308,8 @@ int main(int argc, char **argv)
                case 'V':
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
+               default:
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 4a6958485b5a35d9a3ca18a266466e1561b5aecc..840945082d5890f2e73512c2fef5c5dcea39fa23 100644 (file)
@@ -100,7 +100,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        if (argc < 2)
index a06c6820da90d036321d68c859b989d7157bccb0..a608cf5742dc934a649e11baea23eea983ea43b7 100644 (file)
@@ -1380,9 +1380,8 @@ int main(int argc, char *argv[])
                case OPT_TIME_FORMAT:
                        ctl.time_fmt = which_time_format(optarg);
                        break;
-               case '?':
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
        argc -= optind;
index 008b4fe4e6fe86d7f48b7988d42234946d06504b..7bc68555ad29f0d8b7b9c473e805f2f6a282e4ba 100644 (file)
@@ -268,8 +268,7 @@ static void parse_args(struct eject_control *ctl, int argc, char **argv)
                        exit(EXIT_SUCCESS);
                        break;
                default:
-               case '?':
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                        break;
                }
        }
index 1663a8e7ecca97e257d2f65e9d6741e25788316f..eb37b38388d013214cc9d9fbf6f3a68a88d36fd3 100644 (file)
@@ -347,8 +347,7 @@ int main(int argc, char **argv)
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                default:
-                       usage(stderr);
-                       break;
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index dcd0f5e401ccb757fd69feacde59267e74e74945..08e313e6960c2f14dfc34a9c886da7fda57d1a02 100644 (file)
@@ -214,12 +214,10 @@ int main(int argc, char *argv[])
                case 'V':
                        printf(UTIL_LINUX_VERSION);
                        exit(EX_OK);
+               case 'h':
+                       usage(0);
                default:
-                       /* optopt will be set if this was an unrecognized
-                        * option, i.e.  *not* 'h' or '?
-                        */
-                       usage(optopt ? EX_USAGE : 0);
-                       break;
+                       errtryhelp(EX_USAGE);
                }
        }
 
index d4d5bd3df7d389a70289a60304d47b9a6506a74a..727319a6688f06f805ee17946538e7f368b77dba 100644 (file)
@@ -107,8 +107,7 @@ int main(int argc, char **argv)
                        printf(UTIL_LINUX_VERSION);
                        exit(EXIT_SUCCESS);
                default:
-                       usage(stderr);
-                       break;
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index b764b0b330751fd3b59c68795823a7f35bd0f53a..e92a822f01707309e29079badae9ee7aac58c609 100644 (file)
@@ -331,7 +331,7 @@ int main(int argc, char **argv)
                        verbose = 1;
                        break;
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                        break;
                }
        }
index d36c9c9b89672ef789c55f0bc4bffea620831382..10d9e37e995e3ef917c670b0513df7af56c107c0 100644 (file)
@@ -1850,9 +1850,9 @@ int main(int argc, char **argv)
                        out_version();
                        return 0;
                case 'h':                       /* --help */
-               case '?':
-               default:
                        usage(NULL);
+               default:
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index d79071c8d97efd30a1d61d4ff778349e7979fcc1..f18baf00d356495279741c042ed0e2c838e0d4cd 100644 (file)
@@ -127,8 +127,7 @@ int main(int argc, char **argv)
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                default:
-                       ask_shm = ask_msg = ask_sem = 0;
-                       break;
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 06bbd446bfce0de530834f2e81bdbf0e3e70bbfe..0432b224f2f137eea689c41bec1896c63a88de27 100644 (file)
@@ -403,7 +403,7 @@ int main(int argc, char **argv)
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
@@ -413,7 +413,7 @@ int main(int argc, char **argv)
        /* print usage if we still have some arguments left over */
        if (optind < argc) {
                warnx(_("unknown argument: %s"), argv[optind]);
-               usage(stderr);
+               errtryhelp(EXIT_FAILURE);
        }
 
        return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
index 10ce238837e025c9ee38b4c04874eda764e6d08b..6fab5b8108a7feb448da0a6a984489451dc94946 100644 (file)
@@ -155,7 +155,7 @@ int main (int argc, char **argv)
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 8961739db0259c37e50385a89dd243cb170aeceb..5d6dc0ba03cf3a9356bd811f5f409ce92af6d1b8 100644 (file)
@@ -356,8 +356,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(EXIT_SUCCESS);
                default:
-                       warnx(_("invalid option"));
-                       usage(EXIT_FAILURE);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 215ab9c8690d561e45ea2274fddbe39facac5d55..ad508109dce899f7163b8e5fa221ba2b53904c96 100644 (file)
@@ -698,7 +698,7 @@ int main(int argc, char **argv)
                        flags |= LOOPDEV_FL_SIZELIMIT;
                         break;
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index e3e6ff65c971093267511bab7669f22f990a70e4..df561ac7f1ea4526aeec5f8a53b0362f05f543b4 100644 (file)
@@ -2051,7 +2051,7 @@ int main(int argc, char *argv[])
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index e0de829b4e3d64a29243666dd0bc67a048d4cab5..69733d8717890fbe39a3a1317820672f8971a576 100644 (file)
@@ -491,7 +491,7 @@ int main(int argc, char **argv)
                                lsmem->want_table = 0;
                        break;
                default:
-                       lsmem_usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 809737cfaeec792330e0ffb0b9fd21471213a7bf..0c4ff449d5cf64ee776d759292c2e71db1076635 100644 (file)
@@ -718,9 +718,8 @@ int main(int argc, char *argv[])
                        ls.fltr_ntypes++;
                        break;
                }
-               case '?':
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 92526cf78687c74a411bec229e7a3fc6b4fd585e..b45de78ed9008a8707729e1d23dd82ca1031cb31 100644 (file)
@@ -1017,8 +1017,7 @@ int main(int argc, char **argv)
                        mnt_context_set_source(cxt, optarg);
                        break;
                default:
-                       usage(stderr);
-                       break;
+                       errtryhelp(MOUNT_EX_USAGE);
                }
        }
 
index 070d02478a97bd819cc123ba2651e4c49fbf8985..f5302937b3c8ceb01a120ab25acc8c2380c152e5 100644 (file)
@@ -173,8 +173,7 @@ int main(int argc, char **argv)
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                default:
-                       usage(stderr);
-                       break;
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index fc301d9f3cdd5659e04ab0872ae66680243396a9..6dc7b225cfcf9eb87424a0c979e6adb4fcc570af 100644 (file)
@@ -338,7 +338,7 @@ int main(int argc, char *argv[])
                        break;
 #endif
                default:
-                       usage(EXIT_FAILURE);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index a7b28bf09e9ead318056de0e7ac56b5b6fa95ccf..acc105621258b9cfee89b53055d2d203c2911554 100644 (file)
@@ -65,7 +65,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        if (argc != 3)
index b244ddb8870182dcba987492d1b64a74f722f333..b4ad739ed08e27f4606fe5241919c55959bef4c5 100644 (file)
@@ -607,9 +607,8 @@ int main(int argc, char **argv)
                case RAW_OPTION:
                        raw = 1;
                        break;
-
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
        if (argc > optind && pid)
index 39a24deda353d6984d7a09cb333a2384a80e5d4d..0170a72405a57674464c292b973507806d2ede91 100644 (file)
@@ -213,7 +213,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index d3d52c2ec1c1812fbaa718fd7c6ed6b01804ae6d..eb9cf21a09f3cf000e54b35a5d18bf8561b62802 100644 (file)
@@ -379,7 +379,7 @@ int main(int argc, char *argv[])
                                warnx(_("unrecognized option '--list'"));
                        /* fallthrough */
                default:
-                       show_usage(NULL);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 977ccd14a9e4198ac87d8bfe641678e4990a4658..897be3fd0c986249f979a78a3b293502f10f8d6e 100644 (file)
@@ -750,10 +750,8 @@ int main(int argc, char **argv)
                case 'V':
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
-               case '?':
-                       usage(stderr);
                default:
-                       errx(EXIT_FAILURE, _("unrecognized option '%c'"), c);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index bae97ff9bd3390f02e51804aee752c8cd4b95a8d..ecc32ef410fdd568fe76495118a84e6f80ae105c 100644 (file)
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        if (argc - optind < 1)
index dd3bf05fc14037431d5901024b788fcf63255cfb..e20c502bde608abda61cb13e6379a6872177be62 100644 (file)
@@ -221,9 +221,8 @@ int main(int argc, char *argv[])
                case 'U':
                        add_uuid(optarg);
                        break;
-               case '?':
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
        argv += optind;
index 0ee5caf448904e8f7adc8b9578e3e536152cf3c3..0bf95a5cc08f22829e8857388e1174cb3297cd41 100644 (file)
@@ -960,9 +960,8 @@ int main(int argc, char *argv[])
                        return EXIT_SUCCESS;
                case 0:
                        break;
-               case '?':
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
        argv += optind;
index 8ea5c0238071f4d99ab9d646aec6f59ca03b2447..7b38255d6a09b920d4ef3efae8ce980ff3539103 100644 (file)
@@ -238,7 +238,7 @@ int main(int argc, char **argv)
                        printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                default:
-                       print_usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 0c81970c7c71824de185597f37f82d471a68fef0..950a18c59fe1af5dc0045f6a32a64dd937d55576 100644 (file)
@@ -610,8 +610,7 @@ int main(int argc, char **argv)
                        print_version();
                        break;
                default:
-                       usage(stderr);
-                       break;
+                       errtryhelp(MOUNT_EX_USAGE);
                }
        }
 
index 234c7501fa8ac59f955468f25b113708b9cf5e2b..edd9bbe694b961d0e28e843d0d20269aa67bb6ee 100644 (file)
@@ -375,7 +375,7 @@ int main(int argc, char *argv[])
                        propagation = parse_propagation(optarg);
                        break;
                default:
-                       usage(EXIT_FAILURE);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 761142f2c664c3f9c7e414947dc6f906e89c8b6a..49711f0cfd9b7b119c97dcbce57df6e7d366cae0 100644 (file)
@@ -553,10 +553,8 @@ int main(int argc, char *argv[])
                        noident = 1;
                        notimeouts = 1;
                        break;
-
-               case '?':
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 853401caf21af4596101bf67263d28f06c2c85d0..29bdb851895c1bb9861000f1818f266a6243d309 100644 (file)
@@ -640,7 +640,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 4181a587426b1be53891f10ccd186c249d85188c..af9a81ebc9d7b3d1efce1a507b248b9a3ae05f35 100644 (file)
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        argc -= optind;
index e90644aed46d23750a78fbca544c86f0053ae19d..a1bf9a608ada3ced425d3a2d9e8aed1ab6dda560 100644 (file)
@@ -731,7 +731,7 @@ int main(int argc, char **argv)
                        usage(stdout);
                        break;
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        argc -= optind;
        argv += optind;
index 146133518e2974802aa80d6a87c2fd18848fd2b9..5fd3ecb164243e593ff809c28166186edfe4df19 100644 (file)
@@ -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++];
index f1cdd24078b26475ab41fc6d19f7ddc393fc1600..abcf8b2916a287ad025c71676e63bb3781f4f503 100644 (file)
@@ -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);
                }
        }
 }
index 481af7271859f24b9919ebe2e4a76bb68a9a4ea4..fe72e1e1dbbb82adda873db22d128b8bb5e82d03 100644 (file)
@@ -217,7 +217,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
        argc -= optind;
index 2b05e89d9b9ed570e8c1ad9a8622ce46215d77e3..13d4745f9b498e6ef1b822390d94915911cd37b0 100644 (file)
@@ -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;
index 0823573f45e22826e7ea1773abd9a945b0b4fa5a..9b0e23058885a826f67872a7420cb3b6d48651e3 100644 (file)
@@ -223,7 +223,7 @@ int main(int argc, char **argv)
                case 'H':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        if (optind != argc)
index 62f84251a0b4a59a8d7ee3f0ec6d4a8d2c5d6519..c6bba4b50f399a54c2533e74d8838ce7310795b0 100644 (file)
@@ -266,7 +266,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 431eae0d2fec371b93aad6228dcf6ad21982d57c..9510b7296300a85eca7350ebb62e7b76f39dfe5a 100644 (file)
@@ -178,7 +178,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        if (argc > 1)
index b8d31c989a451085f74c52467ee65bbcc21826b6..a642d84327e735d1ad469563a93f9de47dcfe65c 100644 (file)
@@ -196,7 +196,7 @@ int main(int argc, char **argv)
                        xflag = 1;
                        break;
                default:
-                       usage(EXIT_FAILURE);
+                       errtryhelp(EXIT_FAILURE);
        }
        argc -= optind;
        argv += optind;
index 9d26c4e48053dd967eca5a098583c1edf78a3cdd..125734dfee23548f6a23b5e32b8467a12fb0af2d 100644 (file)
@@ -137,7 +137,7 @@ parse_args(int argc, char **argv, struct hexdump *hex)
                        exit(EXIT_SUCCESS);
                        break;
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        }
 
index 7bee6d2fdc981c576108d3d52c4f7c87011fb319..486e5dd31fee72ea9188d8b13852df70eef6a439 100644 (file)
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        setvbuf(stdin, NULL, _IONBF, 0);
index 735aaef3d9f76383bbfa4caa32eac36f154c1fc7..fe3884389764698a91f6e272141ca394a9bae1a1 100644 (file)
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        argc -= optind;
index c111d02c0ebd0f72efe7a9a230dcc78fb686f17e..9f175822ca763d114b36f3371d46bb9d75491079 100644 (file)
@@ -268,7 +268,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        if (argc == optind)
index 3fd0b6a85d4b8013ea33138451485a37bd8c0b22..5421c24a0554091f48fd64c7b27f89f5b0c56c66 100644 (file)
@@ -192,7 +192,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage(stdout);
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
        setupterm(termtype, STDOUT_FILENO, &ret);
        switch (ret) {