From: Franck Bui <fbui@suse.com>
Date: Fri, 10 Jun 2016 16:33:15 +0000 (+0200)
Subject: core: disable colors when displaying cylon when systemd.log_color=off (#3495)
X-Git-Tag: v231~184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64c3610b55799c738e4fdc7236fadd635649c0f4;p=thirdparty%2Fsystemd.git

core: disable colors when displaying cylon when systemd.log_color=off (#3495)
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 14d97a87d07..ec8acdff5bc 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -136,23 +136,28 @@ static void draw_cylon(char buffer[], size_t buflen, unsigned width, unsigned po
         if (pos > 1) {
                 if (pos > 2)
                         p = mempset(p, ' ', pos-2);
-                p = stpcpy(p, ANSI_RED);
+                if (log_get_show_color())
+                        p = stpcpy(p, ANSI_RED);
                 *p++ = '*';
         }
 
         if (pos > 0 && pos <= width) {
-                p = stpcpy(p, ANSI_HIGHLIGHT_RED);
+                if (log_get_show_color())
+                        p = stpcpy(p, ANSI_HIGHLIGHT_RED);
                 *p++ = '*';
         }
 
-        p = stpcpy(p, ANSI_NORMAL);
+        if (log_get_show_color())
+                p = stpcpy(p, ANSI_NORMAL);
 
         if (pos < width) {
-                p = stpcpy(p, ANSI_RED);
+                if (log_get_show_color())
+                        p = stpcpy(p, ANSI_RED);
                 *p++ = '*';
                 if (pos < width-1)
                         p = mempset(p, ' ', width-1-pos);
-                strcpy(p, ANSI_NORMAL);
+                if (log_get_show_color())
+                        strcpy(p, ANSI_NORMAL);
         }
 }