diff options
| -rw-r--r-- | winsup/cygwin/path.h | 1 | ||||
| -rw-r--r-- | winsup/cygwin/spawn.cc | 27 | ||||
| -rw-r--r-- | winsup/cygwin/syscalls.cc | 6 |
3 files changed, 30 insertions, 4 deletions
diff --git a/winsup/cygwin/path.h b/winsup/cygwin/path.h index fe4dd5478..5c60ee116 100644 --- a/winsup/cygwin/path.h +++ b/winsup/cygwin/path.h @@ -461,3 +461,4 @@ int normalize_posix_path (const char *, char *, char *&); PUNICODE_STRING __reg3 get_nt_native_path (const char *, UNICODE_STRING&, bool); int __reg3 symlink_worker (const char *, path_conv &, bool); +const char *get_cmd_exe_path(); diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index f7b1469c6..18c80020e 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -13,7 +13,9 @@ details. */ #include <sys/wait.h> #include <wchar.h> #include <ctype.h> +#include <stdio.h> #include <sys/cygwin.h> +#include <pthread.h> #include "cygerrno.h" #include "security.h" #include "sigproc.h" @@ -1413,7 +1415,7 @@ av::setup (const char *prog_arg, path_conv& real_path, const char *ext, } if (ascii_strcasematch (ext, ".com")) break; - if ((pgm = getenv("COMSPEC")) == NULL) { + if ((pgm = const_cast<char *>(get_cmd_exe_path())) == NULL) { set_errno (EOPNOTSUPP); return -1; } @@ -1542,3 +1544,26 @@ __posix_spawn_execvpe (const char *path, char * const *argv, char *const *envp, __posix_spawn_sem_release (sem, errno); return -1; } + +static const char *cmd_exe_path = NULL; + +static void init_cmd_exe_path(void) +{ + char sysdir[NT_MAX_PATH]; + char cmdname[] = "cmd.exe"; + unsigned int nchars; + + if ((nchars = GetSystemDirectoryA(sysdir, sizeof sysdir)) < sizeof sysdir) { + unsigned int total = nchars + 1 + sizeof cmdname + 1; + char *path = static_cast<char *>(cmalloc_abort(HEAP_STR, total)); + snprintf(path, total, "%s\\%s", sysdir, cmdname); + cmd_exe_path = path; + } +} + +const char *get_cmd_exe_path() +{ + static pthread_once_t cmd_exe_once = PTHREAD_ONCE_INIT; + pthread_once (&cmd_exe_once, init_cmd_exe_path); + return cmd_exe_path; +} diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index db81e3265..5d554b69c 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -2864,7 +2864,7 @@ system (const char *cmdstring) int res = -1; const char* command[4]; - const char *cmdexe = getenv("COMSPEC"); + const char *cmdexe = get_cmd_exe_path(); if (cmdexe == NULL) return res; @@ -4422,7 +4422,7 @@ extern "C" char * getusershell () { if (shell_index == 0) { - char *cmdexe = getenv("COMSPEC"); + char *cmdexe = const_cast<char *>(get_cmd_exe_path()); if (cmdexe != NULL) { shell_index = 1; return cmdexe; @@ -4467,7 +4467,7 @@ popen (const char *command, const char *in_type) const char *type = in_type; char fdopen_flags[3] = "\0\0"; int pipe_flags = 0; - const char *cmdexe = getenv("COMSPEC"); + const char *cmdexe = get_cmd_exe_path(); #define rw fdopen_flags[0] #define bintext fdopen_flags[1] |