summaryrefslogtreecommitdiffstats
path: root/misc-utils
diff options
context:
space:
mode:
authorRuediger Meier2017-06-25 00:19:50 +0200
committerRuediger Meier2017-06-27 12:26:19 +0200
commitb1a294c448582c5571fbf7c0d363357c88154016 (patch)
tree97a83cb04af7879473368edb259781ad02a89272 /misc-utils
parentmisc: revert to the old USAGE_HELP strings (diff)
downloadkernel-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>
Diffstat (limited to 'misc-utils')
-rw-r--r--misc-utils/blkid.c3
-rw-r--r--misc-utils/cal.c3
-rw-r--r--misc-utils/fincore.c3
-rw-r--r--misc-utils/findfs.c3
-rw-r--r--misc-utils/findmnt.c3
-rw-r--r--misc-utils/getopt.c3
-rw-r--r--misc-utils/kill.c3
-rw-r--r--misc-utils/logger.c3
-rw-r--r--misc-utils/look.c3
-rw-r--r--misc-utils/lsblk.c3
-rw-r--r--misc-utils/lslocks.c3
-rw-r--r--misc-utils/mcookie.c3
-rw-r--r--misc-utils/rename.c3
-rw-r--r--misc-utils/uuidd.c3
-rw-r--r--misc-utils/uuidgen.c3
-rw-r--r--misc-utils/uuidparse.c3
-rw-r--r--misc-utils/whereis.c3
17 files changed, 17 insertions, 34 deletions
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);
}
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-11 16:45:14 +0200