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

misc: consolidate macro style USAGE_HELP_OPTIONS 

changed in include/c.h and applied via sed:

  sed -i 's/fprintf.*\(USAGE_MAN_TAIL.*\)/printf(\1/' $(git ls-files -- "*.c")
  sed -i 's/print_usage_help_options\(.*\);/printf(USAGE_HELP_OPTIONS\1);/' $(git ls-files -- "*.c")

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
This commit is contained in:
Ruediger Meier 2017-06-29 15:52:16 +02:00
parent 43c960c8fa
commit f45f3ec34a
111 changed files with 204 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/boilerplate.c
View File

@ -56,8 +56,8 @@ 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);
print_usage_help_options(25); /* char offset to align option descriptions */
fprintf(out, USAGE_MAN_TAIL("fixme-command-name(1)"));
printf(USAGE_HELP_OPTIONS(25)); /* char offset to align option descriptions */
printf(USAGE_MAN_TAIL("fixme-command-name(1)"));
exit(EXIT_SUCCESS);
}

4
disk-utils/addpart.c
View File

@ -19,8 +19,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_("Tell the kernel about the existence of a specified partition.\n"), out);
fputs(USAGE_OPTIONS, out);
print_usage_help_options(16);
fprintf(out, USAGE_MAN_TAIL("addpart(8)"));
printf(USAGE_HELP_OPTIONS(16));
printf(USAGE_MAN_TAIL("addpart(8)"));
exit(EXIT_SUCCESS);
}

2
disk-utils/blockdev.c
View File

@ -197,7 +197,7 @@ static void __attribute__((__noreturn__)) usage(void)
puts( _(" -v verbose mode"));
puts( _(" --report print report for specified (or all) devices"));
fputs(USAGE_SEPARATOR, stdout);
print_usage_help_options(16);
printf(USAGE_HELP_OPTIONS(16));
fputs(USAGE_SEPARATOR, stdout);
puts( _("Available commands:"));

4
disk-utils/cfdisk.c
View File

@ -2559,9 +2559,9 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -z, --zero start with zeroed partition table\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(26);
printf(USAGE_HELP_OPTIONS(26));
fprintf(out, USAGE_MAN_TAIL("cfdisk(8)"));
printf(USAGE_MAN_TAIL("cfdisk(8)"));
exit(EXIT_SUCCESS);
}

4
disk-utils/delpart.c
View File

@ -19,8 +19,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_("Tell the kernel to forget about a specified partition.\n"), out);
fputs(USAGE_OPTIONS, out);
print_usage_help_options(16);
fprintf(out, USAGE_MAN_TAIL("delpart(8)"));
printf(USAGE_HELP_OPTIONS(16));
printf(USAGE_MAN_TAIL("delpart(8)"));
exit(EXIT_SUCCESS);
}

4
disk-utils/fdformat.c
View File

@ -156,8 +156,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -n, --no-verify disable the verification after the format\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(19);
fprintf(out, USAGE_MAN_TAIL("fdformat(8)"));
printf(USAGE_HELP_OPTIONS(19));
printf(USAGE_MAN_TAIL("fdformat(8)"));
exit(EXIT_SUCCESS);
}

4
disk-utils/fdisk.c
View File

@ -785,11 +785,11 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -S, --sectors <number> specify the number of sectors per track\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(31);
printf(USAGE_HELP_OPTIONS(31));
list_available_columns(out);
fprintf(out, USAGE_MAN_TAIL("fdisk(8)"));
printf(USAGE_MAN_TAIL("fdisk(8)"));
exit(EXIT_SUCCESS);
}

2
disk-utils/fsck.c
View File

@ -1398,7 +1398,7 @@ static void __attribute__((__noreturn__)) usage(void)
printf( " --version %s\n", USAGE_OPTSTR_VERSION);
fputs(USAGE_SEPARATOR, out);
fputs(_("See the specific fsck.* commands for available fs-options."), out);
fprintf(out, USAGE_MAN_TAIL("fsck(8)"));
printf(USAGE_MAN_TAIL("fsck(8)"));
exit(FSCK_EX_OK);
}

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

@ -120,7 +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);
print_usage_help_options(26);
printf(USAGE_HELP_OPTIONS(26));
printf(USAGE_MAN_TAIL("fsck.cramfs(8)"));
exit(FSCK_EX_OK);

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

@ -192,8 +192,8 @@ usage(void) {
fputs(_(" -m, --uncleared activate mode not cleared warnings\n"), out);
fputs(_(" -f, --force force check\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(18);
fprintf(out, USAGE_MAN_TAIL("fsck.minix(8)"));
printf(USAGE_HELP_OPTIONS(18));
printf(USAGE_MAN_TAIL("fsck.minix(8)"));
exit(FSCK_EX_OK);
}

4
disk-utils/isosize.c
View File

@ -141,8 +141,8 @@ 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);
print_usage_help_options(25);
fprintf(out, USAGE_MAN_TAIL("isosize(8)"));
printf(USAGE_HELP_OPTIONS(25));
printf(USAGE_MAN_TAIL("isosize(8)"));
exit(EXIT_SUCCESS);
}

4
disk-utils/mkfs.bfs.c
View File

