]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libsmartcols: don't print title color is colors disabled
authorKarel Zak <kzak@redhat.com>
Wed, 31 Aug 2016 10:05:21 +0000 (12:05 +0200)
committerKarel Zak <kzak@redhat.com>
Wed, 31 Aug 2016 10:05:21 +0000 (12:05 +0200)
Signed-off-by: Karel Zak <kzak@redhat.com>
libsmartcols/src/table_print.c

index 4b250eb0f5ae3467d856eddb2c958d820857d73b..d51089b995d012dfaf1cb0c1115134a991143078 100644 (file)
@@ -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: