From: Karel Zak <kzak@redhat.com>
Date: Fri, 5 Apr 2013 10:43:51 +0000 (+0200)
Subject: ul: cleanup usage() and man page
X-Git-Tag: v2.23-rc2~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2343e0312a5459365a09694cf494dc17909c2a9;p=thirdparty%2Futil-linux.git

ul: cleanup usage() and man page

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/text-utils/ul.1 b/text-utils/ul.1
index d6089d028f..9ed93790a9 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 f48550c8dc..5710a5547e 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);
 }