@ -85,9 +85,9 @@ static void __attribute__((__noreturn__)) usage(void)
" -c this option is silently ignored\n"
" -l this option is silently ignored\n"
));
print_usage_help_options(21);
printf(USAGE_HELP_OPTIONS(21));
fprintf(out, USAGE_MAN_TAIL("mkfs.bfs(8)"));
printf(USAGE_MAN_TAIL("mkfs.bfs(8)"));
exit(EXIT_SUCCESS);
}

4
disk-utils/mkfs.c
View File

@ -55,9 +55,9 @@ static void __attribute__((__noreturn__)) usage(void)
fprintf(out, _(" <size> number of blocks to be used on the device\n"));
fprintf(out, _(" -V, --verbose explain what is being done;\n"
" specifying -V more than once will cause a dry-run\n"));
print_usage_help_options(20);
printf(USAGE_HELP_OPTIONS(20));
fprintf(out, USAGE_MAN_TAIL("mkfs(8)"));
printf(USAGE_MAN_TAIL("mkfs(8)"));
exit(EXIT_SUCCESS);
}

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

@ -143,7 +143,7 @@ static void __attribute__((__noreturn__)) usage(void)
program_invocation_short_name, PAD_SIZE);
fputs(USAGE_SEPARATOR, stdout);
print_usage_help_options(16);
printf(USAGE_HELP_OPTIONS(16));
printf(USAGE_MAN_TAIL("mkfs.cramfs(8)"));
exit(MKFS_EX_OK);
}

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

@ -145,8 +145,8 @@ 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);
print_usage_help_options(25);
fprintf(out, USAGE_MAN_TAIL("mkfs.minix(8)"));
printf(USAGE_HELP_OPTIONS(25));
printf(USAGE_MAN_TAIL("mkfs.minix(8)"));
exit(MKFS_EX_OK);
}

2
disk-utils/mkswap.c
View File

@ -161,7 +161,7 @@ static void __attribute__((__noreturn__)) usage(void)
" -v, --swapversion NUM specify swap-space version number\n"
" -U, --uuid UUID specify the uuid to use\n"
));
print_usage_help_options(27);
printf(USAGE_HELP_OPTIONS(27));
printf(USAGE_MAN_TAIL("mkswap(8)"));
exit(EXIT_SUCCESS);

4
disk-utils/partx.c
View File

@ -773,13 +773,13 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -v, --verbose verbose mode\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(22);
printf(USAGE_HELP_OPTIONS(22));
fputs(USAGE_COLUMNS, out);
for (i = 0; i < NCOLS; i++)
fprintf(out, " %10s %s\n", infos[i].name, _(infos[i].help));
fprintf(out, USAGE_MAN_TAIL("partx(8)"));
printf(USAGE_MAN_TAIL("partx(8)"));
exit(EXIT_SUCCESS);
}

4
disk-utils/raw.c
View File

@ -59,8 +59,8 @@ 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);
print_usage_help_options(16);
fprintf(out, USAGE_MAN_TAIL("raw(8)"));
printf(USAGE_HELP_OPTIONS(16));
printf(USAGE_MAN_TAIL("raw(8)"));
exit(EXIT_SUCCESS);
}

4
disk-utils/resizepart.c
View File

@ -24,8 +24,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_("Tell the kernel about the new size of a partition.\n"), out);
fputs(USAGE_OPTIONS, out);
print_usage_help_options(16);
fprintf(out, USAGE_MAN_TAIL("resizepart(8)"));
printf(USAGE_HELP_OPTIONS(16));
printf(USAGE_MAN_TAIL("resizepart(8)"));
exit(EXIT_SUCCESS);
}

2
disk-utils/sfdisk.c
View File

@ -1906,7 +1906,7 @@ static void __attribute__((__noreturn__)) usage(void)
list_available_columns(out);
fprintf(out, USAGE_MAN_TAIL("sfdisk(8)"));
printf(USAGE_MAN_TAIL("sfdisk(8)"));
exit(EXIT_SUCCESS);
}

4
disk-utils/swaplabel.c
View File

@ -125,8 +125,8 @@ 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);
print_usage_help_options(21);
fprintf(out, USAGE_MAN_TAIL("swaplabel(8)"));
printf(USAGE_HELP_OPTIONS(21));
printf(USAGE_MAN_TAIL("swaplabel(8)"));
exit(EXIT_SUCCESS);
}

6
include/c.h
View File

@ -319,13 +319,11 @@ static inline int xusleep(useconds_t usec)
#define USAGE_OPTSTR_HELP _("display this help")
#define USAGE_OPTSTR_VERSION _("print version")
#define print_usage_help_options(marg_dsc) \
printf( \
#define USAGE_HELP_OPTIONS(marg_dsc) \
"%-" #marg_dsc "s%s\n" \
"%-" #marg_dsc "s%s\n" \
, " -h, --help", USAGE_OPTSTR_HELP \
, " -V, --version", USAGE_OPTSTR_VERSION \
)
, " -V, --version", USAGE_OPTSTR_VERSION
#define USAGE_MAN_TAIL(_man) _("\nFor more details see %s.\n"), _man

2
login-utils/chfn.c
View File

@ -106,7 +106,7 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(USAGE_SEPARATOR, fp);
printf( " -u, --help %s\n", USAGE_OPTSTR_HELP);
printf( " -v, --version %s\n", USAGE_OPTSTR_VERSION);
fprintf(fp, USAGE_MAN_TAIL("chfn(1)"));
printf(USAGE_MAN_TAIL("chfn(1)"));
exit(EXIT_SUCCESS);
}

