From: Karel Zak <kzak@redhat.com>
Date: Fri, 3 Jun 2016 10:20:24 +0000 (+0200)
Subject: cfdisk: use libsmartcols ASCII for non-widechar environment
X-Git-Tag: v2.29-rc1~204
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9907a95a7dafd01dd85a44abf8405096a76ae4e5;p=thirdparty%2Futil-linux.git

cfdisk: use libsmartcols ASCII for non-widechar environment

Reported-by: Stanislav Brabec <sbrabec@suse.cz>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index acea6d8ff1..c0a4c72a29 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -352,6 +352,10 @@ static char *table_to_string(struct cfdisk *cf, struct fdisk_table *tb)
 	scols_table_enable_maxout(table, 1);
 	scols_table_enable_nowrap(table, 1);
 
+#if !defined(HAVE_LIBNCURSESW) || !defined(HAVE_WIDECHAR)
+	scols_table_enable_ascii(table, 1);
+#endif
+
 	/* headers */
 	for (i = 0; i < cf->nfields; i++) {
 		int fl = 0;