Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
text-utils/column.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/text-utils/column.c b/text-utils/column.c
index 33bc28d..1f1a0a2 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -88,21 +88,20 @@ static void __attribute__((__noreturn__)) usage(int rc)
{
FILE *out = rc == EXIT_FAILURE ? stderr : stdout;
- fprintf(out, _("\nUsage: %s [options] [file ...]\n"),
- program_invocation_short_name);
- fprintf(out, _("\nOptions:\n"));
-
- fprintf(out, _(
- " -h, --help displays this help text\n"
- " -V, --version output version information and exit\n"
- " -c, --columns <width> width of output in number of characters\n"
- " -t, --table create a table\n"
- " -s, --separator <string> possible table delimiters\n"
- " -o, --output-separator <string>\n"
- " table output column separator, default is two spaces\n"
- " -x, --fillrows fill rows before columns\n"));
-
- fprintf(out, _("\nFor more information see column(1).\n"));
+ fputs(USAGE_HEADER, out);
+ fprintf(out, _(" %s [options] [file ...]\n"), program_invocation_short_name);
+ fputs(USAGE_OPTIONS, out);
+ fputs(_(" -c, --columns <width> width of output in number of characters\n"), out);
+ fputs(_(" -t, --table create a table\n"), out);
+ fputs(_(" -s, --separator <string> possible table delimiters\n"), out);
+ fputs(_(" -o, --output-separator <string>\n"), out);
+ fputs(_(" table output column separator, default is two spaces\n"), out);
+ fputs(_(" -x, --fillrows fill rows before columns\n"), out);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(USAGE_HELP, out);
+ fputs(USAGE_VERSION, out);
+ fprintf(out, USAGE_MAN_TAIL("column(1)"));
+
exit(rc);
}
--
1.8.1.1
--
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
