Fossil SCM
Fix a logic error in processing of the FOSSIL_COLOR environment variable.
Commit
6cb7a7e28dfd13afd904710111c29d105ff8f2168a2b76c27cf722543f95050d
Parent
5331dfed414a672…
1 file changed
+2
-3
+2
-3
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -689,13 +689,12 @@ | ||
| 689 | 689 | } |
| 690 | 690 | } |
| 691 | 691 | g.cliColor = "\033[91m"; |
| 692 | 692 | zEnvVar = fossil_getenv("FOSSIL_COLOR"); |
| 693 | 693 | if( zEnvVar ){ |
| 694 | - if( fossil_strcmp(zEnvVar,"none")==0 && | |
| 695 | - g.colorOutput==COLOR_VT_UNSET ){ | |
| 696 | - g.colorOutput = COLOR_VT_NEVER; | |
| 694 | + if( fossil_strcmp(zEnvVar,"none")==0 ){ | |
| 695 | + if( g.colorOutput==COLOR_VT_UNSET ) g.colorOutput = COLOR_VT_NEVER; | |
| 697 | 696 | }else{ |
| 698 | 697 | int i, fValid = 1; |
| 699 | 698 | /* Rudimentary sanity check: only allow digits and semicolon. */ |
| 700 | 699 | for( i=0; zEnvVar[i]; i++ ){ |
| 701 | 700 | if( !strchr("0123456789;",zEnvVar[i]) ) fValid = 0; |
| 702 | 701 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -689,13 +689,12 @@ | |
| 689 | } |
| 690 | } |
| 691 | g.cliColor = "\033[91m"; |
| 692 | zEnvVar = fossil_getenv("FOSSIL_COLOR"); |
| 693 | if( zEnvVar ){ |
| 694 | if( fossil_strcmp(zEnvVar,"none")==0 && |
| 695 | g.colorOutput==COLOR_VT_UNSET ){ |
| 696 | g.colorOutput = COLOR_VT_NEVER; |
| 697 | }else{ |
| 698 | int i, fValid = 1; |
| 699 | /* Rudimentary sanity check: only allow digits and semicolon. */ |
| 700 | for( i=0; zEnvVar[i]; i++ ){ |
| 701 | if( !strchr("0123456789;",zEnvVar[i]) ) fValid = 0; |
| 702 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -689,13 +689,12 @@ | |
| 689 | } |
| 690 | } |
| 691 | g.cliColor = "\033[91m"; |
| 692 | zEnvVar = fossil_getenv("FOSSIL_COLOR"); |
| 693 | if( zEnvVar ){ |
| 694 | if( fossil_strcmp(zEnvVar,"none")==0 ){ |
| 695 | if( g.colorOutput==COLOR_VT_UNSET ) g.colorOutput = COLOR_VT_NEVER; |
| 696 | }else{ |
| 697 | int i, fValid = 1; |
| 698 | /* Rudimentary sanity check: only allow digits and semicolon. */ |
| 699 | for( i=0; zEnvVar[i]; i++ ){ |
| 700 | if( !strchr("0123456789;",zEnvVar[i]) ) fValid = 0; |
| 701 |