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>

diff --git a/Documentation/boilerplate.c b/Documentation/boilerplate.c
index d0c163d8cea0b4ee838f82a1cc06965f97f5f172..c97ad46bc8868abf15ebc78f027793d329887e29 100644 (file)
--- 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 07f4ca9a10da0b6a1ae048ef0232fb3dee1d4dc1..e793ae03f7b33b51ccf8ea99fd706e22e13a8a4d 100644 (file)
--- 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 e17bc916713f1b0fb37f9a687ae546663df0c16c..6bacc60f3388247e1d644d66e1bf5a625045788e 100644 (file)
--- 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 7f347c8863ff19402a4e582e23da48f958d96c1f..83cd1ce46032fd9cac7702778325787e15f52807 100644 (file)
--- 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 4b5ed5690ca7ac40f6bed0b52eaad9173e430024..f84b847338023be7bb27c7afcfbc298d4f90f4dc 100644 (file)
--- 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 afd9680766eecafa47764218a515a3a5bf13dce7..937304c7e3ab9527a80d5d15eb75d87fc6621583 100644 (file)
--- 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 ff056c86999bb668f8c5ac6872ef9cb0fc8a8b5f..9fade86d22d8de29f82600c6ad87027d04792746 100644 (file)
--- 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 13b12926c8f9cdad9d4cbe61fa2b58528e12177b..a96f77f6f2ce4c33482ec2dd7b4ab2bd38bfaf75 100644 (file)
--- 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 ed43c9d70c58f050e27bb74d9e30eff21ea4f785..2b2e1ee66f9fcec0c57fd695c0f5745a83f8b462 100644 (file)
--- 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 74664a81194709c79ec209dae5a42a31a31692f6..9adc2899e47867945443a8fd3d481d51aad2a391 100644 (file)
--- 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 39e159f7a0f6c7e3332271a3cf7145bb928becf1..e77d0b89f0159671f66251083dd24b91fd061311 100644 (file)
--- 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 9a868cd819d8118f5ced639b5829aa61c89de37f..474c80e467b7a6d7b958796d130e3722bf97dff9 100644 (file)
--- 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 c881d86eeed2e2da61bf313f2c213239cf0f67e6..1de7f813ec80aa83485a1c5be8640334d0970f2d 100644 (file)
--- 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 a234c8079180beb46ad47907803ee118f50f4fe8..38e7caceae3c813a0ecb2f4691aa9003083fe140 100644 (file)
--- 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 6f88780d77c23a738cd4adeb4435e8744448a261..8616ee9508e69c07ed2ea9f2b4c1502241e7a083 100644 (file)
--- 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 c8fede25e752e1f1c0b4a8bea94b93b98c62b3ec..c4e6873c0f1e5ccd828bd6960db098d9afda47ce 100644 (file)
--- 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 fe46b8c2d82b1f9bf1d6b7b6f2051044f87a306e..94ebf7e7dbb76cd3d479c5f7e574a81f158dda13 100644 (file)
--- 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 9cf6eb377f36c126c1e2daa594ffa8a5825ebab8..1218a3018d15c7eeedc6e681ae66d4c0370c5dbd 100644 (file)
--- 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 c15b347f2df79dcca69036e79193b6ba8d776a6f..8b9933eb72923f297803d91c75115eb5150ea9a7 100644 (file)
--- 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 767ae4bcf5c4e693ed356863238c01db5ce0470a..ce3fefbc16d87b8cce2f6f0146aad9d0f6336f1f 100644 (file)
--- 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 00b4b8af8a967017ad8b7348a9a63cd1573f05a0..44604dc77b2b462e893207595ed92f6d8b9d7a2a 100644 (file)
--- 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 d7b0a93dd5cf8785b76ad012b9ce4f893795d701..574d98e228782044fb9f312ec579a20470751c54 100644 (file)
--- 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 ac6a15c38a40f5f82632f01bd41b34904a84c5cf..45f6cfa4c58d05a6eaca9d0a16544f5c086b6e2c 100644 (file)
--- 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 5bcb4c35fdf2d40f6e71a24fd49dfa9343b6ceb0..41d6c3b1a83b3617d9c2106dd4e245522bc19613 100644 (file)
--- 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 e3cca4906439db891937bd59e4f9076d864b588d..e5614af651ab9f801eecf9fb74ea81fbf0581490 100644 (file)
--- 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 f4757e8c8ad1c277ec465c385d3c24d3dd26bf09..3aa2ee5a6fbda86779b4cd0fcb21ebfe0551d6ba 100644 (file)
--- 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 f73cbbf30ef48ba589d56bde5466dcc04e67d0a1..870fa689b68441d66c47d1ed08dabf6015c784dc 100644 (file)
--- 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 f1b9fa7586802c6bb594e990f1f254d63bc88703..9ef912758e6fa86995b7807948c77eee9f0ce3e7 100644 (file)
--- 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 c01dc1d53f67934a13d644bd07ebb3ac7bc1b967..fc16e44e6831a7a8332d180dff5c74da00637e91 100644 (file)
--- 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 5394d1a60da73ac74819838e6d29d1b48b2dd709..3970a7d3bf6827d912a1c16a0f8c068f48b08bcd 100644 (file)
--- 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 87d088ed53ff74eb66b263a7c0370a38061c5e4d..8150e3c034ee788337f0f85052aded5ca1c15bca 100644 (file)
--- 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 ecee26c4edcc7293c6f5f9b7a4240c22901d5985..0778c6fad994024cbfe7409052bdfe2ee91af9cb 100644 (file)
--- 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 0ae5c61d029ed8ff64d95d383c6c01206ae01e8c..1ef60bb765923752e6911388013c51ae2ace717e 100644 (file)
--- 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 a0d898db12328d29bdaa8886f21e187eb96dd455..dfb77319ba640c7caa5326304546824bef5d6b51 100644 (file)
--- 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 d997bc71e4e2fc5ff90868e6437f9214b5e48041..983804b9c7a1549f5a83ab9aabf2b2c8cc279c30 100644 (file)
--- 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 54440496a8c651caaba9198c36e7966d2f6a9590..d872e2dc752f07a6b7fd76a7e8f8762fa4183d49 100644 (file)
--- 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 89b9a01ebcfdc3837e4cce60c556579f81096e58..ce9c4bf44cafd85b2c85d19cafd3ce4d9ea43776 100644 (file)
--- 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 48606d75e9a8d26c3fee96168237725e0dd95c92..f5029836ab4bace26e68095281afe2831cb71c86 100644 (file)
--- 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 faaa0c12fe16dfccf050e451e9225a90e69d92a3..492ad83d93802730600d21eb8d6b5687ca1a296a 100644 (file)
--- 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 77fda2fb3b5904de7996b85a2eedb92bd1b3e241..8252fd528475b048a5c9e958cccbd0c3ef71a5a5 100644 (file)
--- 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 0938b85592e18d65e68daa8052891038f3f62bf6..c3db4271c9cac4ff908843939446d8fecbe29641 100644 (file)
--- 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 897a7a2135b7775ebcef828bcca4b32f093adf91..b4291c4e8f510d3ca4e2eb04690b45866eb6f5eb 100644 (file)
--- 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 d1abbe14e9c8f9c9efc047a3d0d9889f0ef58493..fbe20e160181f4eb7c959069a1a994b698ba8cdd 100644 (file)
--- 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 9d0648bcaaa4c0963bdb2bee1921e79ec9491fed..098fb255e94cb3f08631aaaa3ccae1089b7a3bf9 100644 (file)
--- 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 9870040e7d7976fb828d9ed2f11ec5ab6b921e48..c55b986fbaa208d4ec69fe060ba493673e4de28d 100644 (file)
--- 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 e6a9dce5c8a3adac0df0b7dd6f90cd94bba915ce..d078f297be29b0d10a1698d3058be3aebbdef781 100644 (file)
--- 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 ee4902e45a0c6277b58e08a36b5629ce212b9c1d..28038f071ec66e4a6791989b771ec8b65a4dd538 100644 (file)
--- 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 7f7be6ab6ceff75add6d0868b2c358dc21fc6742..b0060ae25fdfb7d2864c3529466a74b6384fbfe0 100644 (file)
--- 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 98c8ed83282df744734b5865449e0dab0fccef2e..6b3f38f561bf75912777d3b357d01ea047f6e756 100644 (file)
--- 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 cd5da90f4c915a20fa8282ea99ccd2e0bcf933d3..0db567bfa96b3169365564d4b9fba83f2eab35c1 100644 (file)
--- 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 296e5cba56637e8cf0600193709e0af05189d964..f1d4474ebd1b44a25de0ecba2e414a15f7cdd8d6 100644 (file)
--- 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 a2d21255227376f349ffa99aec76f7cce2785517..d5dd9f7e17da1d8e3f2a916700e200a5259c2964 100644 (file)
--- 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 5abe2def5f29942d3e558ba73ab2edda38649f28..170f96771cd22b824d332c6117842f52970fddb6 100644 (file)
--- 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 8b0d5d10edf5abf86fc63ad7ddcc38da8e86b9cc..487759220c9231999b1a74dcf66c97282a92e1f6 100644 (file)
--- 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 698f30a931ac217fdede3efd6d6f53609dd6f1bd..56a14506627e6519e756f41182dfeb78fa59600f 100644 (file)
--- 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 f3448a569620fa793849772b4d5f760b396636e9..98ee5bef5080b0c61accf2d49281185bcf255752 100644 (file)
--- 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 c6d322cbfc9c17808c8756fa0ec22189d0d1bc5f..c7b4a83eec29066152e94cfbaddb514823f55eb5 100644 (file)
--- 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 a60919d9bf8c12b831c2300b05bcd516468283b3..c1c8de25ae64ec3148212425a1ec97089214740e 100644 (file)
--- 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 943b09c4a6067841d86d0d996b47c87cd73e0211..e63f10afe9ef45382d1504073aa1ad654ac519eb 100644 (file)
--- 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 9a3915b1c596003d5087c061a1ef4cad2700a679..3c6b4aad6160a497ad2bdd0f76cd354a8d7c9967 100644 (file)
--- 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 593d3b5366df2e5791bfbacaa6c2f85006aa9083..d4740bd941f667c459fad0388a365aad9812633f 100644 (file)
--- 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 2504da2e06d0ced44e4d9e7b7afccb456b5c2c6b..424b9de0ee405651d421ba8dc69f2032df0a51aa 100644 (file)
--- 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 8ac50d67a09300e7c7f281b3d5cf19cd3660f2bc..4bbd8d77bc7aa13f4284505956a2653fb703ca24 100644 (file)
--- 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 4efd296329b553fd997a09a5a8770f9bf89aeaf8..04e7d20be214aabea7db6d0996d33a948a373906 100644 (file)
--- 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 6cadd0ef558eed52e1d49133d07612147bc9077e..6ed772c9fd0bc49e55170cbde9ac9c1eb5697151 100644 (file)
--- 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 b46634c7c5559f3527a7daaddc01060474b90e1e..e9a581150d7bc89fcf8dd7f95fb7222ecb78fbd2 100644 (file)
--- 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 d0707725268d20f35541acf256b4be6f7375f5c1..30501385163494244a7c7a337327c29c422e7307 100644 (file)
--- 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 204e6ce3b315550ca1e152804110d1c87c3e8683..48932df8830c2d34f0da75aaff520b381b45793d 100644 (file)
--- 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 ee6fd3c19dfd077aea5b2b961f2d3ba0c03390d4..bb9aec66bed47d4fd7cece097cb85553a632cce0 100644 (file)
--- 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 dc14c64f230345fc6efd7ccf35d4b3d29a2903aa..7a85ba5ef2e3ee75c4a6bae2f986982b94bdbf66 100644 (file)
--- 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 a88f590fb2fa483986fd3d76fdbbfff4b42934f9..ca438bbbce05b5e6e13f8066095b1b2e4c8d593f 100644 (file)
--- 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 86c0095361dae9840aa9013835718c3fe96077c7..d02ee17ac8eae06c893cf7f17e0e50eb171ebabf 100644 (file)
--- 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 b14dbea40814f4c24acd01b09f39aa66854f8366..5280a127136b01add1d037799b04202b33fd70ba 100644 (file)
--- 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 310e6938d233f2142fb55baf452cc8aec3b67d39..d7d3b7089a314e65d48d6c4c650fa3491c50e4ba 100644 (file)
--- 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 891d8a6b7fc152d75bc8840a89e71540ff600243..fddd8a87a397d86db8792a248467644d016f13a3 100644 (file)
--- 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 da2e268d7ebff621dc75eb28f18675e896a99c81..e13fb752b478be5f42a36b064643b5f3195e226e 100644 (file)
--- 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 5242b96f4907f9339fcb372eb1afcc9b4b91b40c..28f3bd8d64196514643a5d3ccda2c5a90b827353 100644 (file)
--- 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 dff33425342c147bcbd746356a861785f57bc44d..5c4095966585692ec245dbe7c48550ea106fe56d 100644 (file)
--- 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 99da3f3f622adaa541936b22a9612c5cb03a09fa..a03b9a68ab52612f8ead4fc9f5af38a22c6650e2 100644 (file)
--- 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 17d94be10344ebed82c06405553f665cae776c74..fd21ca9d75e137a72296a658840acd19ce2993b4 100644 (file)
--- 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 d3973527b750ab5fc7e82ab2fb6a35face14f771..5060c28395308ad845c4b054db3ee6e558c4e498 100644 (file)
--- 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 28a24c1f8ea5b1c70e686afdfd33948db80a35db..1b82fc83037159ab639f043bf67dcd5a30500b16 100644 (file)
--- 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 948c58925ef3784898667a85e96b7645d922efcb..3d604cf68bfdc37b09f534cabf7b897f0c8fe752 100644 (file)
--- 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 fe5218aa440e39857b380a9961558b5406632953..d5a7f2e29989ca4962051ec202489c13bc3115cb 100644 (file)
--- 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 803a02976e5d79b360d9fce88146a3ccac0f0f91..6e48ab9fd00de6fe59ee9965c49d51b044af8ef7 100644 (file)
--- 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 a7b51809fb96ec0fa4ac417ce22f63e67c6718ed..9f313d8a96eebbef6e24a7e622baa904d248a123 100644 (file)
--- 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 375d0d6f0c826da641edab4ef893744178a15cc1..cb6d4456e2e0c155cc4e5f95a5b2dc757b28a3e4 100644 (file)
--- 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 ebebca0bf300cf23dd516b724565c11e54790486..c2ff039ffb5e922ca687682c83fa685d6b38b3f2 100644 (file)
--- 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 7f956f721dda10b5a8d0eb712d4755d8418a9698..be99f94faee32448eb8bd60237157f8be2d21ee1 100644 (file)
--- 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 53d10a6d94ccaac273ee6ec24548446c0480f53a..57deddaf1e672dd16afef1a1bc3888bc6b63e6ff 100644 (file)
--- 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 15d7d4adfcd0417828250d51f904d2c0acc652c3..a9b3696cf84f8fefa1d645e89872f4fc4c80bb5e 100644 (file)
--- 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 ce5898dc3a606c35336a3cc238d5376fc25d8711..5c378915aba9d236625b09b8ad9ec25c6c6b0c50 100644 (file)
--- 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 9a778e383a665c718bdc1fe2798ee27f03f9c297..3c2bd1f20079bfe7bac5e7d93511b680fda09462 100644 (file)
--- 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 a2ad5ea4211a0c702bd07971e8185b43a87d2d13..8f1f89e46abc4f3921aacf0535307ad7dc70e49b 100644 (file)
--- 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)"));