rse 98/05/28 04:32:44
Modified: src/include httpd.h src/main util_script.c Log: Fix a few inconsistencies in using "CMD.EXE" vs. SHELL_PATH. SHELL_PATH is defined for Unix, OS\2 and Windows so we can use it also in util_script for all of them. Revision Changes Path 1.216 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- httpd.h 1998/05/27 14:01:31 1.215 +++ httpd.h 1998/05/28 11:32:43 1.216 @@ -231,10 +231,10 @@ #define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb:/usr/bsd:/usr/local/bin" #endif -/* The path to the Bourne shell, for parsed docs */ +/* The path to the shell interpreter, for parsed docs */ #ifndef SHELL_PATH #if defined(__EMX__) || defined(WIN32) -/* Set default for OS/2 file system */ +/* Set default for OS/2 and Windows file system */ #define SHELL_PATH "CMD.EXE" #else #define SHELL_PATH "/bin/sh" 1.113 +6 -6 apache-1.3/src/main/util_script.c Index: util_script.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/util_script.c,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- util_script.c 1998/05/25 17:58:17 1.112 +++ util_script.c 1998/05/28 11:32:44 1.113 @@ -670,7 +670,7 @@ else if (strstr(strupr(r->filename), ".CMD") > 0) { /* Special case to allow use of REXX commands as scripts. */ os2pathname(r->filename); - execl("CMD.EXE", "CMD.EXE", "/C", r->filename, NULL); + execl(SHELL_PATH, SHELL_PATH, "/C", r->filename, NULL); } else { execl(r->filename, argv0, NULL); @@ -690,7 +690,7 @@ if (strstr(strupr(r->filename), ".CMD") > 0) { /* Special case to allow use of REXX commands as scripts. */ os2pathname(r->filename); - execv("CMD.EXE", create_argv_cmd(r->pool, argv0, r->args, r->filename)); + execv(SHELL_PATH, create_argv_cmd(r->pool, argv0, r->args, r->filename)); } else execv(r->filename, @@ -802,7 +802,7 @@ /* If not an executable or script, just execute it * from a command prompt. */ - pCommand = ap_pstrcat(r->pool, "CMD.EXE", " /C ", + pCommand = ap_pstrcat(r->pool, SHELL_PATH, " /C ", r->filename, NULL); } } @@ -857,7 +857,7 @@ r->filename, " ", arguments, NULL); } else { - pCommand = ap_pstrcat(r->pool, "CMD.EXE", " /C ", + pCommand = ap_pstrcat(r->pool, SHELL_PATH, " /C ", r->filename, " ", arguments, NULL); } } @@ -881,7 +881,7 @@ r->filename, NULL, env); } else { - pid = spawnle(_P_NOWAIT, "CMD.EXE", "CMD.EXE", "/C", + pid = spawnle(_P_NOWAIT, SHELL_PATH, SHELL_PATH, "/C", r->filename, NULL, env); } } @@ -897,7 +897,7 @@ r->filename, r->args), env); } else { - pid = spawnve(_P_NOWAIT, "CMD.EXE", + pid = spawnve(_P_NOWAIT, SHELL_PATH, create_argv_cmd(r->pool, argv0, r->args, r->filename), env); }