textual: use manual tail usage() macro

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
index 23098e4e4529951c2419d5c39fd94258584b5a19..c2c23897286573068c2db833aeaf7f583b62d01f 100644 (file)
--- a/disk-utils/mkfs.bfs.c
+++ b/disk-utils/mkfs.bfs.c
@@ -83,6 +83,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
                       "                     -V as version must be only option\n"
                       " -h, --help          display this help and exit\n\n"));
 
+       fprintf(out, USAGE_MAN_TAIL("mkfs.bfs(8)"));
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 

diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c
index 5bdb93180dcc3d2b8e63557b50615de52d71ccaa..f10ba2890ad34da70e7030cd49545a9219032c70 100644 (file)
--- a/disk-utils/mkfs.c
+++ b/disk-utils/mkfs.c
@@ -59,7 +59,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
                       "                      -V as --version must be the only option\n"));
        fprintf(out, _(" -h, --help         display this help text and exit\n"));
 
-       fprintf(out, _("\nFor more information see mkfs(8).\n"));
+       fprintf(out, USAGE_MAN_TAIL("mkfs(8)"));
 
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }

diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
index 4503fe5d4679a564759190791795584f6171d241..7867404c9d31e50390c3a9046fb5882088cb9365 100644 (file)
--- a/login-utils/lslogins.c
+++ b/login-utils/lslogins.c
@@ -1217,7 +1217,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
                fprintf(out, " %14s  %s\n", coldescs[i].name,
                                _(coldescs[i].help));
 
-       fprintf(out, _("\nFor more details see lslogins(1).\n"));
+       fprintf(out, USAGE_MAN_TAIL("lslogins(1)"));
 
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }

diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c
index 7630173d73d130ee6e090027f91cf3c7042c2056..74793ee15734b5e1268f6234b300acd19fbcc808 100644 (file)
--- a/misc-utils/getopt.c
+++ b/misc-utils/getopt.c
@@ -333,6 +333,7 @@ static void __attribute__ ((__noreturn__)) print_help(void)
        fputs(_(" -V, --version                Output version information\n"), stderr);
        fputc('\n', stderr);
 
+       fprintf(stderr, USAGE_MAN_TAIL("getopt(1)"));
        exit(PARAMETER_EXIT_CODE);
 }
 

diff --git a/misc-utils/look.c b/misc-utils/look.c
index 502168b9c9eeec8beaafeb342bba2a236c224bef..d519cf6fa910648ec5b3d08d60d65fb540bacbd3 100644 (file)
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -375,5 +375,6 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
                " -V, --version          output version information and exit\n"
                " -h, --help             display this help and exit\n\n"), out);
 
+       fprintf(out, USAGE_MAN_TAIL("look(1)"));
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }

diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index cac0e6c711151b244f1e3d942136a04c287fd62f..a4496bcaf5614066596f2fe47154092d172dfca7 100644 (file)
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -438,7 +438,7 @@ static void usage(int rc)
                " -n, --nosymlinks    don't follow symlinks\n"
                " -v, --vertical      vertical align of modes and owners\n"), out);
 
-       fputs(_("\nFor more information see namei(1).\n"), out);
+       fprintf(out, USAGE_MAN_TAIL("namei(1)"));
        exit(rc);
 }
 

diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index 0c844d21659fba0121bdbc48da7e9dbe22cf8768..3883424e92b6b9fe7417984a5907be89c5130b32 100644 (file)
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -38,6 +38,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
                " -V, --version    output version information and exit\n"
                " -h, --help       display this help and exit\n\n"), out);
 
+       fprintf(out, USAGE_MAN_TAIL("uuidgen(1)"));
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 

diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 58a643e54f5bfdec36783bf27cf42e19e37347e7..0671bb4d024a7c6c1741ddb1a8e7435e6fcb6c5c 100644 (file)
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -464,7 +464,7 @@ usage(FILE *out)
                " -t, --types <list>  limit the set of filesystem, RAIDs or partition tables\n"
                " -V, --version       output version information and exit\n"), out);
 
-       fprintf(out, _("\nFor more information see wipefs(8).\n"));
+       fprintf(out, USAGE_MAN_TAIL("wipefs(8)"));
 
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }

diff --git a/schedutils/chrt.c b/schedutils/chrt.c
index df115aaf6a84c0647210ab60cd2984a9e084768b..7988b2a0385034579e20489becc6403b3699c124 100644 (file)
--- a/schedutils/chrt.c
+++ b/schedutils/chrt.c
@@ -86,6 +86,7 @@ static void __attribute__((__noreturn__)) show_usage(int rc)
        "  -v | --verbose       display status information\n"
        "  -V | --version       output version information\n\n"));
 
+       fprintf(out, USAGE_MAN_TAIL("chrt(1)"));
        exit(rc);
 }
 

