diff options
author | Karel Zak | 2013-04-05 12:43:51 +0200 |
---|---|---|
committer | Karel Zak | 2013-04-05 12:43:51 +0200 |
commit | a2343e0312a5459365a09694cf494dc17909c2a9 (patch) | |
tree | 7b1d5d0cbc8d39c3c0bcca0c9f6bc9a86a5a5d65 /text-utils | |
parent | raw: add long options to man page (diff) | |
download | kernel-qcow2-util-linux-a2343e0312a5459365a09694cf494dc17909c2a9.tar.gz kernel-qcow2-util-linux-a2343e0312a5459365a09694cf494dc17909c2a9.tar.xz kernel-qcow2-util-linux-a2343e0312a5459365a09694cf494dc17909c2a9.zip |
ul: cleanup usage() and man page
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'text-utils')
-rw-r--r-- | text-utils/ul.1 | 2 | ||||
-rw-r--r-- | text-utils/ul.c | 21 |
2 files changed, 12 insertions, 11 deletions
diff --git a/text-utils/ul.1 b/text-utils/ul.1 index d6089d028..9ed93790a 100644 --- a/text-utils/ul.1 +++ b/text-utils/ul.1 @@ -62,7 +62,7 @@ present in an .B nroff output stream on a crt-terminal. .TP -\fB\-t\fR, \fB\-\-terminal\fR \fIterminal\fR +\fB\-t\fR, \fB\-T\fR, \fB\-\-terminal\fR \fIterminal\fR .It Fl t Ar terminal Overrides the .I terminal diff --git a/text-utils/ul.c b/text-utils/ul.c index f48550c8d..5710a5547 100644 --- a/text-utils/ul.c +++ b/text-utils/ul.c @@ -132,16 +132,17 @@ int iflag; static void __attribute__((__noreturn__)) usage(FILE *out) { - fprintf(out, _( - "\nUsage:\n" - " %s [options] [file...]\n"), program_invocation_short_name); - - fprintf(out, _( - "\nOptions:\n" - " -t, --terminal TERMINAL override the TERM environment variable\n" - " -i, --indicated underlining is indicated via a separate line\n" - " -V, --version output version information and exit\n" - " -h, --help display this help and exit\n\n")); + fputs(USAGE_HEADER, out); + fprintf(out, _(" %s [options] [<file> ...]\n"), program_invocation_short_name); + fputs(USAGE_OPTIONS, out); + + 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); + + fprintf(out, USAGE_MAN_TAIL("ul(1)")); exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); } |