diff options
| author | Ruediger Meier | 2017-06-25 14:49:47 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2017-06-27 12:28:36 +0200 |
| commit | b30544549505019f5fc092c5d99fcb1cae1a44b1 (patch) | |
| tree | b22fa305e99ed2bfa3bdeb145e8094874b631754 /misc-utils | |
| parent | misc: introduce print_usage_help_options() (diff) | |
| download | kernel-qcow2-util-linux-b30544549505019f5fc092c5d99fcb1cae1a44b1.tar.gz kernel-qcow2-util-linux-b30544549505019f5fc092c5d99fcb1cae1a44b1.tar.xz kernel-qcow2-util-linux-b30544549505019f5fc092c5d99fcb1cae1a44b1.zip | |
misc: consolidate all --help option descriptions
Now we are always using the same text also for commands
which had still hardcoded descriptions or where we can't
use the standard print_usage_help_options macro.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'misc-utils')
| -rw-r--r-- | misc-utils/findmnt.c | 1 | ||||
| -rw-r--r-- | misc-utils/namei.c | 4 | ||||
| -rw-r--r-- | misc-utils/wipefs.c | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c index 3970a7d3b..521942500 100644 --- a/misc-utils/findmnt.c +++ b/misc-utils/findmnt.c @@ -1243,7 +1243,6 @@ static void __attribute__((__noreturn__)) usage(void) fputc('\n', out); fputs(_(" -x, --verify verify mount table content (default is fstab)\n"), out); fputs(_(" --verbose print more details\n"), out); - fputc('\n', out); fputs(USAGE_SEPARATOR, out); print_usage_help_options(24); diff --git a/misc-utils/namei.c b/misc-utils/namei.c index dcaf5d2eb..92ee22e1f 100644 --- a/misc-utils/namei.c +++ b/misc-utils/namei.c @@ -336,14 +336,14 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_("Follow a pathname until a terminal point is found.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(_(" -h, --help displays this help text\n" - " -V, --version output version information and exit\n" + fputs(_( " -x, --mountpoints show mount point directories with a 'D'\n" " -m, --modes show the mode bits of each file\n" " -o, --owners show owner and group name of each file\n" " -l, --long use a long listing format (-m -o -v) \n" " -n, --nosymlinks don't follow symlinks\n" " -v, --vertical vertical align of modes and owners\n"), out); + print_usage_help_options(21); fprintf(out, USAGE_MAN_TAIL("namei(1)")); exit(EXIT_SUCCESS); diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c index 0bd53253d..87abba39b 100644 --- a/misc-utils/wipefs.c +++ b/misc-utils/wipefs.c @@ -465,16 +465,15 @@ usage(void) fputs(_(" -a, --all wipe all magic strings (BE CAREFUL!)\n" " -b, --backup create a signature backup in $HOME\n" " -f, --force force erasure\n" - " -h, --help show this help text\n" " -n, --no-act do everything except the actual write() call\n" " -o, --offset <num> offset to erase, in bytes\n" " -p, --parsable print out in parsable instead of printable format\n" " -q, --quiet suppress output messages\n" " -t, --types <list> limit the set of filesystem, RAIDs or partition tables\n" - " -V, --version output version information and exit\n"), out); + ), out); + print_usage_help_options(21); fprintf(out, USAGE_MAN_TAIL("wipefs(8)")); - exit(EXIT_SUCCESS); } |