2
login-utils/chsh.c
View File

@ -85,7 +85,7 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(USAGE_SEPARATOR, fp);
printf( " -u, --help %s\n", USAGE_OPTSTR_HELP);
printf( " -v, --version %s\n", USAGE_OPTSTR_VERSION);
fprintf(fp, USAGE_MAN_TAIL("chsh(1)"));
printf(USAGE_MAN_TAIL("chsh(1)"));
exit(EXIT_SUCCESS);
}

4
login-utils/last.c
View File

@ -589,8 +589,8 @@ static void __attribute__((__noreturn__)) usage(const struct last_control *ctl)
" notime|short|full|iso\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(22);
fprintf(out, USAGE_MAN_TAIL("last(1)"));
printf(USAGE_HELP_OPTIONS(22));
printf(USAGE_MAN_TAIL("last(1)"));
exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
}

4
login-utils/lslogins.c
View File

@ -1253,13 +1253,13 @@ 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);
print_usage_help_options(26);
printf(USAGE_HELP_OPTIONS(26));
fputs(USAGE_COLUMNS, out);
for (i = 0; i < ARRAY_SIZE(coldescs); i++)
fprintf(out, " %14s %s\n", coldescs[i].name, _(coldescs[i].help));
fprintf(out, USAGE_MAN_TAIL("lslogins(1)"));
printf(USAGE_MAN_TAIL("lslogins(1)"));
exit(EXIT_SUCCESS);
}

4
login-utils/newgrp.c
View File

@ -176,8 +176,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_("Log in to a new group.\n"), out);
fputs(USAGE_OPTIONS, out);
print_usage_help_options(16);
fprintf(out, USAGE_MAN_TAIL("newgrp(1)"));
printf(USAGE_HELP_OPTIONS(16));
printf(USAGE_MAN_TAIL("newgrp(1)"));
exit(EXIT_SUCCESS);
}

4
login-utils/nologin.c
View File

@ -30,9 +30,9 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_("Politely refuse a login.\n"), out);
fputs(USAGE_OPTIONS, out);
print_usage_help_options(16);
printf(USAGE_HELP_OPTIONS(16));
fprintf(out, USAGE_MAN_TAIL("nologin(8)"));
printf(USAGE_MAN_TAIL("nologin(8)"));
exit(EXIT_FAILURE);
}

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

@ -709,7 +709,7 @@ usage(void)
fputs (_(" -s, --shell <shell> run <shell> if /etc/shells allows it\n"), stdout);
fputs(USAGE_SEPARATOR, stdout);
print_usage_help_options(33);
printf(USAGE_HELP_OPTIONS(33));
printf(USAGE_MAN_TAIL(su_mode == SU_MODE ? "su(1)" : "runuser(1)"));
exit(EXIT_SUCCESS);
}

4
login-utils/sulogin.c
View File

@ -812,8 +812,8 @@ static void usage(void)
out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(26);
fprintf(out, USAGE_MAN_TAIL("sulogin(8)"));
printf(USAGE_HELP_OPTIONS(26));
printf(USAGE_MAN_TAIL("sulogin(8)"));
}
int main(int argc, char **argv)

4
login-utils/utmpdump.c
View File

@ -311,9 +311,9 @@ 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);
print_usage_help_options(22);
printf(USAGE_HELP_OPTIONS(22));
fprintf(out, USAGE_MAN_TAIL("utmpdump(1)"));
printf(USAGE_MAN_TAIL("utmpdump(1)"));
exit(EXIT_SUCCESS);
}

4
login-utils/vipw.c
View File

