Also use the standard macros for outputting it.
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
text-utils/colcrt.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/text-utils/colcrt.c b/text-utils/colcrt.c
index c39c8b6..21013ea 100644
--- a/text-utils/colcrt.c
+++ b/text-utils/colcrt.c
@@ -309,16 +309,17 @@ void move(int l, int m)
static void __attribute__ ((__noreturn__)) usage(FILE * out)
{
- fprintf(out,
- _("\nUsage:\n"
- " %s [options] [file ...]\n"), program_invocation_short_name);
+ fputs(USAGE_HEADER, out);
+ fprintf(out, _(" %s [options] [<file>...]\n"), program_invocation_short_name);
- fprintf(out,
- _(" -, --no-underlining suppress all underlining\n"
- " -2, --half-lines print all half-lines\n"
- " -V, --version output version information and exit\n"
- " -h, --help display this help and exit\n\n"));
+ fputs(USAGE_OPTIONS, out);
+ fputs(_(" -, --no-underlining suppress all underlining\n"), out);
+ fputs(_(" -2, --half-lines print all half-lines\n"), out);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(USAGE_HELP, out);
+ fputs(USAGE_VERSION, out);
fprintf(out, USAGE_MAN_TAIL("colcrt(1)"));
+
exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
}
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
