Merge topic 'Terminal-clicolor-force'

5c6539ca Terminal: Revert "Simplify CLICOLOR_FORCE check"

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

Terminal.c

@@ -167,7 +167,8 @@ 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 && strcmp(clicolor_force, "0") != 0) {
+    if (clicolor_force && *clicolor_force &&
+        strcmp(clicolor_force, "0") != 0) {
       return 1;
     }
   }