Merge pull request #450 from philmayers/fix-colourise

correct the log/colourise logic
FreeRADIUS · Oct 14, 2013 · 8fc2475 · 8fc2475
2 parents 1cf82b4 + 37bded5
commit 8fc2475
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/src/include/radiusd.h b/src/include/radiusd.h
@@ -453,9 +453,6 @@ typedef struct main_config_t {
 	char const	*name;
 	char const	*auth_badpass_msg;
 	char const	*auth_goodpass_msg;
-	int		colourise;	//!< Messages output to stderr and
-					//!< stdout may be formatted using
-					//!< VT100 escape sequences.
 	int		debug_memory;
 } MAIN_CONFIG_T;
 

diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c
@@ -823,15 +823,11 @@ int read_mainconfig(int reload)
 	 *	We ignore colourization of output until after the
 	 *	configuration files have been parsed.
 	 */
-	if (do_colourise) {
-		p = getenv("TERM");
-		if (!p || !isatty(default_log.fd) ||
-		    (strstr(p, "xterm") == 0)) {
-			mainconfig.colourise = false;
-		} else {
-			mainconfig.colourise = true;
-		}
-		p = NULL;
+	p = getenv("TERM");
+	if (do_colourise && p && isatty(default_log.fd) && strstr(p, "xterm")) {
+		default_log.colourise = true;
+	} else {
+		default_log.colourise = false;
 	}
 
 	if (mainconfig.max_request_time == 0) mainconfig.max_request_time = 100;