From: Yousong Zhou <yszhou4tech@gmail.com>
To: kzak@redhat.com
Cc: util-linux@vger.kernel.org, Yousong Zhou <zhouyousong@yunionyun.com>
Subject: [PATCH] column: fix outputing empty column at the end of line
Date: Thu, 27 Jun 2019 09:22:35 +0000 [thread overview]
Message-ID: <20190627092235.36888-1-zhouyousong@yunionyun.com> (raw)
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>
---
tests/expected/column/table-empty-column-at-eol | 1 +
tests/expected/column/table-empty-column-at-eol2 | 1 +
tests/ts/column/table | 8 ++++++++
text-utils/column.c | 15 ++++++++++-----
4 files changed, 20 insertions(+), 5 deletions(-)
create mode 100644 tests/expected/column/table-empty-column-at-eol
create mode 100644 tests/expected/column/table-empty-column-at-eol2
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..64f1cf7e9 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -169,8 +169,9 @@ 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;
}
result = p;
@@ -435,7 +436,7 @@ static int add_line_to_table(struct column_control *ctl, wchar_t *wcs)
if (!ctl->tab)
init_table(ctl);
- while ((wcdata = local_wcstok(wcs, ctl->input_separator, ctl->greedy, &sv))) {
+ while ((wcdata = local_wcstok(wcs, ctl->input_separator, ctl->greedy, &sv)) || sv) {
char *data;
if (scols_table_get_ncols(ctl->tab) < n + 1) {
@@ -452,9 +453,13 @@ static int add_line_to_table(struct column_control *ctl, wchar_t *wcs)
err(EXIT_FAILURE, _("failed to allocate output line"));
}
- data = wcs_to_mbs(wcdata);
- if (!data)
- err(EXIT_FAILURE, _("failed to allocate output data"));
+ if (wcdata) {
+ data = wcs_to_mbs(wcdata);
+ if (!data)
+ err(EXIT_FAILURE, _("failed to allocate output data"));
+ } else {
+ data = NULL;
+ }
if (scols_line_refer_data(ln, n, data))
err(EXIT_FAILURE, _("failed to add output data"));
n++;
next reply other threads:[~2019-06-27 9:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-27 9:22 Yousong Zhou [this message]
2019-07-13 5:30 ` [PATCH] column: fix outputing empty column at the end of line Yousong Zhou
2019-07-15 8:00 ` Karel Zak
2019-07-27 8:43 ` Yousong Zhou
2019-07-27 18:49 ` Sami Kerola
2019-07-29 1:34 ` Yousong Zhou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190627092235.36888-1-zhouyousong@yunionyun.com \
--to=yszhou4tech@gmail.com \
--cc=kzak@redhat.com \
--cc=util-linux@vger.kernel.org \
--cc=zhouyousong@yunionyun.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).