Merge topic 'Terminal-clicolor'

f308fcfb Terminal: Disable color output when CLICOLOR is set to 0
bbf6cdef Terminal: Simplify CLICOLOR_FORCE check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !215

Terminal.c

@@ -167,12 +167,19 @@ static int kwsysTerminalStreamIsVT100(FILE* stream, int default_vt100,
   /* Force color according to http://bixense.com/clicolors/ convention.  */
   {
     const char* clicolor_force = getenv("CLICOLOR_FORCE");
-    if (clicolor_force && *clicolor_force &&
-        strcmp(clicolor_force, "0") != 0) {
+    if (clicolor_force && strcmp(clicolor_force, "0") != 0) {
       return 1;
     }
   }
 
+  /* Disable color according to http://bixense.com/clicolors/ convention. */
+  {
+    const char* clicolor = getenv("CLICOLOR");
+    if (clicolor && strcmp(clicolor, "0") == 0) {
+      return 0;
+    }
+  }
+
   /* GNU make 4.1+ may tell us that its output is destined for a TTY. */
   {
     const char* termout = getenv("MAKE_TERMOUT");