diff --git a/schedutils/taskset.c b/schedutils/taskset.c
index 4cda2ebe513a05c313e46702efe5fa1e5fe2f2f0..1bf1291cdd0742b8d0752b2394f05ba3be85cec4 100644 (file)
--- a/schedutils/taskset.c
+++ b/schedutils/taskset.c
@@ -72,7 +72,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
                "    e.g. 0-31:2 is equivalent to mask 0x55555555\n"),
                program_invocation_short_name);
 
-       fprintf(out, _("\nFor more information see taskset(1).\n"));
+       fprintf(out, USAGE_MAN_TAIL("taskset(1)"));
 
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 8ae702865bdc2a7efa4b5e28981b21d4bfe58dab..ef594108833fa94c36c7e3907640daea68f386fb 100644 (file)
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1646,7 +1646,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
        for (i = 0; i < ARRAY_SIZE(coldescs); i++)
                fprintf(out, " %13s  %s\n", coldescs[i].name, _(coldescs[i].help));
 
-       fprintf(out, _("\nFor more details see lscpu(1).\n"));
+       fprintf(out, USAGE_MAN_TAIL("lscpu(1)"));
 
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }

diff --git a/term-utils/script.c b/term-utils/script.c
index ad16e7446056f539d30e83a6a42280e33db4610d..d2b897416f482759159ead9bea86e1eb0e8ba162 100644 (file)
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -153,6 +153,7 @@ usage(FILE *out)
                " -V, --version           output version information and exit\n"
                " -h, --help              display this help and exit\n\n"), out);
 
+       fprintf(out, USAGE_MAN_TAIL("script(1)"));
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 

diff --git a/term-utils/scriptreplay.c b/term-utils/scriptreplay.c
index 8e0cb971924756e7d8380d5349e0b9af5b1f5e64..7ac50d86864d26c95e046085dfb5511f51b2009e 100644 (file)
--- a/term-utils/scriptreplay.c
+++ b/term-utils/scriptreplay.c
@@ -50,6 +50,7 @@ usage(FILE *out)
                " -V, --version           output version information and exit\n"
                " -h, --help              display this help and exit\n\n"), out);
 
+       fprintf(out, USAGE_MAN_TAIL("scriptreplay(1)"));
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 

diff --git a/term-utils/write.c b/term-utils/write.c
index 4d217c4a566ff2270de74c3a840500fb289c83a6..e64bb439c961068fe7b32c43283425bb600be3be 100644 (file)
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -86,6 +86,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
        fputs(_(" -V, --version    output version information and exit\n"
                " -h, --help       display this help and exit\n\n"), out);
 
+       fprintf(out, USAGE_MAN_TAIL("write(1)"));
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 

diff --git a/text-utils/col.c b/text-utils/col.c
index 9b2f570caf29f973bcc56df5d69ab4ed7210836f..1218f251a37406672157db800e4fc95cc5e02121 100644 (file)
--- a/text-utils/col.c
+++ b/text-utils/col.c
@@ -145,6 +145,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
                "%s reads from standard input and writes to standard output\n\n"),
                program_invocation_short_name);
 
+       fprintf(out, USAGE_MAN_TAIL("col(1)"));
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 

diff --git a/text-utils/colcrt.c b/text-utils/colcrt.c
index a5d597701e42cce4ee394c03dd1853b445c92fa6..c39c8b6f1ee3bc041eb4a9509cca91b3e6c760de 100644 (file)
--- a/text-utils/colcrt.c
+++ b/text-utils/colcrt.c
@@ -319,5 +319,6 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
                  " -V, --version         output version information and exit\n"
                  " -h, --help            display this help and exit\n\n"));
 
+       fprintf(out, USAGE_MAN_TAIL("colcrt(1)"));
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }

diff --git a/text-utils/colrm.c b/text-utils/colrm.c
index 111033df79121ed9efabd1b6e2bf45c39c7a84f0..f67524a6a9533510040de2043420dfd8400c2b6c 100644 (file)
--- a/text-utils/colrm.c
+++ b/text-utils/colrm.c
@@ -67,6 +67,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
        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)"));
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 

diff --git a/text-utils/rev.c b/text-utils/rev.c
index a661f0a434a268a8575fbf47ab5f7269776172f8..60ad7521bc6d78753bc39b0e4beda33382e214d9 100644 (file)
--- a/text-utils/rev.c
+++ b/text-utils/rev.c
@@ -81,7 +81,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
                       " -V, --version   output version information and exit\n"
                       " -h, --help      display this help and exit\n"));
 
-       fprintf(out, _("\nFor more information see rev(1).\n"));
+       fprintf(out, USAGE_MAN_TAIL("rev(1)"));
 
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }

diff --git a/text-utils/tailf.c b/text-utils/tailf.c
index 94f999ea833fd1c5f945f6e777fdf23ff8d501cc..bd38da274c5a4737dc6a78165ceb7b2d90e0184f 100644 (file)
--- a/text-utils/tailf.c
+++ b/text-utils/tailf.c
@@ -205,6 +205,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
                " -V, --version       output version information and exit\n"
                " -h, --help          display this help and exit\n\n"));
 
+       fprintf(out, USAGE_MAN_TAIL("tailf(1)"));
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }