From ef4a34bbb82804dd454a2b443d6a7b73dafedec0 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 12 Sep 2016 16:12:22 +0200 Subject: libsmartcols: fix WRAPNL on strings without \n Addresses: https://github.com/karelzak/util-linux/issues/343 Signed-off-by: Karel Zak --- libsmartcols/src/table_print.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libsmartcols/src/table_print.c') diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c index 7355fe8e1..7d5fe0ffa 100644 --- a/libsmartcols/src/table_print.c +++ b/libsmartcols/src/table_print.c @@ -993,14 +993,16 @@ static size_t count_wrapnl_size(const char *data) while (data && *data) { const char *p = data; + size_t sz; p = strchr(data, '\n'); if (p) { - size_t sz = mbs_safe_nwidth(data, p - data, NULL); - - sum = max(sum, sz); + sz = mbs_safe_nwidth(data, p - data, NULL); p++; - } + } else + sz = mbs_safe_width(data); + + sum = max(sum, sz); data = p;; } -- cgit v1.2.3-55-g7522