ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Karel Zak 2017-01-17 13:11:27 +01:00
parent 78acfddd1d
commit d7a3bf949b
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/deprecated.txt
View File

@ -2,6 +2,11 @@ The following is a list of commands or features that are deprecated. All
deprecated utils are in maintenance mode and we keep them in source tree for
backward compatibility only.
what: column --columns
why: renamed to --output-width
since: v2.30
--------------------------
what: tailf
why: "tail -f" is better nowadays, tailf has unfixed bugs

7
text-utils/column.1
View File

@ -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"

25
text-utils/column.c
View File

@ -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[] =
{
{ "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' },
{ "columns", 1, 0, 'c' }, /* deprecated */
{ "fillrows", 0, 0, 'x' },
{ "help", 0, 0, 'h' },
{ "output-separator", 1, 0, 'o' },
{ "output-width", 1, 0, 'c' },
{ "separator", 1, 0, 's' },
{ "table", 0, 0, 't' },
{ "version", 0, 0, 'V' },
{ NULL, 0, 0, 0 },
};