summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYousong Zhou2019-07-29 03:24:29 +0200
committerKarel Zak2019-07-29 10:33:58 +0200
commit325bfd53e889fd52f240e4bcbd690b03dddc7570 (patch)
tree743b7c742d84669da2758fef45350a8da7ee8d71
parentlscpu: (man) add note about cache sizes (diff)
downloadkernel-qcow2-util-linux-325bfd53e889fd52f240e4bcbd690b03dddc7570.tar.gz
kernel-qcow2-util-linux-325bfd53e889fd52f240e4bcbd690b03dddc7570.tar.xz
kernel-qcow2-util-linux-325bfd53e889fd52f240e4bcbd690b03dddc7570.zip
column: fix outputing empty column at the end of line
The following commands manifests the problem. In old versions before commit 4762ae9d60 ("column: use libsmartcols for --table"), both of them should output with 2 "|" echo '||' | column -o '|' -s '|' -t echo '|| ' | column -o '|' -s '|' -t Fixes: 4762ae9d60 ("column: use libsmartcols for --table") Signed-off-by: Yousong Zhou <zhouyousong@yunionyun.com> Reviewed-by: Sami Kerola <kerolasa@iki.fi>
-rw-r--r--tests/expected/column/table-empty-column-at-eol1
-rw-r--r--tests/expected/column/table-empty-column-at-eol21
-rwxr-xr-xtests/ts/column/table8
-rw-r--r--text-utils/column.c2
4 files changed, 11 insertions, 1 deletions
diff --git a/tests/expected/column/table-empty-column-at-eol b/tests/expected/column/table-empty-column-at-eol
new file mode 100644
index 000000000..948cf947f
--- /dev/null
+++ b/tests/expected/column/table-empty-column-at-eol
@@ -0,0 +1 @@
+|
diff --git a/tests/expected/column/table-empty-column-at-eol2 b/tests/expected/column/table-empty-column-at-eol2
new file mode 100644
index 000000000..7c4378506
--- /dev/null
+++ b/tests/expected/column/table-empty-column-at-eol2
@@ -0,0 +1 @@
+||
diff --git a/tests/ts/column/table b/tests/ts/column/table
index bd1f16f3f..e64dee746 100755
--- a/tests/ts/column/table
+++ b/tests/ts/column/table
@@ -116,4 +116,12 @@ ts_init_subtest "empty-column"
printf ':a:b\n' | $TS_CMD_COLUMN --table --separator ':' --output-separator ':' >> $TS_OUTPUT 2>&1
ts_finalize_subtest
+ts_init_subtest "empty-column-at-eol"
+printf '|' | $TS_CMD_COLUMN --separator '|' --output-separator '|' --table >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
+
+ts_init_subtest "empty-column-at-eol2"
+printf '||' | $TS_CMD_COLUMN --separator '|' --output-separator '|' --table >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
+
ts_finalize
diff --git a/text-utils/column.c b/text-utils/column.c
index 13b39537e..9d56e514c 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -169,7 +169,7 @@ static wchar_t *local_wcstok(wchar_t *p, const wchar_t *separator, int greedy, w
return strtok_r(p, separator, state);
#endif
if (!p) {
- if (!*state || !**state)
+ if (!*state)
return NULL;
p = *state;
}