From: Karel Zak <kzak@redhat.com>
Date: Mon, 12 Sep 2016 14:12:22 +0000 (+0200)
Subject: libsmartcols: fix WRAPNL on strings without \n
X-Git-Tag: v2.29-rc1~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef4a34bbb82804dd454a2b443d6a7b73dafedec0;p=thirdparty%2Futil-linux.git

libsmartcols: fix WRAPNL on strings without \n

Addresses: https://github.com/karelzak/util-linux/issues/343
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c
index 7355fe8e1f..7d5fe0ffa7 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;;
 	}