ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ruediger Meier 2017-06-25 00:19:50 +02:00
parent 789ac55e4f
commit b1a294c448
94 changed files with 105 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/boilerplate.c
View File

@ -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);
}

3
disk-utils/addpart.c
View File

@ -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);
}

3
disk-utils/cfdisk.c
View File

@ -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);

3
disk-utils/delpart.c
View File

@ -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);
}

3
disk-utils/fdformat.c
View File

@ -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);

3
disk-utils/fdisk.c
View File

@ -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);

3
disk-utils/fsck.cramfs.c
View File

@ -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);

3
disk-utils/fsck.minix.c
View File

@ -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);
}

3
disk-utils/isosize.c
View File

@ -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);

3
disk-utils/mkfs.cramfs.c
View File

@ -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);
}

3
disk-utils/mkfs.minix.c
View File

@ -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);
}

3
disk-utils/partx.c
View File

@ -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++)

3
disk-utils/raw.c
View File

@ -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);
}

3
disk-utils/resizepart.c
View File

@ -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);
}

4
disk-utils/sfdisk.c
View File

@ -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);

3
disk-utils/swaplabel.c
View File

@ -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);
}

14
include/c.h
View File

@ -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

3
login-utils/last.c
View File

@ -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);

3
login-utils/lslogins.c
View File

@ -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++)

3
login-utils/newgrp.c
View File

@ -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);
}

3
login-utils/nologin.c
View File

@ -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);

3
login-utils/su-common.c
View File

@ -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);
}

3
login-utils/sulogin.c
View File

@ -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)"));
}

3
login-utils/utmpdump.c
View File

@ -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);

3
login-utils/vipw.c
View File

@ -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);
}

3
misc-utils/blkid.c
View File

@ -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);
}

3
misc-utils/cal.c
View File

@ -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);

3
misc-utils/fincore.c
View File

@ -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);

3
misc-utils/findfs.c
View File

@ -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);
}

3
misc-utils/findmnt.c
View File

@ -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++)

3
misc-utils/getopt.c
View File

@ -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);
}

3
misc-utils/kill.c
View File

@ -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);

3
misc-utils/logger.c
View File

@ -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);

3
misc-utils/look.c
View File

@ -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);

3
misc-utils/lsblk.c
View File

@ -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);

3
misc-utils/lslocks.c
View File

@ -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);

3
misc-utils/mcookie.c
View File

@ -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);

3
misc-utils/rename.c
View File

@ -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);
}

3
misc-utils/uuidd.c
View File

@ -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);
}

3
misc-utils/uuidgen.c
View File

@ -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);
}

3
misc-utils/uuidparse.c
View File

@ -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++)

3
misc-utils/whereis.c
View File

@ -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);
}

3
schedutils/chrt.c
View File

@ -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);

3
schedutils/ionice.c
View File

@ -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)"));

1
schedutils/taskset.c
View File

@ -78,7 +78,6 @@ static void __attribute__((__noreturn__)) usage(void)
program_invocation_short_name);
fprintf(out, USAGE_MAN_TAIL("taskset(1)"));
exit(EXIT_SUCCESS);
}

3
sys-utils/blkdiscard.c
View File

@ -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);

3
sys-utils/blkzone.c
View File

@ -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);

3
sys-utils/chmem.c
View File

@ -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)"));

3
sys-utils/ctrlaltdel.c
View File

@ -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);
}

3
sys-utils/dmesg.c
View File

@ -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",

3
sys-utils/eject.c
View File

@ -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)"));

3
sys-utils/fallocate.c
View File

@ -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)"));

3
sys-utils/flock.c
View File

@ -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);
}

3
sys-utils/fsfreeze.c
View File

@ -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);

3
sys-utils/fstrim.c
View File

@ -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);
}

3
sys-utils/hwclock.c
View File

@ -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);
}

3
sys-utils/ipcmk.c
View File

@ -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);

3
sys-utils/ipcrm.c
View File

@ -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);

3
sys-utils/ipcs.c
View File

@ -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);

3
sys-utils/ldattach.c
View File

@ -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);

3
sys-utils/losetup.c
View File

@ -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++)

3
sys-utils/lscpu.c
View File

@ -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++)

3
sys-utils/lsipc.c
View File

@ -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++)

3
sys-utils/lsmem.c
View File

@ -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++)

3
sys-utils/lsns.c
View File

@ -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++)

3
sys-utils/mount.c
View File

@ -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"

3
sys-utils/mountpoint.c
View File

@ -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);

3
sys-utils/nsenter.c
View File

@ -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);

3
sys-utils/pivot_root.c
View File

@ -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);
}

3
sys-utils/readprofile.c
View File

@ -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);
}

3
sys-utils/renice.c
View File

@ -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);
}

3
sys-utils/rtcwake.c
View File

@ -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);
}

3
sys-utils/setarch.c
View File

@ -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);

3
sys-utils/setpriv.c
View File

@ -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)"));

3
sys-utils/setsid.c
View File

@ -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);

3
sys-utils/swapoff.c
View File

@ -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" \

3
sys-utils/swapon.c
View File

@ -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"

3
sys-utils/switch_root.c
View File

@ -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);

3
sys-utils/tunelp.c
View File

@ -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);

3
sys-utils/umount.c
View File

@ -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);

3
sys-utils/unshare.c
View File

@ -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);

3
sys-utils/wdctl.c
View File

@ -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);

3
sys-utils/zramctl.c
View File

@ -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++)

3
term-utils/mesg.c
View File

@ -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);

3
term-utils/wall.c
View File

@ -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);

3
term-utils/write.c
View File

@ -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);
}

3
text-utils/colcrt.c
View File

@ -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)"));

3
text-utils/colrm.c
View File

@ -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)"));

3
text-utils/column.c
View File

@ -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);

3
text-utils/hexdump.c
View File

@ -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);

3
text-utils/line.c
View File

@ -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);
}

3
text-utils/pg.c
View File

@ -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);

3
text-utils/rev.c
View File

@ -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);

3
text-utils/ul.c
View File

@ -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)"));