From 81f55ab9043cfa26851a9dbeb356e5dc7f791a45 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 25 Feb 2015 10:06:40 +0100 Subject: build-sys: add --disable-colors-default The current util-linux is to have enabled colorized outputs by default, this default behavior is possible to change by new configure option --disable-colors-default. Signed-off-by: Karel Zak --- lib/colors.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'lib/colors.c') diff --git a/lib/colors.c b/lib/colors.c index 6f79ac4a8..2e5af48d9 100644 --- a/lib/colors.c +++ b/lib/colors.c @@ -18,6 +18,15 @@ #include "debug.h" +/* + * Default behavior, maybe be override by terminal-colors.d/{enable,disable}. + */ +#ifdef USE_COLORS_BY_DEFAULT +# define UL_COLORMODE_DEFAULT UL_COLORMODE_AUTO /* check isatty() */ +#else +# define UL_COLORMODE_DEFAULT UL_COLORMODE_NEVER /* no colors by default */ +#endif + /* * terminal-colors.d debug stuff */ @@ -678,7 +687,7 @@ int colors_init(int mode, const char *name) if (mode == UL_COLORMODE_UNDEF && (atty = isatty(STDOUT_FILENO))) { int rc = colors_read_configuration(cc); if (rc) - cc->mode = UL_COLORMODE_AUTO; + cc->mode = UL_COLORMODE_DEFAULT; else { /* evaluate scores */ @@ -686,7 +695,7 @@ int colors_init(int mode, const char *name) cc->scores[UL_COLORFILE_ENABLE]) cc->mode = UL_COLORMODE_NEVER; else - cc->mode = UL_COLORMODE_AUTO; + cc->mode = UL_COLORMODE_DEFAULT; atexit(colors_deinit); } -- cgit v1.2.3-55-g7522