diff options
author | Ruediger Meier | 2017-06-25 00:19:50 +0200 |
---|---|---|
committer | Ruediger Meier | 2017-06-27 12:26:19 +0200 |
commit | b1a294c448582c5571fbf7c0d363357c88154016 (patch) | |
tree | 97a83cb04af7879473368edb259781ad02a89272 | |
parent | misc: revert to the old USAGE_HELP strings (diff) | |
download | kernel-qcow2-util-linux-b1a294c448582c5571fbf7c0d363357c88154016.tar.gz kernel-qcow2-util-linux-b1a294c448582c5571fbf7c0d363357c88154016.tar.xz kernel-qcow2-util-linux-b1a294c448582c5571fbf7c0d363357c88154016.zip |
misc: introduce print_usage_help_options()
Consolidate --help and --version descriptions. We are
now able to align them to the other options.
We changed include/c.h. The rest of this patch was
generated by sed, plus manually setting the right
alignment numbers. We do not change anything but
white spaces in the --help output.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
94 files changed, 105 insertions, 187 deletions
diff --git a/Documentation/boilerplate.c b/Documentation/boilerplate.c index d0c163d8c..c97ad46bc 100644 --- a/Documentation/boilerplate.c +++ b/Documentation/boilerplate.c @@ -56,8 +56,7 @@ static void __attribute__((__noreturn__)) usage(void) " consecutive lines are intended by two spaces\n"), out); fputs(_(" -f, --foobar next option description resets indent\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(25); /* char offset to align option descriptions */ fprintf(out, USAGE_MAN_TAIL("fixme-command-name(1)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/addpart.c b/disk-utils/addpart.c index 07f4ca9a1..e793ae03f 100644 --- a/disk-utils/addpart.c +++ b/disk-utils/addpart.c @@ -19,8 +19,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Tell the kernel about the existence of a specified partition.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("addpart(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c index e17bc9167..6bacc60f3 100644 --- a/disk-utils/cfdisk.c +++ b/disk-utils/cfdisk.c @@ -2559,8 +2559,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -z, --zero start with zeroed partition table\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(26); fprintf(out, USAGE_MAN_TAIL("cfdisk(8)")); exit(EXIT_SUCCESS); diff --git a/disk-utils/delpart.c b/disk-utils/delpart.c index 7f347c886..83cd1ce46 100644 --- a/disk-utils/delpart.c +++ b/disk-utils/delpart.c @@ -19,8 +19,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Tell the kernel to forget about a specified partition.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("delpart(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c index 4b5ed5690..f84b84733 100644 --- a/disk-utils/fdformat.c +++ b/disk-utils/fdformat.c @@ -156,8 +156,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -n, --no-verify disable the verification after the format\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(19); fprintf(out, USAGE_MAN_TAIL("fdformat(8)")); exit(EXIT_SUCCESS); diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c index afd968076..937304c7e 100644 --- a/disk-utils/fdisk.c +++ b/disk-utils/fdisk.c @@ -785,8 +785,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -S, --sectors <number> specify the number of sectors per track\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(31); list_available_columns(out); diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c index ff056c869..9fade86d2 100644 --- a/disk-utils/fsck.cramfs.c +++ b/disk-utils/fsck.cramfs.c @@ -120,8 +120,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -b, --blocksize <size> use this blocksize, defaults to page size\n"), out); fputs(_(" --extract[=<dir>] test uncompression, optionally extract into <dir>\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fputs(USAGE_SEPARATOR, out); exit(FSCK_EX_OK); diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c index 13b12926c..a96f77f6f 100644 --- a/disk-utils/fsck.minix.c +++ b/disk-utils/fsck.minix.c @@ -192,8 +192,7 @@ usage(void) { fputs(_(" -m, --uncleared activate mode not cleared warnings\n"), out); fputs(_(" -f, --force force check\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(18); fprintf(out, USAGE_MAN_TAIL("fsck.minix(8)")); exit(FSCK_EX_OK); } diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c index ed43c9d70..2b2e1ee66 100644 --- a/disk-utils/isosize.c +++ b/disk-utils/isosize.c @@ -141,8 +141,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -d, --divisor=<number> divide the amount of bytes by <number>\n"), out); fputs(_(" -x, --sectors show sector count and size\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(25); fprintf(out, USAGE_MAN_TAIL("isosize(8)")); exit(EXIT_SUCCESS); diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c index 74664a811..9adc2899e 100644 --- a/disk-utils/mkfs.cramfs.c +++ b/disk-utils/mkfs.cramfs.c @@ -144,8 +144,7 @@ static void __attribute__((__noreturn__)) usage(void) program_invocation_short_name, PAD_SIZE); fputs(USAGE_SEPARATOR, stdout); - fputs(USAGE_HELP, stdout); - fputs(USAGE_VERSION, stdout); + print_usage_help_options(16); printf(USAGE_MAN_TAIL("mkfs.cramfs(8)")); exit(MKFS_EX_OK); } diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c index 39e159f7a..e77d0b89f 100644 --- a/disk-utils/mkfs.minix.c +++ b/disk-utils/mkfs.minix.c @@ -145,8 +145,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -c, --check check the device for bad blocks\n"), out); fputs(_(" -l, --badblocks <file> list of bad blocks from file\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(25); fprintf(out, USAGE_MAN_TAIL("mkfs.minix(8)")); exit(MKFS_EX_OK); } diff --git a/disk-utils/partx.c b/disk-utils/partx.c index 9a868cd81..474c80e46 100644 --- a/disk-utils/partx.c +++ b/disk-utils/partx.c @@ -773,8 +773,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -v, --verbose verbose mode\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(22); fputs(USAGE_COLUMNS, out); for (i = 0; i < NCOLS; i++) diff --git a/disk-utils/raw.c b/disk-utils/raw.c index c881d86ee..1de7f813e 100644 --- a/disk-utils/raw.c +++ b/disk-utils/raw.c @@ -59,8 +59,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(USAGE_OPTIONS, out); fputs(_(" -q, --query set query mode\n"), out); fputs(_(" -a, --all query all raw devices\n"), out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("raw(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/resizepart.c b/disk-utils/resizepart.c index a234c8079..38e7cacea 100644 --- a/disk-utils/resizepart.c +++ b/disk-utils/resizepart.c @@ -24,8 +24,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Tell the kernel about the new size of a partition.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("resizepart(8)")); exit(EXIT_SUCCESS); } diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c index 6f88780d7..8616ee950 100644 --- a/disk-utils/sfdisk.c +++ b/disk-utils/sfdisk.c @@ -1901,8 +1901,8 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -u, --unit S deprecated, only sector unit is supported\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(_(" -v, --version output version information and exit\n"), out); + printf( " -h, --help %s\n", USAGE_OPTSTR_HELP); + printf( " -v, --version %s\n", USAGE_OPTSTR_VERSION); list_available_columns(out); diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c index c8fede25e..c4e6873c0 100644 --- a/disk-utils/swaplabel.c +++ b/disk-utils/swaplabel.c @@ -125,8 +125,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -L, --label <label> specify a new label\n" " -U, --uuid <uuid> specify a new uuid\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(21); fprintf(out, USAGE_MAN_TAIL("swaplabel(8)")); exit(EXIT_SUCCESS); } diff --git a/include/c.h b/include/c.h index fe46b8c2d..94ebf7e7d 100644 --- a/include/c.h +++ b/include/c.h @@ -315,8 +315,18 @@ static inline int xusleep(useconds_t usec) #define USAGE_COMMANDS _("\nCommands:\n") #define USAGE_COLUMNS _("\nAvailable output columns:\n") #define USAGE_SEPARATOR "\n" -#define USAGE_HELP _(" -h, --help display this help and exit\n") -#define USAGE_VERSION _(" -V, --version output version information and exit\n") + +#define USAGE_OPTSTR_HELP _("display this help and exit") +#define USAGE_OPTSTR_VERSION _("output version information and exit") + +#define print_usage_help_options(marg_dsc) \ + printf( \ + "%-" #marg_dsc "s%s\n" \ + "%-" #marg_dsc "s%s\n" \ + , " -h, --help", USAGE_OPTSTR_HELP \ + , " -V, --version", USAGE_OPTSTR_VERSION \ + ) + #define USAGE_MAN_TAIL(_man) _("\nFor more details see %s.\n"), _man #define UTIL_LINUX_VERSION _("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING diff --git a/login-utils/last.c b/login-utils/last.c index 9cf6eb377..1218a3018 100644 --- a/login-utils/last.c +++ b/login-utils/last.c @@ -589,8 +589,7 @@ static void __attribute__((__noreturn__)) usage(const struct last_control *ctl) " notime|short|full|iso\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(22); fprintf(out, USAGE_MAN_TAIL("last(1)")); exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c index c15b347f2..8b9933eb7 100644 --- a/login-utils/lslogins.c +++ b/login-utils/lslogins.c @@ -1253,8 +1253,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" --wtmp-file <path> set an alternate path for wtmp\n"), out); fputs(_(" --btmp-file <path> set an alternate path for btmp\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(26); fputs(USAGE_COLUMNS, out); for (i = 0; i < ARRAY_SIZE(coldescs); i++) diff --git a/login-utils/newgrp.c b/login-utils/newgrp.c index 767ae4bcf..ce3fefbc1 100644 --- a/login-utils/newgrp.c +++ b/login-utils/newgrp.c @@ -176,8 +176,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Log in to a new group.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(USAGE_HELP,out); - fputs(USAGE_VERSION,out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("newgrp(1)")); exit(EXIT_SUCCESS); } diff --git a/login-utils/nologin.c b/login-utils/nologin.c index 00b4b8af8..44604dc77 100644 --- a/login-utils/nologin.c +++ b/login-utils/nologin.c @@ -30,8 +30,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Politely refuse a login.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("nologin(8)")); exit(EXIT_FAILURE); diff --git a/login-utils/su-common.c b/login-utils/su-common.c index d7b0a93dd..574d98e22 100644 --- a/login-utils/su-common.c +++ b/login-utils/su-common.c @@ -709,8 +709,7 @@ usage(void) fputs (_(" -s, --shell <shell> run <shell> if /etc/shells allows it\n"), stdout); fputs(USAGE_SEPARATOR, stdout); - fputs(USAGE_HELP, stdout); - fputs(USAGE_VERSION, stdout); + print_usage_help_options(33); printf(USAGE_MAN_TAIL(su_mode == SU_MODE ? "su(1)" : "runuser(1)")); exit(EXIT_SUCCESS); } diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c index ac6a15c38..45f6cfa4c 100644 --- a/login-utils/sulogin.c +++ b/login-utils/sulogin.c @@ -812,8 +812,7 @@ static void usage(void) out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(26); fprintf(out, USAGE_MAN_TAIL("sulogin(8)")); } diff --git a/login-utils/utmpdump.c b/login-utils/utmpdump.c index 5bcb4c35f..41d6c3b1a 100644 --- a/login-utils/utmpdump.c +++ b/login-utils/utmpdump.c @@ -311,8 +311,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -f, --follow output appended data as the file grows\n"), out); fputs(_(" -r, --reverse write back dumped data into utmp file\n"), out); fputs(_(" -o, --output <file> write to file instead of standard output\n"), out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(22); fprintf(out, USAGE_MAN_TAIL("utmpdump(1)")); exit(EXIT_SUCCESS); diff --git a/login-utils/vipw.c b/login-utils/vipw.c index e3cca4906..e5614af65 100644 --- a/login-utils/vipw.c +++ b/login-utils/vipw.c @@ -306,8 +306,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Edit the password or group file.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("vipw(8)")); exit(EXIT_SUCCESS); } diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c index f4757e8c8..3aa2ee5a6 100644 --- a/misc-utils/blkid.c +++ b/misc-utils/blkid.c @@ -103,8 +103,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_( " -n, --match-types <list> filter by filesystem type (e.g. -n vfat,ext3)\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(28); fprintf(out, USAGE_MAN_TAIL("blkid(8)")); exit(EXIT_SUCCESS); } diff --git a/misc-utils/cal.c b/misc-utils/cal.c index f73cbbf30..870fa689b 100644 --- a/misc-utils/cal.c +++ b/misc-utils/cal.c @@ -1015,8 +1015,7 @@ static void __attribute__((__noreturn__)) usage(void) " %s\n", USAGE_COLORS_DEFAULT); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(23); fprintf(out, USAGE_MAN_TAIL("cal(1)")); exit(EXIT_SUCCESS); diff --git a/misc-utils/fincore.c b/misc-utils/fincore.c index f1b9fa758..9ef912758 100644 --- a/misc-utils/fincore.c +++ b/misc-utils/fincore.c @@ -274,8 +274,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -r, --raw use raw output format\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(23); fprintf(out, USAGE_COLUMNS); diff --git a/misc-utils/findfs.c b/misc-utils/findfs.c index c01dc1d53..fc16e44e6 100644 --- a/misc-utils/findfs.c +++ b/misc-utils/findfs.c @@ -33,8 +33,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Find a filesystem by label or UUID.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("findfs(8)")); exit(FINDFS_SUCCESS); } diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c index 5394d1a60..3970a7d3b 100644 --- a/misc-utils/findmnt.c +++ b/misc-utils/findmnt.c @@ -1246,8 +1246,7 @@ static void __attribute__((__noreturn__)) usage(void) fputc('\n', out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(24); fputs(USAGE_COLUMNS, out); for (i = 0; i < ARRAY_SIZE(infos); i++) diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c index 87d088ed5..8150e3c03 100644 --- a/misc-utils/getopt.c +++ b/misc-utils/getopt.c @@ -346,8 +346,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -T, --test test for getopt(1) version\n"), stdout); fputs(_(" -u, --unquoted do not quote the output\n"), stdout); fputs(USAGE_SEPARATOR, stdout); - fputs(USAGE_HELP, stdout); - fputs(USAGE_VERSION, stdout); + print_usage_help_options(31); printf(USAGE_MAN_TAIL("getopt(1)")); exit(EXIT_SUCCESS); } diff --git a/misc-utils/kill.c b/misc-utils/kill.c index ecee26c4e..0778c6fad 100644 --- a/misc-utils/kill.c +++ b/misc-utils/kill.c @@ -318,8 +318,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" --verbose print pids that will be signaled\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(24); fprintf(out, USAGE_MAN_TAIL("kill(1)")); exit(EXIT_SUCCESS); diff --git a/misc-utils/logger.c b/misc-utils/logger.c index 0ae5c61d0..1ef60bb76 100644 --- a/misc-utils/logger.c +++ b/misc-utils/logger.c @@ -1027,8 +1027,7 @@ static void __attribute__((__noreturn__)) usage(void) #endif fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(26); fprintf(out, USAGE_MAN_TAIL("logger(1)")); exit(EXIT_SUCCESS); diff --git a/misc-utils/look.c b/misc-utils/look.c index a0d898db1..dfb77319b 100644 --- a/misc-utils/look.c +++ b/misc-utils/look.c @@ -365,8 +365,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -t, --terminate <char> define the string-termination character\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(26); fprintf(out, USAGE_MAN_TAIL("look(1)")); exit(EXIT_SUCCESS); diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c index d997bc71e..983804b9c 100644 --- a/misc-utils/lsblk.c +++ b/misc-utils/lsblk.c @@ -1658,8 +1658,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -t, --topology output info about topology\n"), out); fputs(_(" -x, --sort <column> sort output by <column>\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(22); fprintf(out, USAGE_COLUMNS); diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c index 54440496a..d872e2dc7 100644 --- a/misc-utils/lslocks.c +++ b/misc-utils/lslocks.c @@ -507,8 +507,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -u, --notruncate don't truncate text in columns\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(24); fputs(USAGE_COLUMNS, out); diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c index 89b9a01eb..ce9c4bf44 100644 --- a/misc-utils/mcookie.c +++ b/misc-utils/mcookie.c @@ -91,8 +91,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -v, --verbose explain what is being done\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(23); fprintf(out, USAGE_MAN_TAIL("mcookie(1)")); exit(EXIT_SUCCESS); diff --git a/misc-utils/rename.c b/misc-utils/rename.c index 48606d75e..f5029836a 100644 --- a/misc-utils/rename.c +++ b/misc-utils/rename.c @@ -144,8 +144,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -n, --no-act do not make any changes\n"), out); fputs(_(" -o, --no-overwrite don't overwrite existing files\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(21); fprintf(out, USAGE_MAN_TAIL("rename(1)")); exit(EXIT_SUCCESS); } diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c index faaa0c12f..492ad83d9 100644 --- a/misc-utils/uuidd.c +++ b/misc-utils/uuidd.c @@ -79,8 +79,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -d, --debug run in debugging mode\n"), out); fputs(_(" -q, --quiet turn on quiet mode\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(25); fprintf(out, USAGE_MAN_TAIL("uuidd(8)")); exit(EXIT_SUCCESS); } diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c index 77fda2fb3..8252fd528 100644 --- a/misc-utils/uuidgen.c +++ b/misc-utils/uuidgen.c @@ -32,8 +32,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -r, --random generate random-based uuid\n"), out); fputs(_(" -t, --time generate time-based uuid\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(18); fprintf(out, USAGE_MAN_TAIL("uuidgen(1)")); exit(EXIT_SUCCESS); } diff --git a/misc-utils/uuidparse.c b/misc-utils/uuidparse.c index 0938b8559..c3db4271c 100644 --- a/misc-utils/uuidparse.c +++ b/misc-utils/uuidparse.c @@ -105,8 +105,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -r, --raw use the raw output format\n"), stdout); fputs(USAGE_SEPARATOR, stdout); - fputs(USAGE_HELP, stdout); - fputs(USAGE_VERSION, stdout); + print_usage_help_options(24); fputs(USAGE_COLUMNS, stdout); for (i = 0; i < ARRAY_SIZE(infos); i++) diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c index 897a7a213..b4291c4e8 100644 --- a/misc-utils/whereis.c +++ b/misc-utils/whereis.c @@ -205,8 +205,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -l output effective lookup paths\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("whereis(1)")); exit(EXIT_SUCCESS); } diff --git a/schedutils/chrt.c b/schedutils/chrt.c index d1abbe14e..fbe20e160 100644 --- a/schedutils/chrt.c +++ b/schedutils/chrt.c @@ -165,8 +165,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -v, --verbose display status information\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(22); fprintf(out, USAGE_MAN_TAIL("chrt(1)")); exit(EXIT_SUCCESS); diff --git a/schedutils/ionice.c b/schedutils/ionice.c index 9d0648bca..098fb255e 100644 --- a/schedutils/ionice.c +++ b/schedutils/ionice.c @@ -121,8 +121,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -u, --uid <uid>... act on already running processes owned by these users\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(24); fprintf(out, USAGE_MAN_TAIL("ionice(1)")); diff --git a/schedutils/taskset.c b/schedutils/taskset.c index 9870040e7..c55b986fb 100644 --- a/schedutils/taskset.c +++ b/schedutils/taskset.c @@ -78,7 +78,6 @@ static void __attribute__((__noreturn__)) usage(void) program_invocation_short_name); fprintf(out, USAGE_MAN_TAIL("taskset(1)")); - exit(EXIT_SUCCESS); } diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c index e6a9dce5c..d078f297b 100644 --- a/sys-utils/blkdiscard.c +++ b/sys-utils/blkdiscard.c @@ -96,8 +96,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -v, --verbose print aligned length and offset\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(21); fprintf(out, USAGE_MAN_TAIL("blkdiscard(8)")); exit(EXIT_SUCCESS); diff --git a/sys-utils/blkzone.c b/sys-utils/blkzone.c index ee4902e45..28038f071 100644 --- a/sys-utils/blkzone.c +++ b/sys-utils/blkzone.c @@ -311,8 +311,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -c, --count <number> maximum number of zones\n"), out); fputs(_(" -v, --verbose display more details\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(24); fprintf(out, USAGE_MAN_TAIL("blkzone(8)")); exit(EXIT_SUCCESS); diff --git a/sys-utils/chmem.c b/sys-utils/chmem.c index 7f7be6ab6..b0060ae25 100644 --- a/sys-utils/chmem.c +++ b/sys-utils/chmem.c @@ -249,8 +249,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -b, --blocks use memory blocks\n"), out); fputs(_(" -v, --verbose verbose output\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("chmem(8)")); diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c index 98c8ed832..6b3f38f56 100644 --- a/sys-utils/ctrlaltdel.c +++ b/sys-utils/ctrlaltdel.c @@ -31,8 +31,7 @@ static void __attribute__((__noreturn__)) usage(void) fprintf(out, _("Set the function of the Ctrl-Alt-Del combination.\n")); fputs(USAGE_OPTIONS, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION,out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("ctrlaltdel(8)")); exit(EXIT_SUCCESS); } diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c index cd5da90f4..0db567bfa 100644 --- a/sys-utils/dmesg.c +++ b/sys-utils/dmesg.c @@ -306,8 +306,7 @@ static void __attribute__((__noreturn__)) usage(void) " [delta|reltime|ctime|notime|iso]\n" "Suspending/resume will make ctime and iso timestamps inaccurate.\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(29); fputs(_("\nSupported log facilities:\n"), out); for (i = 0; i < ARRAY_SIZE(level_names); i++) fprintf(out, " %7s - %s\n", diff --git a/sys-utils/eject.c b/sys-utils/eject.c index 296e5cba5..f1d4474eb 100644 --- a/sys-utils/eject.c +++ b/sys-utils/eject.c @@ -159,8 +159,7 @@ static void __attribute__((__noreturn__)) usage(void) out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(29); fputs(_("\nBy default tries -r, -s, -f, and -q in order until success.\n"), out); fprintf(out, USAGE_MAN_TAIL("eject(1)")); diff --git a/sys-utils/fallocate.c b/sys-utils/fallocate.c index a2d212552..d5dd9f7e1 100644 --- a/sys-utils/fallocate.c +++ b/sys-utils/fallocate.c @@ -101,8 +101,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -v, --verbose verbose mode\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(22); fprintf(out, USAGE_MAN_TAIL("fallocate(1)")); diff --git a/sys-utils/flock.c b/sys-utils/flock.c index 5abe2def5..170f96771 100644 --- a/sys-utils/flock.c +++ b/sys-utils/flock.c @@ -70,8 +70,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_( " -F, --no-fork execute command without forking\n"), stdout); fputs(_( " --verbose increase verbosity\n"), stdout); fputs(USAGE_SEPARATOR, stdout); - fputs(USAGE_HELP, stdout); - fputs(USAGE_VERSION, stdout); + print_usage_help_options(26); printf(USAGE_MAN_TAIL("flock(1)")); exit(EXIT_SUCCESS); } diff --git a/sys-utils/fsfreeze.c b/sys-utils/fsfreeze.c index 8b0d5d10e..487759220 100644 --- a/sys-utils/fsfreeze.c +++ b/sys-utils/fsfreeze.c @@ -47,8 +47,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -f, --freeze freeze the filesystem\n"), out); fputs(_(" -u, --unfreeze unfreeze the filesystem\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(19); fprintf(out, USAGE_MAN_TAIL("fsfreeze(8)")); exit(EXIT_SUCCESS); diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c index 698f30a93..56a145066 100644 --- a/sys-utils/fstrim.c +++ b/sys-utils/fstrim.c @@ -262,8 +262,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -v, --verbose print number of discarded bytes\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(21); fprintf(out, USAGE_MAN_TAIL("fstrim(8)")); exit(EXIT_SUCCESS); } diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index f3448a569..98ee5bef5 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -1241,8 +1241,7 @@ usage(const struct hwclock_control *ctl) fputs(_(" --test dry run; use -D to view what would have happened\n"), out); fputs(_(" -D, --debug use debug mode\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(22); fprintf(out, USAGE_MAN_TAIL("hwclock(8)")); hwclock_exit(ctl, EXIT_SUCCESS); } diff --git a/sys-utils/ipcmk.c b/sys-utils/ipcmk.c index c6d322cbf..c7b4a83ee 100644 --- a/sys-utils/ipcmk.c +++ b/sys-utils/ipcmk.c @@ -76,8 +76,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -p, --mode <mode> permission for the resource (default is 0644)\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(26); fprintf(out, USAGE_MAN_TAIL("ipcmk(1)")); exit(EXIT_SUCCESS); diff --git a/sys-utils/ipcrm.c b/sys-utils/ipcrm.c index a60919d9b..c1c8de25a 100644 --- a/sys-utils/ipcrm.c +++ b/sys-utils/ipcrm.c @@ -65,8 +65,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -v, --verbose explain what is being done\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(28); fprintf(out, USAGE_MAN_TAIL("ipcrm(1)")); exit(EXIT_SUCCESS); diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c index 943b09c4a..e63f10afe 100644 --- a/sys-utils/ipcs.c +++ b/sys-utils/ipcs.c @@ -58,8 +58,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(USAGE_OPTIONS, out); fputs(_(" -i, --id <id> print details on resource identified by <id>\n"), out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fputs(USAGE_SEPARATOR, out); fputs(_("Resource options:\n"), out); diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c index 9a3915b1c..3c6b4aad6 100644 --- a/sys-utils/ldattach.c +++ b/sys-utils/ldattach.c @@ -213,8 +213,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -i, --iflag [-]<iflag> set input mode flag\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(25); fputs(_("\nKnown <ldisc> names:\n"), out); print_table(out, ld_discs); diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c index 593d3b536..d4740bd94 100644 --- a/sys-utils/losetup.c +++ b/sys-utils/losetup.c @@ -419,8 +419,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" --raw use raw --list output format\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(31); fputs(USAGE_COLUMNS, out); for (i = 0; i < ARRAY_SIZE(infos); i++) diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c index 2504da2e0..424b9de0e 100644 --- a/sys-utils/lscpu.c +++ b/sys-utils/lscpu.c @@ -2066,8 +2066,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -x, --hex print hexadecimal masks rather than lists of CPUs\n"), out); fputs(_(" -y, --physical print physical instead of logical IDs\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(25); fputs(USAGE_COLUMNS, out); for (i = 0; i < ARRAY_SIZE(coldescs); i++) diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c index 8ac50d67a..4bbd8d77b 100644 --- a/sys-utils/lsipc.c +++ b/sys-utils/lsipc.c @@ -304,8 +304,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -t, --time show attach, detach and change times\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(26); fprintf(out, _("\nGeneric columns:\n")); for (i = COLDESC_IDX_GEN_FIRST; i <= COLDESC_IDX_GEN_LAST; i++) diff --git a/sys-utils/lsmem.c b/sys-utils/lsmem.c index 4efd29632..04e7d20be 100644 --- a/sys-utils/lsmem.c +++ b/sys-utils/lsmem.c @@ -386,8 +386,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" --summary[=when] print summary information (never,always or only)\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(22); fputs(USAGE_COLUMNS, out); for (i = 0; i < ARRAY_SIZE(coldescs); i++) diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c index 6cadd0ef5..6ed772c9f 100644 --- a/sys-utils/lsns.c +++ b/sys-utils/lsns.c @@ -627,8 +627,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -t, --type <name> namespace type (mnt, net, ipc, user, pid, uts, cgroup)\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(24); fputs(USAGE_COLUMNS, out); for (i = 0; i < ARRAY_SIZE(infos); i++) diff --git a/sys-utils/mount.c b/sys-utils/mount.c index b46634c7c..e9a581150 100644 --- a/sys-utils/mount.c +++ b/sys-utils/mount.c @@ -426,8 +426,7 @@ static void __attribute__((__noreturn__)) usage(void) " -w, --rw, --read-write mount the filesystem read-write (default)\n")); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(25); fprintf(out, _( "\nSource:\n" diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c index d07077252..305013851 100644 --- a/sys-utils/mountpoint.c +++ b/sys-utils/mountpoint.c @@ -127,8 +127,7 @@ static void __attribute__((__noreturn__)) usage(void) " -d, --fs-devno print maj:min device number of the filesystem\n" " -x, --devno print maj:min device number of the block device\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(20); fprintf(out, USAGE_MAN_TAIL("mountpoint(1)")); exit(EXIT_SUCCESS); diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c index 204e6ce3b..48932df88 100644 --- a/sys-utils/nsenter.c +++ b/sys-utils/nsenter.c @@ -97,8 +97,7 @@ static void __attribute__((__noreturn__)) usage(void) #endif fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(24); fprintf(out, USAGE_MAN_TAIL("nsenter(1)")); exit(EXIT_SUCCESS); diff --git a/sys-utils/pivot_root.c b/sys-utils/pivot_root.c index ee6fd3c19..bb9aec66b 100644 --- a/sys-utils/pivot_root.c +++ b/sys-utils/pivot_root.c @@ -38,8 +38,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Change the root filesystem.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("pivot_root(8)")); exit(EXIT_SUCCESS); } diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c index dc14c64f2..7a85ba5ef 100644 --- a/sys-utils/readprofile.c +++ b/sys-utils/readprofile.c @@ -122,8 +122,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -r, --reset reset all the counters (root only)\n"), out); fputs(_(" -n, --no-auto disable byte order auto-detection\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(27); fprintf(out, USAGE_MAN_TAIL("readprofile(8)")); exit(EXIT_SUCCESS); } diff --git a/sys-utils/renice.c b/sys-utils/renice.c index a88f590fb..ca438bbbc 100644 --- a/sys-utils/renice.c +++ b/sys-utils/renice.c @@ -73,8 +73,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -g, --pgrp <id> interpret argument as process group ID\n"), out); fputs(_(" -u, --user <name>|<id> interpret argument as username or user ID\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(24); fprintf(out, USAGE_MAN_TAIL("renice(1)")); exit(EXIT_SUCCESS); } diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c index 86c009536..d02ee17ac 100644 --- a/sys-utils/rtcwake.c +++ b/sys-utils/rtcwake.c @@ -115,8 +115,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -v, --verbose verbose messages\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(26); printf(USAGE_MAN_TAIL("rtcwake(8)")); exit(EXIT_SUCCESS); } diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c index b14dbea40..5280a1271 100644 --- a/sys-utils/setarch.c +++ b/sys-utils/setarch.c @@ -114,8 +114,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" --list list settable architectures, and exit\n"), stdout); fputs(USAGE_SEPARATOR, stdout); - fputs(USAGE_HELP, stdout); - fputs(USAGE_VERSION, stdout); + print_usage_help_options(26); printf(USAGE_MAN_TAIL("setarch(8)")); exit(EXIT_SUCCESS); diff --git a/sys-utils/setpriv.c b/sys-utils/setpriv.c index 310e6938d..d7d3b7089 100644 --- a/sys-utils/setpriv.c +++ b/sys-utils/setpriv.c @@ -122,8 +122,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" --apparmor-profile <pr> set AppArmor profile\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fputs(USAGE_SEPARATOR, out); fputs(_(" This tool can be dangerous. Read the manpage, and be careful.\n"), out); fprintf(out, USAGE_MAN_TAIL("setpriv(1)")); diff --git a/sys-utils/setsid.c b/sys-utils/setsid.c index 891d8a6b7..fddd8a87a 100644 --- a/sys-utils/setsid.c +++ b/sys-utils/setsid.c @@ -40,8 +40,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -c, --ctty set the controlling terminal to the current one\n"), out); fputs(_(" -w, --wait wait program to exit, and use the same return\n"), out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("setsid(1)")); exit(EXIT_SUCCESS); diff --git a/sys-utils/swapoff.c b/sys-utils/swapoff.c index da2e268d7..e13fb752b 100644 --- a/sys-utils/swapoff.c +++ b/sys-utils/swapoff.c @@ -130,8 +130,7 @@ static void __attribute__((__noreturn__)) usage(void) " -v, --verbose verbose mode\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(24); fputs(_("\nThe <spec> parameter:\n" \ " -L <label> LABEL of device to be used\n" \ diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c index 5242b96f4..28f3bd8d6 100644 --- a/sys-utils/swapon.c +++ b/sys-utils/swapon.c @@ -808,8 +808,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -v, --verbose verbose mode\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(26); fputs(_("\nThe <spec> parameter:\n" \ " -L <label> synonym for LABEL=<label>\n" diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c index dff334253..5c4095966 100644 --- a/sys-utils/switch_root.c +++ b/sys-utils/switch_root.c @@ -209,8 +209,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Switch to another filesystem as the root of the mount tree.\n"), output); fputs(USAGE_OPTIONS, output); - fputs(USAGE_HELP, output); - fputs(USAGE_VERSION, output); + print_usage_help_options(16); fprintf(output, USAGE_MAN_TAIL("switch_root(8)")); exit(EXIT_SUCCESS); diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c index 99da3f3f6..a03b9a68a 100644 --- a/sys-utils/tunelp.c +++ b/sys-utils/tunelp.c @@ -112,8 +112,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -r, --reset reset the port\n"), out); fputs(_(" -q, --print-irq <on|off> display current irq setting\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(30); fprintf(out, USAGE_MAN_TAIL("tunelp(8)")); exit(EXIT_SUCCESS); diff --git a/sys-utils/umount.c b/sys-utils/umount.c index 17d94be10..fd21ca9d7 100644 --- a/sys-utils/umount.c +++ b/sys-utils/umount.c @@ -102,8 +102,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -v, --verbose say what is being done\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(25); fprintf(out, USAGE_MAN_TAIL("umount(8)")); exit(MNT_EX_SUCCESS); diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c index d3973527b..5060c2839 100644 --- a/sys-utils/unshare.c +++ b/sys-utils/unshare.c @@ -265,8 +265,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -s, --setgroups allow|deny control the setgroups syscall in user namespaces\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(27); fprintf(out, USAGE_MAN_TAIL("unshare(1)")); exit(EXIT_SUCCESS); diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c index 28a24c1f8..1b82fc830 100644 --- a/sys-utils/wdctl.c +++ b/sys-utils/wdctl.c @@ -190,8 +190,7 @@ static void __attribute__((__noreturn__)) usage(void) " -x, --flags-only print only flags table (same as -I -T)\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(24); fputs(USAGE_SEPARATOR, out); fprintf(out, _("The default device is %s.\n"), _PATH_WATCHDOG_DEV); diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c index 948c58925..3d604cf68 100644 --- a/sys-utils/zramctl.c +++ b/sys-utils/zramctl.c @@ -543,8 +543,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -t, --streams <number> number of compression streams\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(27); fputs(USAGE_COLUMNS, out); for (i = 0; i < ARRAY_SIZE(infos); i++) diff --git a/term-utils/mesg.c b/term-utils/mesg.c index fe5218aa4..d5a7f2e29 100644 --- a/term-utils/mesg.c +++ b/term-utils/mesg.c @@ -80,8 +80,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(USAGE_OPTIONS, out); fputs(_(" -v, --verbose explain what is being done\n"), out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("mesg(1)")); exit(EXIT_SUCCESS); diff --git a/term-utils/wall.c b/term-utils/wall.c index 803a02976..6e48ab9fd 100644 --- a/term-utils/wall.c +++ b/term-utils/wall.c @@ -93,8 +93,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -n, --nobanner do not print banner, works only for root\n"), out); fputs(_(" -t, --timeout <timeout> write timeout in seconds\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(25); fprintf(out, USAGE_MAN_TAIL("wall(1)")); exit(EXIT_SUCCESS); diff --git a/term-utils/write.c b/term-utils/write.c index a7b51809f..9f313d8a9 100644 --- a/term-utils/write.c +++ b/term-utils/write.c @@ -91,8 +91,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Send a message to another user.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("write(1)")); exit(EXIT_SUCCESS); } diff --git a/text-utils/colcrt.c b/text-utils/colcrt.c index 375d0d6f0..cb6d4456e 100644 --- a/text-utils/colcrt.c +++ b/text-utils/colcrt.c @@ -89,8 +89,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -2, --half-lines print all half-lines\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(25); fprintf(out, USAGE_MAN_TAIL("colcrt(1)")); diff --git a/text-utils/colrm.c b/text-utils/colrm.c index ebebca0bf..c2ff039ff 100644 --- a/text-utils/colrm.c +++ b/text-utils/colrm.c @@ -65,8 +65,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Filter out the specified columns.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, _("%s reads from standard input and writes to standard output\n\n"), program_invocation_short_name); fprintf(out, USAGE_MAN_TAIL("colrm(1)")); diff --git a/text-utils/column.c b/text-utils/column.c index 7f956f721..be99f94fa 100644 --- a/text-utils/column.c +++ b/text-utils/column.c @@ -581,8 +581,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -x, --fillrows fill rows before columns\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(34); fprintf(out, USAGE_MAN_TAIL("column(1)")); exit(EXIT_SUCCESS); diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c index 53d10a6d9..57deddaf1 100644 --- a/text-utils/hexdump.c +++ b/text-utils/hexdump.c @@ -174,8 +174,7 @@ void __attribute__((__noreturn__)) usage(void) fputs(_(" -s, --skip <offset> skip offset bytes from the beginning\n"), out); fputs(_(" -v, --no-squeezing output identical lines\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(27); fprintf(out, USAGE_MAN_TAIL("hexdump(1)")); exit(EXIT_SUCCESS); diff --git a/text-utils/line.c b/text-utils/line.c index 15d7d4adf..a9b3696cf 100644 --- a/text-utils/line.c +++ b/text-utils/line.c @@ -34,8 +34,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Read one line.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("line(1)")); exit(EXIT_SUCCESS); } diff --git a/text-utils/pg.c b/text-utils/pg.c index ce5898dc3..5c378915a 100644 --- a/text-utils/pg.c +++ b/text-utils/pg.c @@ -247,8 +247,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" +/pattern/ start at the line containing pattern\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("pg(1)")); exit(0); diff --git a/text-utils/rev.c b/text-utils/rev.c index 9a778e383..3c2bd1f20 100644 --- a/text-utils/rev.c +++ b/text-utils/rev.c @@ -81,8 +81,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Reverse lines characterwise.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(16); fprintf(out, USAGE_MAN_TAIL("rev(1)")); exit(EXIT_SUCCESS); diff --git a/text-utils/ul.c b/text-utils/ul.c index a2ad5ea42..8f1f89e46 100644 --- a/text-utils/ul.c +++ b/text-utils/ul.c @@ -148,8 +148,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -t, -T, --terminal TERMINAL override the TERM environment variable\n"), out); fputs(_(" -i, --indicated underlining is indicated via a separate line\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(USAGE_HELP, out); - fputs(USAGE_VERSION, out); + print_usage_help_options(30); fprintf(out, USAGE_MAN_TAIL("ul(1)")); |