diff options
Diffstat (limited to 'sys-utils')
40 files changed, 76 insertions, 76 deletions
diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c index d078f297b..c19b67bf4 100644 --- a/sys-utils/blkdiscard.c +++ b/sys-utils/blkdiscard.c @@ -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); } diff --git a/sys-utils/blkzone.c b/sys-utils/blkzone.c index 28038f071..6d837ff28 100644 --- a/sys-utils/blkzone.c +++ b/sys-utils/blkzone.c @@ -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); } diff --git a/sys-utils/chcpu.c b/sys-utils/chcpu.c index 620aabfba..12e52d887 100644 --- a/sys-utils/chcpu.c +++ b/sys-utils/chcpu.c @@ -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); diff --git a/sys-utils/chmem.c b/sys-utils/chmem.c index b0060ae25..d9bc95cc1 100644 --- a/sys-utils/chmem.c +++ b/sys-utils/chmem.c @@ -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); } diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c index 6b3f38f56..22814587f 100644 --- a/sys-utils/ctrlaltdel.c +++ b/sys-utils/ctrlaltdel.c @@ -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); } diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c index ef12567c3..36d238f01 100644 --- a/sys-utils/dmesg.c +++ b/sys-utils/dmesg.c @@ -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); } diff --git a/sys-utils/eject.c b/sys-utils/eject.c index f1d4474eb..aa90ff72f 100644 --- a/sys-utils/eject.c +++ b/sys-utils/eject.c @@ -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); } diff --git a/sys-utils/fallocate.c b/sys-utils/fallocate.c index d5dd9f7e1..c8b2b2fcc 100644 --- a/sys-utils/fallocate.c +++ b/sys-utils/fallocate.c @@ -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); } diff --git a/sys-utils/flock.c b/sys-utils/flock.c index 170f96771..ed25230b9 100644 --- a/sys-utils/flock.c +++ b/sys-utils/flock.c @@ -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); } diff --git a/sys-utils/fsfreeze.c b/sys-utils/fsfreeze.c index 487759220..401ab5c98 100644 --- a/sys-utils/fsfreeze.c +++ b/sys-utils/fsfreeze.c @@ -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); } diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c index 56a145066..387f260fd 100644 --- a/sys-utils/fstrim.c +++ b/sys-utils/fstrim.c @@ -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); } diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index a0a48dd13..a9d3887ca 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -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); } diff --git a/sys-utils/ipcmk.c b/sys-utils/ipcmk.c index c7b4a83ee..df836525a 100644 --- a/sys-utils/ipcmk.c +++ b/sys-utils/ipcmk.c @@ -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); } diff --git a/sys-utils/ipcrm.c b/sys-utils/ipcrm.c index c1c8de25a..a9f2d1b9a 100644 --- a/sys-utils/ipcrm.c +++ b/sys-utils/ipcrm.c @@ -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); } diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c index e63f10afe..73cf28ab1 100644 --- a/sys-utils/ipcs.c +++ b/sys-utils/ipcs.c @@ -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); } diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c index 3c6b4aad6..eb04b5e33 100644 --- a/sys-utils/ldattach.c +++ b/sys-utils/ldattach.c @@ -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); } diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c index d4740bd94..bbff98389 100644 --- a/sys-utils/losetup.c +++ b/sys-utils/losetup.c @@ -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); } diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c index 852711e74..8b4fe0bcd 100644 --- a/sys-utils/lscpu.c +++ b/sys-utils/lscpu.c @@ -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); } diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c index 4bbd8d77b..e99c861ab 100644 --- a/sys-utils/lsipc.c +++ b/sys-utils/lsipc.c @@ -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); } diff --git a/sys-utils/lsmem.c b/sys-utils/lsmem.c index 4db678966..aeffd29dd 100644 --- a/sys-utils/lsmem.c +++ b/sys-utils/lsmem.c @@ -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); } diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c index 6ed772c9f..1fb0b87f3 100644 --- a/sys-utils/lsns.c +++ b/sys-utils/lsns.c @@ -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); } diff --git a/sys-utils/mount.c b/sys-utils/mount.c index e9a581150..83cccf63e 100644 --- a/sys-utils/mount.c +++ b/sys-utils/mount.c @@ -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); } diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c index 305013851..808cfb9d0 100644 --- a/sys-utils/mountpoint.c +++ b/sys-utils/mountpoint.c @@ -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); } diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c index 48932df88..9c452c1d1 100644 --- a/sys-utils/nsenter.c +++ b/sys-utils/nsenter.c @@ -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); } diff --git a/sys-utils/pivot_root.c b/sys-utils/pivot_root.c index bb9aec66b..ea76d94bf 100644 --- a/sys-utils/pivot_root.c +++ b/sys-utils/pivot_root.c @@ -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); } diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c index 37e0f9fed..e8d95822e 100644 --- a/sys-utils/prlimit.c +++ b/sys-utils/prlimit.c @@ -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); } diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c index 7a85ba5ef..035073847 100644 --- a/sys-utils/readprofile.c +++ b/sys-utils/readprofile.c @@ -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); } diff --git a/sys-utils/renice.c b/sys-utils/renice.c index ca438bbbc..33852b4a8 100644 --- a/sys-utils/renice.c +++ b/sys-utils/renice.c @@ -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); } diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c index d02ee17ac..5fe686f5b 100644 --- a/sys-utils/rtcwake.c +++ b/sys-utils/rtcwake.c @@ -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); } diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c index 5280a1271..6673825c8 100644 --- a/sys-utils/setarch.c +++ b/sys-utils/setarch.c @@ -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); diff --git a/sys-utils/setpriv.c b/sys-utils/setpriv.c index 1e5c0b499..d0123368e 100644 --- a/sys-utils/setpriv.c +++ b/sys-utils/setpriv.c @@ -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); } diff --git a/sys-utils/setsid.c b/sys-utils/setsid.c index fddd8a87a..0b1395232 100644 --- a/sys-utils/setsid.c +++ b/sys-utils/setsid.c @@ -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); } diff --git a/sys-utils/swapoff.c b/sys-utils/swapoff.c index e13fb752b..e5e059d74 100644 --- a/sys-utils/swapoff.c +++ b/sys-utils/swapoff.c @@ -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); } diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c index 28f3bd8d6..641facb1f 100644 --- a/sys-utils/swapon.c +++ b/sys-utils/swapon.c @@ -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); } diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c index 5c4095966..87f178c36 100644 --- a/sys-utils/switch_root.c +++ b/sys-utils/switch_root.c @@ -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); } diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c index a03b9a68a..c6bdc66e9 100644 --- a/sys-utils/tunelp.c +++ b/sys-utils/tunelp.c @@ -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); } diff --git a/sys-utils/umount.c b/sys-utils/umount.c index fd21ca9d7..61d9a33ef 100644 --- a/sys-utils/umount.c +++ b/sys-utils/umount.c @@ -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); } diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c index 5060c2839..b5e0d6608 100644 --- a/sys-utils/unshare.c +++ b/sys-utils/unshare.c @@ -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); } diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c index 1b82fc830..33012dca3 100644 --- a/sys-utils/wdctl.c +++ b/sys-utils/wdctl.c @@ -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); } diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c index 3d604cf68..aee28cc01 100644 --- a/sys-utils/zramctl.c +++ b/sys-utils/zramctl.c @@ -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); } |