/[make]/make/main.c
ViewVC logotype

Diff of /make/main.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.189 by psmith, Tue Sep 21 12:07:12 2004 UTC revision 1.190 by psmith, Sun Nov 28 16:58:51 2004 UTC
# Line 718  find_and_set_default_shell (char *token) Line 718  find_and_set_default_shell (char *token)
718    if (((tokend == search_token    if (((tokend == search_token
719          || (tokend > search_token          || (tokend > search_token
720              && (tokend[-1] == '/' || tokend[-1] == '\\')))              && (tokend[-1] == '/' || tokend[-1] == '\\')))
721         && strcmpi (tokend, "cmd"))         && !strcmpi (tokend, "cmd"))
722        || ((tokend - 4 == search_token        || ((tokend - 4 == search_token
723             || (tokend - 4 > search_token             || (tokend - 4 > search_token
724                 && (tokend[-5] == '/' || tokend[-5] == '\\')))                 && (tokend[-5] == '/' || tokend[-5] == '\\')))
725            && strcmpi (tokend - 4, "cmd.exe"))) {            && !strcmpi (tokend - 4, "cmd.exe"))) {
726      batch_mode_shell = 1;      batch_mode_shell = 1;
727      unixy_shell = 0;      unixy_shell = 0;
728      sh_found = 0;      sh_found = 0;
# Line 1071  main (int argc, char **argv, char **envp Line 1071  main (int argc, char **argv, char **envp
1071             We used to rely on target_environment's v_default code to do this.             We used to rely on target_environment's v_default code to do this.
1072             But that does not work for the case where an environment variable             But that does not work for the case where an environment variable
1073             is redefined in a makefile with `override'; it should then still             is redefined in a makefile with `override'; it should then still
1074             be exported, because it was originally in the environment.  */             be exported, because it was originally in the environment.
1075          ->export = v_export;             Another wrinkle is that POSIX says the value of SHELL set in the
1076               makefile should not change the value of SHELL given to
1077               subprocesses, which seems silly to me but...  */
1078            ->export = strncmp(envp[i], "SHELL=", 6) ? v_noexport : v_export;
1079      }      }
1080  #ifdef WINDOWS32  #ifdef WINDOWS32
1081      /*      /*

Legend:
Removed from v.1.189  
changed lines
  Added in v.1.190

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26