From: Karel Zak <kzak@redhat.com>
Date: Wed, 31 Aug 2016 10:05:21 +0000 (+0200)
Subject: libsmartcols: don't print title color is colors disabled
X-Git-Tag: v2.29-rc1~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7cda881d57867d46c6c53d1a9a725d0ed1343a1;p=thirdparty%2Futil-linux.git

libsmartcols: don't print title color is colors disabled

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c
index 4b250eb0f5..d51089b995 100644
--- a/libsmartcols/src/table_print.c
+++ b/libsmartcols/src/table_print.c
@@ -700,7 +700,7 @@ static int print_line(struct libscols_table *tb,
 
 static int print_title(struct libscols_table *tb)
 {
-	int rc;
+	int rc, color = 0;
 	mbs_align_t align;
 	size_t len = 0, width;
 	char *title = NULL, *buf = NULL;
@@ -754,13 +754,16 @@ static int print_title(struct libscols_table *tb)
 		goto done;
 	}
 
-	if (tb->title.color)
+	if (tb->colors_wanted && tb->title.color)
+		color = 1;
+	if (color)
 		fputs(tb->title.color, tb->out);
 
 	fputs(title, tb->out);
 
-	if (tb->title.color)
+	if (color)
 		fputs(UL_COLOR_RESET, tb->out);
+
 	fputc('\n', tb->out);
 	rc = 0;
 done: