From: Karel Zak <kzak@redhat.com>
Date: Wed, 12 Mar 2014 08:27:10 +0000 (+0100)
Subject: lib/colors: care about colors only on tty()
X-Git-Tag: v2.25-rc1~437
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1a54286677e8fe0d44337e3acfacc3585c78a6e;p=thirdparty%2Futil-linux.git

lib/colors: care about colors only on tty()

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

diff --git a/lib/colors.c b/lib/colors.c
index 03ac7118f3..8b6f089e1a 100644
--- a/lib/colors.c
+++ b/lib/colors.c
@@ -16,7 +16,9 @@ static int ul_color_term_ok;
 
 int colors_init(int mode, const char *name)
 {
-	if (mode == UL_COLORMODE_UNDEF)	{
+	int atty = -1;
+
+	if (mode == UL_COLORMODE_UNDEF && (atty = isatty(STDOUT_FILENO))) {
 		char path[PATH_MAX];
 
 		snprintf(path, sizeof(path), "%s%s%s",
@@ -38,7 +40,7 @@ int colors_init(int mode, const char *name)
 
 	switch (mode) {
 	case UL_COLORMODE_AUTO:
-		ul_color_term_ok = isatty(STDOUT_FILENO);
+		ul_color_term_ok = atty == -1 ? isatty(STDOUT_FILENO) : atty;
 		break;
 	case UL_COLORMODE_ALWAYS:
 		ul_color_term_ok = 1;