summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKWSys Upstream <kwrobot@kitware.com>2021-05-06 15:48:52 (GMT)
committerBrad King <brad.king@kitware.com>2021-05-06 15:53:17 (GMT)
commit760bdfb26ee94569287991d12e988573ab260177 (patch)
treeca9c58cad6a36a496a14b27142898e890a319a23
parent04c6e736f65306f434d99e2f4d6c365a9cc5201b (diff)
downloadCMake-760bdfb26ee94569287991d12e988573ab260177.zip
CMake-760bdfb26ee94569287991d12e988573ab260177.tar.gz
CMake-760bdfb26ee94569287991d12e988573ab260177.tar.bz2
KWSys 2021-05-06 (2fa93cfc)
Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 2fa93cfca6291e8eaffa2a34d2d7908c93e64a6c (master). Upstream Shortlog ----------------- Brad King (1): 5c6539ca Terminal: Revert "Simplify CLICOLOR_FORCE check"
-rw-r--r--Terminal.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Terminal.c b/Terminal.c
index 57a68bf..20bb5fe 100644
--- a/Terminal.c
+++ b/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;
}
}