From d7a3bf949bee912a9bb0a1cf8542eeeb6a69aa46 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 17 Jan 2017 13:11:27 +0100 Subject: column: rename --columns to --output-width * rename to use less confusing option name * cleanup usage() * update man page Addresses: https://github.com/karelzak/util-linux/pull/327 Signed-off-by: Karel Zak --- text-utils/column.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'text-utils/column.c') diff --git a/text-utils/column.c b/text-utils/column.c index a642d8432..43b3af5f5 100644 --- a/text-utils/column.c +++ b/text-utils/column.c @@ -120,12 +120,12 @@ static void __attribute__((__noreturn__)) usage(int rc) fputs(_("Columnate lists.\n"), out); fputs(USAGE_OPTIONS, out); - fputs(_(" -c, --columns width of output in number of characters\n"), out); - fputs(_(" -t, --table create a table\n"), out); - fputs(_(" -s, --separator possible table delimiters\n"), out); - fputs(_(" -o, --output-separator \n" - " columns separator for table output; default is two spaces\n"), out); - fputs(_(" -x, --fillrows fill rows before columns\n"), out); + fputs(_(" -t, --table create a table\n"), out); + fputs(_(" -s, --separator possible table delimiters\n"), out); + fputs(_(" -o, --output-separator columns separator for table output\n" + " (default is two spaces)\n"), out); + fputs(_(" -c, --output-width width of output in number of characters\n"), out); + fputs(_(" -x, --fillrows fill rows before columns\n"), out); fputs(USAGE_SEPARATOR, out); fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); @@ -152,13 +152,14 @@ int main(int argc, char **argv) static const struct option longopts[] = { + { "columns", 1, 0, 'c' }, /* deprecated */ + { "fillrows", 0, 0, 'x' }, { "help", 0, 0, 'h' }, - { "version", 0, 0, 'V' }, - { "columns", 1, 0, 'c' }, - { "table", 0, 0, 't' }, - { "separator", 1, 0, 's' }, { "output-separator", 1, 0, 'o' }, - { "fillrows", 0, 0, 'x' }, + { "output-width", 1, 0, 'c' }, + { "separator", 1, 0, 's' }, + { "table", 0, 0, 't' }, + { "version", 0, 0, 'V' }, { NULL, 0, 0, 0 }, }; -- cgit v1.2.3-55-g7522