diff options
| author | Karel Zak <kzak@redhat.com> | 2025-12-04 18:41:44 +0100 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2025-12-04 18:41:44 +0100 |
| commit | b650e692702bda91d2b6ff4a27329f2ea087274f (patch) | |
| tree | 3b0664e159ea589361b20938b69430f4f1534c13 /text-utils | |
| parent | 5756e7ba8aba220177099188c3d120e111199fa9 (diff) | |
| parent | bc577050f952b3ea0603c6ca8a4354950b330402 (diff) | |
| download | util-linux-master.tar.gz | |
Merge branch 'PR/column-input-separator-alias' of https://github.com/karelzak/util-linux-workHEADmaster
* 'PR/column-input-separator-alias' of https://github.com/karelzak/util-linux-work:
column: add --input-separator as an alias for --separator
Diffstat (limited to 'text-utils')
| -rw-r--r-- | text-utils/column.1.adoc | 2 | ||||
| -rw-r--r-- | text-utils/column.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/text-utils/column.1.adoc b/text-utils/column.1.adoc index 69f2f794ff..e1e5a1c6f4 100644 --- a/text-utils/column.1.adoc +++ b/text-utils/column.1.adoc @@ -99,7 +99,7 @@ Omit printing the header. This option allows having user-supplied column names o *-o, --output-separator* _string_:: Column delimiter for table output (default is two spaces). -*-s, --separator* _separators_:: +*-s, --input-separator, --separator* _separators_:: Possible input-item delimiters (default is whitespace). *-S, --use-spaces* _number_:: diff --git a/text-utils/column.c b/text-utils/column.c index 7a37cb886c..5a9e9a03b6 100644 --- a/text-utils/column.c +++ b/text-utils/column.c @@ -1021,7 +1021,8 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -c, --output-width <width> width of output in number of characters\n"), out); fputs(_(" -o, --output-separator <string> columns separator for table output\n" " (default is two spaces)\n"), out); - fputs(_(" -s, --separator <string> possible table delimiters\n"), out); + fputs(_(" -s, --input-separator, --separator <string>\n" + " possible table delimiters\n"), out); fputs(_(" -x, --fillrows fill rows before columns\n"), out); fputs(_(" -S, --use-spaces <number> minimal whitespaces between columns (no tabs)\n"), out); @@ -1059,6 +1060,7 @@ int main(int argc, char **argv) { "color", optional_argument, NULL, OPT_COLOR }, { "fillrows", no_argument, NULL, 'x' }, { "help", no_argument, NULL, 'h' }, + { "input-separator", required_argument, NULL, 's' }, /* alias for --separator */ { "json", no_argument, NULL, 'J' }, { "keep-empty-lines", no_argument, NULL, 'L' }, { "output-separator", required_argument, NULL, 'o' }, |