From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 30 May 2016 16:23:08 +0000 (+0200)
Subject: tree-wide: check colors_enabled() before outputting ANSI color strings
X-Git-Tag: v231.3~116
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=691dee8e292746379d4d39175ea80d5ed6528922

tree-wide: check colors_enabled() before outputting ANSI color strings
---

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 8f46c9267..fa4f60826 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -156,14 +156,14 @@ int ask_char(char *ret, const char *replies, const char *text, ...) {
                 char c;
                 bool need_nl = true;
 
-                if (on_tty())
+                if (colors_enabled())
                         fputs(ANSI_HIGHLIGHT, stdout);
 
                 va_start(ap, text);
                 vprintf(text, ap);
                 va_end(ap);
 
-                if (on_tty())
+                if (colors_enabled())
                         fputs(ANSI_NORMAL, stdout);
 
                 fflush(stdout);
@@ -200,14 +200,14 @@ int ask_string(char **ret, const char *text, ...) {
                 char line[LINE_MAX];
                 va_list ap;
 
-                if (on_tty())
+                if (colors_enabled())
                         fputs(ANSI_HIGHLIGHT, stdout);
 
                 va_start(ap, text);
                 vprintf(text, ap);
                 va_end(ap);
 
-                if (on_tty())
+                if (colors_enabled())
                         fputs(ANSI_NORMAL, stdout);
 
                 fflush(stdout);