diff options
| author | Karel Zak | 2017-01-17 13:11:27 +0100 |
|---|---|---|
| committer | Karel Zak | 2017-01-17 13:14:05 +0100 |
| commit | d7a3bf949bee912a9bb0a1cf8542eeeb6a69aa46 (patch) | |
| tree | 9d69075c081ebfa501b618c244951ecf77a3f9ca /text-utils | |
| parent | last: use --time-format instruction when printing wtmp creation time (diff) | |
| download | kernel-qcow2-util-linux-d7a3bf949bee912a9bb0a1cf8542eeeb6a69aa46.tar.gz kernel-qcow2-util-linux-d7a3bf949bee912a9bb0a1cf8542eeeb6a69aa46.tar.xz kernel-qcow2-util-linux-d7a3bf949bee912a9bb0a1cf8542eeeb6a69aa46.zip | |
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 <kzak@redhat.com>
Diffstat (limited to 'text-utils')
| -rw-r--r-- | text-utils/column.1 | 7 | ||||
| -rw-r--r-- | text-utils/column.c | 23 |
2 files changed, 16 insertions, 14 deletions
diff --git a/text-utils/column.1 b/text-utils/column.1 index 524678224..5c6f36add 100644 --- a/text-utils/column.1 +++ b/text-utils/column.1 @@ -31,7 +31,7 @@ .\" .\" @(#)column.1 8.1 (Berkeley) 6/6/93 .\" -.TH COLUMN 1 "July 2014" "util-linux" "User Commands" +.TH COLUMN 1 "January 2017" "util-linux" "User Commands" .SH NAME column \- columnate lists .SH SYNOPSIS @@ -45,8 +45,9 @@ are filled before columns. Input is taken from \fIfile\fR, or otherwise from standard input. Empty lines are ignored. .PP .SH OPTIONS -.IP "\fB\-c, \-\-columns\fP \fIwidth\fP" -Output is formatted to a width specified as number of characters. +.IP "\fB\-c, \-\-output\-width\fP \fIwidth\fP" +Output is formatted to a width specified as number of characters. The original +name of this option is --columns; this name deprecated since v2.30. .IP "\fB\-o, \-\-output\-separator\fP \fIstring\fP" Specify the columns delimiter for table output (default is two spaces). .IP "\fB\-s, \-\-separator\fP \fIseparators\fP" 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> 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" - " 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 <string> possible table delimiters\n"), out); + fputs(_(" -o, --output-separator <string> columns separator for table output\n" + " (default is two spaces)\n"), out); + fputs(_(" -c, --output-width <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 }, }; |