Differences From Artifact [e8907f14c0]:

• File src/main.c — part of check-in [50e0931bc7] at 2025-04-18 07:19:00 on branch standard-cli-colors — Add support for the FOSSIL_COLOR environment variable to define the color VT escape to highlight CLI text, also similar to `ls', `grep' and other utilities. (user: florian size: 139041)

To Artifact [3f281dad88]:

• File src/main.c — part of check-in [6cb7a7e28d] at 2025-04-19 04:20:00 on branch standard-cli-colors — Fix a logic error in processing of the FOSSIL_COLOR environment variable. (user: florian size: 139036)

687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703

      }
      fossil_path_free(zEnvVar);
    }
  }
  g.cliColor = "\033[91m";
  zEnvVar = fossil_getenv("FOSSIL_COLOR");
  if( zEnvVar ){
    if( fossil_strcmp(zEnvVar,"none")==0 &&
        g.colorOutput==COLOR_VT_UNSET ){
      g.colorOutput = COLOR_VT_NEVER;
    }else{
      int i, fValid = 1;
      /* Rudimentary sanity check: only allow digits and semicolon. */
      for( i=0; zEnvVar[i]; i++ ){
        if( !strchr("0123456789;",zEnvVar[i]) ) fValid = 0;
      }
      if( fValid ) g.cliColor = mprintf("\033[%sm",zEnvVar);

|
|
<

687
688
689
690
691
692
693
694
695

696
697
698
699
700
701
702

      }
      fossil_path_free(zEnvVar);
    }
  }
  g.cliColor = "\033[91m";
  zEnvVar = fossil_getenv("FOSSIL_COLOR");
  if( zEnvVar ){
    if( fossil_strcmp(zEnvVar,"none")==0 ){
      if( g.colorOutput==COLOR_VT_UNSET ) g.colorOutput = COLOR_VT_NEVER;

    }else{
      int i, fValid = 1;
      /* Rudimentary sanity check: only allow digits and semicolon. */
      for( i=0; zEnvVar[i]; i++ ){
        if( !strchr("0123456789;",zEnvVar[i]) ) fValid = 0;
      }
      if( fValid ) g.cliColor = mprintf("\033[%sm",zEnvVar);