@ -306,8 +306,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_("Edit the password or group file.\n"), out);
fputs(USAGE_OPTIONS, out);
print_usage_help_options(16);
fprintf(out, USAGE_MAN_TAIL("vipw(8)"));
printf(USAGE_HELP_OPTIONS(16));
printf(USAGE_MAN_TAIL("vipw(8)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/blkid.c
View File

@ -103,8 +103,8 @@ 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);
print_usage_help_options(28);
fprintf(out, USAGE_MAN_TAIL("blkid(8)"));
printf(USAGE_HELP_OPTIONS(28));
printf(USAGE_MAN_TAIL("blkid(8)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/cal.c
View File

@ -1015,8 +1015,8 @@ static void __attribute__((__noreturn__)) usage(void)
" %s\n", USAGE_COLORS_DEFAULT);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(23);
fprintf(out, USAGE_MAN_TAIL("cal(1)"));
printf(USAGE_HELP_OPTIONS(23));
printf(USAGE_MAN_TAIL("cal(1)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/fincore.c
View File

@ -274,14 +274,14 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -r, --raw use raw output format\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(23);
printf(USAGE_HELP_OPTIONS(23));
fprintf(out, USAGE_COLUMNS);
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(out, " %11s %s\n", infos[i].name, _(infos[i].help));
fprintf(out, USAGE_MAN_TAIL("fincore(1)"));
printf(USAGE_MAN_TAIL("fincore(1)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/findfs.c
View File

@ -33,8 +33,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_("Find a filesystem by label or UUID.\n"), out);
fputs(USAGE_OPTIONS, out);
print_usage_help_options(16);
fprintf(out, USAGE_MAN_TAIL("findfs(8)"));
printf(USAGE_HELP_OPTIONS(16));
printf(USAGE_MAN_TAIL("findfs(8)"));
exit(FINDFS_SUCCESS);
}

4
misc-utils/findmnt.c
View File

@ -1245,13 +1245,13 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" --verbose print more details\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(24);
printf(USAGE_HELP_OPTIONS(24));
fputs(USAGE_COLUMNS, out);
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(out, " %11s %s\n", infos[i].name, _(infos[i].help));
fprintf(out, USAGE_MAN_TAIL("findmnt(8)"));
printf(USAGE_MAN_TAIL("findmnt(8)"));
exit(EXIT_SUCCESS);
}

2
misc-utils/getopt.c
View File

@ -346,7 +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);
print_usage_help_options(31);
printf(USAGE_HELP_OPTIONS(31));
printf(USAGE_MAN_TAIL("getopt(1)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/kill.c
View File

@ -318,8 +318,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" --verbose print pids that will be signaled\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(24);
fprintf(out, USAGE_MAN_TAIL("kill(1)"));
printf(USAGE_HELP_OPTIONS(24));
printf(USAGE_MAN_TAIL("kill(1)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/logger.c
View File

@ -1027,8 +1027,8 @@ static void __attribute__((__noreturn__)) usage(void)
#endif
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(26);
fprintf(out, USAGE_MAN_TAIL("logger(1)"));
printf(USAGE_HELP_OPTIONS(26));
printf(USAGE_MAN_TAIL("logger(1)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/look.c
View File

@ -365,8 +365,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -t, --terminate <char> define the string-termination character\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(26);
fprintf(out, USAGE_MAN_TAIL("look(1)"));
printf(USAGE_HELP_OPTIONS(26));
printf(USAGE_MAN_TAIL("look(1)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/lsblk.c
View File

@ -1658,14 +1658,14 @@ 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);
print_usage_help_options(22);
printf(USAGE_HELP_OPTIONS(22));
fprintf(out, USAGE_COLUMNS);
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(out, " %11s %s\n", infos[i].name, _(infos[i].help));
fprintf(out, USAGE_MAN_TAIL("lsblk(8)"));
printf(USAGE_MAN_TAIL("lsblk(8)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/lslocks.c
View File

@ -507,14 +507,14 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -u, --notruncate don't truncate text in columns\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(24);
printf(USAGE_HELP_OPTIONS(24));
fputs(USAGE_COLUMNS, out);
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(out, " %11s %s\n", infos[i].name, _(infos[i].help));
fprintf(out, USAGE_MAN_TAIL("lslocks(8)"));
printf(USAGE_MAN_TAIL("lslocks(8)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/mcookie.c
View File

@ -91,8 +91,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -v, --verbose explain what is being done\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(23);
fprintf(out, USAGE_MAN_TAIL("mcookie(1)"));
printf(USAGE_HELP_OPTIONS(23));
printf(USAGE_MAN_TAIL("mcookie(1)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/namei.c
View File

@ -343,9 +343,9 @@ static void __attribute__((__noreturn__)) usage(void)
" -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);
printf(USAGE_HELP_OPTIONS(21));
fprintf(out, USAGE_MAN_TAIL("namei(1)"));
printf(USAGE_MAN_TAIL("namei(1)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/rename.c
View File

@ -144,8 +144,8 @@ 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);
print_usage_help_options(21);
fprintf(out, USAGE_MAN_TAIL("rename(1)"));
printf(USAGE_HELP_OPTIONS(21));
printf(USAGE_MAN_TAIL("rename(1)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/uuidd.c
View File

@ -79,8 +79,8 @@ 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);
print_usage_help_options(25);
fprintf(out, USAGE_MAN_TAIL("uuidd(8)"));
printf(USAGE_HELP_OPTIONS(25));
printf(USAGE_MAN_TAIL("uuidd(8)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/uuidgen.c
View File

@ -32,8 +32,8 @@ 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);
print_usage_help_options(18);
fprintf(out, USAGE_MAN_TAIL("uuidgen(1)"));
printf(USAGE_HELP_OPTIONS(18));
printf(USAGE_MAN_TAIL("uuidgen(1)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/uuidparse.c
View File

@ -103,13 +103,13 @@ static void __attribute__((__noreturn__)) usage(void)
puts(_(" -n, --noheadings don't print headings"));
puts(_(" -o, --output <list> COLUMNS to display (see below)"));
puts(_(" -r, --raw use the raw output format"));
print_usage_help_options(24);
printf(USAGE_HELP_OPTIONS(24));
fputs(USAGE_COLUMNS, stdout);
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(stdout, " %8s %s\n", infos[i].name, _(infos[i].help));
fprintf(stdout, USAGE_MAN_TAIL("uuidparse(1)"));
printf(USAGE_MAN_TAIL("uuidparse(1)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/whereis.c
View File

@ -205,8 +205,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -l output effective lookup paths\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(16);
fprintf(out, USAGE_MAN_TAIL("whereis(1)"));
printf(USAGE_HELP_OPTIONS(16));
printf(USAGE_MAN_TAIL("whereis(1)"));
exit(EXIT_SUCCESS);
}

4
misc-utils/wipefs.c
View File

@ -625,13 +625,13 @@ usage(void)
puts(_(" -q, --quiet suppress output messages"));
puts(_(" -t, --types <list> limit the set of filesystem, RAIDs or partition tables"));
print_usage_help_options(21);
printf(USAGE_HELP_OPTIONS(21));
fputs(USAGE_COLUMNS, stdout);
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(stdout, " %8s %s\n", infos[i].name, _(infos[i].help));
fprintf(stdout, USAGE_MAN_TAIL("wipefs(8)"));
printf(USAGE_MAN_TAIL("wipefs(8)"));
exit(EXIT_SUCCESS);
}

4
schedutils/chrt.c
View File

@ -165,9 +165,9 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -v, --verbose display status information\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(22);
printf(USAGE_HELP_OPTIONS(22));
fprintf(out, USAGE_MAN_TAIL("chrt(1)"));
printf(USAGE_MAN_TAIL("chrt(1)"));
exit(EXIT_SUCCESS);
}

4
schedutils/ionice.c
View File

@ -121,9 +121,9 @@ 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);
print_usage_help_options(24);
printf(USAGE_HELP_OPTIONS(24));
fprintf(out, USAGE_MAN_TAIL("ionice(1)"));
printf(USAGE_MAN_TAIL("ionice(1)"));
exit(EXIT_SUCCESS);
}

4
schedutils/taskset.c
View File

@ -62,7 +62,7 @@ static void __attribute__((__noreturn__)) usage(void)
" -p, --pid operate on existing given pid\n"
" -c, --cpu-list display and specify cpus in list format\n"
));
print_usage_help_options(25);
printf(USAGE_HELP_OPTIONS(25));
fputs(USAGE_SEPARATOR, out);
fprintf(out, _(
@ -78,7 +78,7 @@ static void __attribute__((__noreturn__)) usage(void)
" e.g. 0-31:2 is equivalent to mask 0x55555555\n"),
program_invocation_short_name);
fprintf(out, USAGE_MAN_TAIL("taskset(1)"));
printf(USAGE_MAN_TAIL("taskset(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/blkdiscard.c
View File

@ -96,9 +96,9 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -v, --verbose print aligned length and offset\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(21);
printf(USAGE_HELP_OPTIONS(21));
fprintf(out, USAGE_MAN_TAIL("blkdiscard(8)"));
printf(USAGE_MAN_TAIL("blkdiscard(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/blkzone.c
View File

@ -311,9 +311,9 @@ 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);
print_usage_help_options(24);
printf(USAGE_HELP_OPTIONS(24));
fprintf(out, USAGE_MAN_TAIL("blkzone(8)"));
printf(USAGE_MAN_TAIL("blkzone(8)"));
exit(EXIT_SUCCESS);
}

2
sys-utils/chcpu.c
View File

@ -251,7 +251,7 @@ static void __attribute__((__noreturn__)) usage(void)
" -p, --dispatch <mode> set dispatching mode\n"
" -r, --rescan trigger rescan of cpus\n"
), stdout);
print_usage_help_options(31);
printf(USAGE_HELP_OPTIONS(31));
printf(USAGE_MAN_TAIL("chcpu(8)"));
exit(EXIT_SUCCESS);

4
sys-utils/chmem.c
View File

@ -249,9 +249,9 @@ 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);
print_usage_help_options(16);
printf(USAGE_HELP_OPTIONS(16));
fprintf(out, USAGE_MAN_TAIL("chmem(8)"));
printf(USAGE_MAN_TAIL("chmem(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/ctrlaltdel.c
View File

@ -31,8 +31,8 @@ static void __attribute__((__noreturn__)) usage(void)
fprintf(out, _("Set the function of the Ctrl-Alt-Del combination.\n"));
fputs(USAGE_OPTIONS, out);
print_usage_help_options(16);
fprintf(out, USAGE_MAN_TAIL("ctrlaltdel(8)"));
printf(USAGE_HELP_OPTIONS(16));
printf(USAGE_MAN_TAIL("ctrlaltdel(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/dmesg.c
View File

@ -306,7 +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);
print_usage_help_options(29);
printf(USAGE_HELP_OPTIONS(29));
fputs(_("\nSupported log facilities:\n"), out);
for (i = 0; i < ARRAY_SIZE(level_names); i++)
fprintf(out, " %7s - %s\n",
@ -319,7 +319,7 @@ static void __attribute__((__noreturn__)) usage(void)
level_names[i].name,
_(level_names[i].help));
fprintf(out, USAGE_MAN_TAIL("dmesg(1)"));
printf(USAGE_MAN_TAIL("dmesg(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/eject.c
View File

@ -159,10 +159,10 @@ static void __attribute__((__noreturn__)) usage(void)
out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(29);
printf(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)"));
printf(USAGE_MAN_TAIL("eject(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/fallocate.c
View File

@ -101,9 +101,9 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -v, --verbose verbose mode\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(22);
printf(USAGE_HELP_OPTIONS(22));
fprintf(out, USAGE_MAN_TAIL("fallocate(1)"));
printf(USAGE_MAN_TAIL("fallocate(1)"));
exit(EXIT_SUCCESS);
}

2
sys-utils/flock.c
View File

@ -70,7 +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);
print_usage_help_options(26);
printf(USAGE_HELP_OPTIONS(26));
printf(USAGE_MAN_TAIL("flock(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/fsfreeze.c
View File

@ -47,8 +47,8 @@ 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);
print_usage_help_options(19);
fprintf(out, USAGE_MAN_TAIL("fsfreeze(8)"));
printf(USAGE_HELP_OPTIONS(19));
printf(USAGE_MAN_TAIL("fsfreeze(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/fstrim.c
View File

@ -262,8 +262,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -v, --verbose print number of discarded bytes\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(21);
fprintf(out, USAGE_MAN_TAIL("fstrim(8)"));
printf(USAGE_HELP_OPTIONS(21));
printf(USAGE_MAN_TAIL("fstrim(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/hwclock.c
View File

@ -1242,8 +1242,8 @@ 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);
print_usage_help_options(22);
fprintf(out, USAGE_MAN_TAIL("hwclock(8)"));
printf(USAGE_HELP_OPTIONS(22));
printf(USAGE_MAN_TAIL("hwclock(8)"));
hwclock_exit(ctl, EXIT_SUCCESS);
}

4
sys-utils/ipcmk.c
View File

@ -76,8 +76,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -p, --mode <mode> permission for the resource (default is 0644)\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(26);
fprintf(out, USAGE_MAN_TAIL("ipcmk(1)"));
printf(USAGE_HELP_OPTIONS(26));
printf(USAGE_MAN_TAIL("ipcmk(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/ipcrm.c
View File

@ -65,8 +65,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -v, --verbose explain what is being done\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(28);
fprintf(out, USAGE_MAN_TAIL("ipcrm(1)"));
printf(USAGE_HELP_OPTIONS(28));
printf(USAGE_MAN_TAIL("ipcrm(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/ipcs.c
View File

@ -58,7 +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);
print_usage_help_options(16);
printf(USAGE_HELP_OPTIONS(16));
fputs(USAGE_SEPARATOR, out);
fputs(_("Resource options:\n"), out);
@ -76,7 +76,7 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -u, --summary show status summary\n"), out);
fputs(_(" --human show sizes in human-readable format\n"), out);
fputs(_(" -b, --bytes show sizes in bytes\n"), out);
fprintf(out, USAGE_MAN_TAIL("ipcs(1)"));
printf(USAGE_MAN_TAIL("ipcs(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/ldattach.c
View File

@ -213,7 +213,7 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -i, --iflag [-]<iflag> set input mode flag\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(25);
printf(USAGE_HELP_OPTIONS(25));
fputs(_("\nKnown <ldisc> names:\n"), out);
print_table(out, ld_discs);
@ -222,7 +222,7 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_("\nKnown <iflag> names:\n"), out);
print_table(out, ld_iflags);
fprintf(out, USAGE_MAN_TAIL("ldattach(8)"));
printf(USAGE_MAN_TAIL("ldattach(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/losetup.c
View File

@ -419,13 +419,13 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" --raw use raw --list output format\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(31);
printf(USAGE_HELP_OPTIONS(31));
fputs(USAGE_COLUMNS, out);
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(out, " %12s %s\n", infos[i].name, _(infos[i].help));
fprintf(out, USAGE_MAN_TAIL("losetup(8)"));
printf(USAGE_MAN_TAIL("losetup(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/lscpu.c
View File

@ -2065,13 +2065,13 @@ 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);
print_usage_help_options(25);
printf(USAGE_HELP_OPTIONS(25));
fputs(USAGE_COLUMNS, out);
for (i = 0; i < ARRAY_SIZE(coldescs); i++)
fprintf(out, " %13s %s\n", coldescs[i].name, _(coldescs[i].help));
fprintf(out, USAGE_MAN_TAIL("lscpu(1)"));
printf(USAGE_MAN_TAIL("lscpu(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/lsipc.c
View File

@ -304,7 +304,7 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -t, --time show attach, detach and change times\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(26);
printf(USAGE_HELP_OPTIONS(26));
fprintf(out, _("\nGeneric columns:\n"));
for (i = COLDESC_IDX_GEN_FIRST; i <= COLDESC_IDX_GEN_LAST; i++)
@ -326,7 +326,7 @@ static void __attribute__((__noreturn__)) usage(void)
for (i = COLDESC_IDX_SUM_FIRST; i <= COLDESC_IDX_SUM_LAST; i++)
fprintf(out, " %14s %s\n", coldescs[i].name, _(coldescs[i].help));
fprintf(out, USAGE_MAN_TAIL("lsipc(1)"));
printf(USAGE_MAN_TAIL("lsipc(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/lsmem.c
View File

@ -387,13 +387,13 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" --summary[=when] print summary information (never,always or only)\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(22);
printf(USAGE_HELP_OPTIONS(22));
fputs(USAGE_COLUMNS, out);
for (i = 0; i < ARRAY_SIZE(coldescs); i++)
fprintf(out, " %10s %s\n", coldescs[i].name, _(coldescs[i].help));
fprintf(out, USAGE_MAN_TAIL("lsmem(1)"));
printf(USAGE_MAN_TAIL("lsmem(1)"));
exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
}

4
sys-utils/lsns.c
View File

@ -627,13 +627,13 @@ 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);
print_usage_help_options(24);
printf(USAGE_HELP_OPTIONS(24));
fputs(USAGE_COLUMNS, out);
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(out, " %11s %s\n", infos[i].name, _(infos[i].help));
fprintf(out, USAGE_MAN_TAIL("lsns(8)"));
printf(USAGE_MAN_TAIL("lsns(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/mount.c
View File

@ -426,7 +426,7 @@ static void __attribute__((__noreturn__)) usage(void)
" -w, --rw, --read-write mount the filesystem read-write (default)\n"));
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(25);
printf(USAGE_HELP_OPTIONS(25));
fprintf(out, _(
"\nSource:\n"
@ -458,7 +458,7 @@ static void __attribute__((__noreturn__)) usage(void)
" --make-rprivate recursively mark a whole subtree as private\n"
" --make-runbindable recursively mark a whole subtree as unbindable\n"));
fprintf(out, USAGE_MAN_TAIL("mount(8)"));
printf(USAGE_MAN_TAIL("mount(8)"));
exit(MNT_EX_SUCCESS);
}

4
sys-utils/mountpoint.c
View File

@ -127,8 +127,8 @@ 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);
print_usage_help_options(20);
fprintf(out, USAGE_MAN_TAIL("mountpoint(1)"));
printf(USAGE_HELP_OPTIONS(20));
printf(USAGE_MAN_TAIL("mountpoint(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/nsenter.c
View File

@ -97,8 +97,8 @@ static void __attribute__((__noreturn__)) usage(void)
#endif
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(24);
fprintf(out, USAGE_MAN_TAIL("nsenter(1)"));
printf(USAGE_HELP_OPTIONS(24));
printf(USAGE_MAN_TAIL("nsenter(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/pivot_root.c
View File

@ -38,8 +38,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_("Change the root filesystem.\n"), out);
fputs(USAGE_OPTIONS, out);
print_usage_help_options(16);
fprintf(out, USAGE_MAN_TAIL("pivot_root(8)"));
printf(USAGE_HELP_OPTIONS(16));
printf(USAGE_MAN_TAIL("pivot_root(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/prlimit.c
View File

@ -173,7 +173,7 @@ static void __attribute__((__noreturn__)) usage(void)
" --raw use the raw output format\n"
" --verbose verbose output\n"
), out);
print_usage_help_options(24);
printf(USAGE_HELP_OPTIONS(24));
fputs(_("\nResources Options:\n"), out);
fputs(_(" -c, --core maximum size of core files created\n"
@ -198,7 +198,7 @@ static void __attribute__((__noreturn__)) usage(void)
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(out, " %11s %s\n", infos[i].name, _(infos[i].help));
fprintf(out, USAGE_MAN_TAIL("prlimit(1)"));
printf(USAGE_MAN_TAIL("prlimit(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/readprofile.c
View File

@ -122,8 +122,8 @@ 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);
print_usage_help_options(27);
fprintf(out, USAGE_MAN_TAIL("readprofile(8)"));
printf(USAGE_HELP_OPTIONS(27));
printf(USAGE_MAN_TAIL("readprofile(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/renice.c
View File

@ -73,8 +73,8 @@ 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);
print_usage_help_options(24);
fprintf(out, USAGE_MAN_TAIL("renice(1)"));
printf(USAGE_HELP_OPTIONS(24));
printf(USAGE_MAN_TAIL("renice(1)"));
exit(EXIT_SUCCESS);
}

2
sys-utils/rtcwake.c
View File

@ -115,7 +115,7 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -v, --verbose verbose messages\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(26);
printf(USAGE_HELP_OPTIONS(26));
printf(USAGE_MAN_TAIL("rtcwake(8)"));
exit(EXIT_SUCCESS);
}

2
sys-utils/setarch.c
View File

@ -114,7 +114,7 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" --list list settable architectures, and exit\n"), stdout);
fputs(USAGE_SEPARATOR, stdout);
print_usage_help_options(26);
printf(USAGE_HELP_OPTIONS(26));
printf(USAGE_MAN_TAIL("setarch(8)"));
exit(EXIT_SUCCESS);

4
sys-utils/setpriv.c
View File

@ -139,10 +139,10 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" --apparmor-profile <pr> set AppArmor profile\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(29);
printf(USAGE_HELP_OPTIONS(29));
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)"));
printf(USAGE_MAN_TAIL("setpriv(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/setsid.c
View File

@ -40,9 +40,9 @@ 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);
print_usage_help_options(16);
printf(USAGE_HELP_OPTIONS(16));
fprintf(out, USAGE_MAN_TAIL("setsid(1)"));
printf(USAGE_MAN_TAIL("setsid(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/swapoff.c
View File

@ -130,7 +130,7 @@ static void __attribute__((__noreturn__)) usage(void)
" -v, --verbose verbose mode\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(24);
printf(USAGE_HELP_OPTIONS(24));
fputs(_("\nThe <spec> parameter:\n" \
" -L <label> LABEL of device to be used\n" \
@ -140,7 +140,7 @@ static void __attribute__((__noreturn__)) usage(void)
" <device> name of device to be used\n" \
" <file> name of file to be used\n"), out);
fprintf(out, USAGE_MAN_TAIL("swapoff(8)"));
printf(USAGE_MAN_TAIL("swapoff(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/swapon.c
View File

@ -808,7 +808,7 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -v, --verbose verbose mode\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(26);
printf(USAGE_HELP_OPTIONS(26));
fputs(_("\nThe <spec> parameter:\n" \
" -L <label> synonym for LABEL=<label>\n"
@ -829,7 +829,7 @@ static void __attribute__((__noreturn__)) usage(void)
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(out, " %-5s %s\n", infos[i].name, _(infos[i].help));
fprintf(out, USAGE_MAN_TAIL("swapon(8)"));
printf(USAGE_MAN_TAIL("swapon(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/switch_root.c
View File

@ -209,8 +209,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_("Switch to another filesystem as the root of the mount tree.\n"), output);
fputs(USAGE_OPTIONS, output);
print_usage_help_options(16);
fprintf(output, USAGE_MAN_TAIL("switch_root(8)"));
printf(USAGE_HELP_OPTIONS(16));
printf(USAGE_MAN_TAIL("switch_root(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/tunelp.c
View File

@ -112,8 +112,8 @@ 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);
print_usage_help_options(30);
fprintf(out, USAGE_MAN_TAIL("tunelp(8)"));
printf(USAGE_HELP_OPTIONS(30));
printf(USAGE_MAN_TAIL("tunelp(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/umount.c
View File

@ -102,8 +102,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -v, --verbose say what is being done\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(25);
fprintf(out, USAGE_MAN_TAIL("umount(8)"));
printf(USAGE_HELP_OPTIONS(25));
printf(USAGE_MAN_TAIL("umount(8)"));
exit(MNT_EX_SUCCESS);
}

4
sys-utils/unshare.c
View File

@ -265,8 +265,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -s, --setgroups allow|deny control the setgroups syscall in user namespaces\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(27);
fprintf(out, USAGE_MAN_TAIL("unshare(1)"));
printf(USAGE_HELP_OPTIONS(27));
printf(USAGE_MAN_TAIL("unshare(1)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/wdctl.c
View File

@ -190,7 +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);
print_usage_help_options(24);
printf(USAGE_HELP_OPTIONS(24));
fputs(USAGE_SEPARATOR, out);
fprintf(out, _("The default device is %s.\n"), _PATH_WATCHDOG_DEV);
@ -199,7 +199,7 @@ static void __attribute__((__noreturn__)) usage(void)
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(out, " %13s %s\n", infos[i].name, _(infos[i].help));
fprintf(out, USAGE_MAN_TAIL("wdctl(8)"));
printf(USAGE_MAN_TAIL("wdctl(8)"));
exit(EXIT_SUCCESS);
}

4
sys-utils/zramctl.c
View File

@ -543,13 +543,13 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -t, --streams <number> number of compression streams\n"), out);
fputs(USAGE_SEPARATOR, out);
print_usage_help_options(27);
printf(USAGE_HELP_OPTIONS(27));
fputs(USAGE_COLUMNS, out);
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(out, " %11s %s\n", infos[i].name, _(infos[i].help));
fprintf(out, USAGE_MAN_TAIL("zramctl(8)"));
printf(USAGE_MAN_TAIL("zramctl(8)"));
exit(EXIT_SUCCESS);
}

2
term-utils/agetty.c
View File

@ -2112,7 +2112,7 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" --reload reload prompts on running agetty instances\n"), out);
printf( " --help %s\n", USAGE_OPTSTR_HELP);
printf( " --version %s\n", USAGE_OPTSTR_VERSION);
fprintf(out, USAGE_MAN_TAIL("agetty(8)"));
printf(USAGE_MAN_TAIL("agetty(8)"));
exit(EXIT_SUCCESS);
}

4
term-utils/mesg.c
View File

@ -80,8 +80,8 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(USAGE_OPTIONS, out);
fputs(_(" -v, --verbose explain what is being done\n"), out);
print_usage_help_options(16);
fprintf(out, USAGE_MAN_TAIL("mesg(1)"));
printf(USAGE_HELP_OPTIONS(16));
printf(USAGE_MAN_TAIL("mesg(1)"));
exit(EXIT_SUCCESS);
}

4
term-utils/script.c
View File

@ -172,9 +172,9 @@ static void __attribute__((__noreturn__)) usage(void)
" -q, --quiet be quiet\n"
" -t, --timing[=<file>] output timing data to stderr (or to FILE)\n"
), out);
print_usage_help_options(25);
printf(USAGE_HELP_OPTIONS(25));
fprintf(out, USAGE_MAN_TAIL("script(1)"));
printf(USAGE_MAN_TAIL("script(1)"));
exit(EXIT_SUCCESS);
}

4
term-utils/scriptreplay.c
View File

@ -53,9 +53,9 @@ usage(void)
" -d, --divisor <num> speed up or slow down execution with time divisor\n"
" -m, --maxdelay <num> wait at most this many seconds between updates\n"
), out);
print_usage_help_options(25);
printf(USAGE_HELP_OPTIONS(25));
fprintf(out, USAGE_MAN_TAIL("scriptreplay(1)"));
printf(USAGE_MAN_TAIL("scriptreplay(1)"));
exit(EXIT_SUCCESS);
}

2
term-utils/setterm.c
View File

@ -421,7 +421,7 @@ static void __attribute__((__noreturn__)) usage(void)
printf( " --help %s\n", USAGE_OPTSTR_HELP);
printf( " --version %s\n", USAGE_OPTSTR_VERSION);
fprintf(out, USAGE_MAN_TAIL("setterm(1)"));
printf(USAGE_MAN_TAIL("setterm(1)"));
exit(EXIT_SUCCESS);
}

4
term-utils/wall.c
View File

@ -93,8 +93,8 @@ 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);
print_usage_help_options(25);
fprintf(out, USAGE_MAN_TAIL("wall(1)"));
printf(USAGE_HELP_OPTIONS(25));
printf(USAGE_MAN_TAIL("wall(1)"));
exit(EXIT_SUCCESS);
}

Some files were not shown because too many files have changed in this diff Show More