diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-06-22 15:40:59 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-06-22 15:40:59 +0000 |
| commit | d6bb3f330dfc6c522531f1e227184feb31425a77 (patch) | |
| tree | e1bbfb0c46df97738572ef0b50b0933383d9b51f /winsup/cygwin/spawn.cc | |
| parent | e20afc07b08dc461fcaf71caa4cd1eda99af44bc (diff) | |
| download | cygnal-d6bb3f330dfc6c522531f1e227184feb31425a77.tar.gz cygnal-d6bb3f330dfc6c522531f1e227184feb31425a77.tar.bz2 cygnal-d6bb3f330dfc6c522531f1e227184feb31425a77.zip | |
* spawn.cc (spawn_guts): Don't run additional check for Win32
incompatible CWD if newargv.fixup bailed out already.
(av::fixup): Check shell scripts for executability.
Diffstat (limited to 'winsup/cygwin/spawn.cc')
| -rw-r--r-- | winsup/cygwin/spawn.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index a95727880..be3c66a6a 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -357,6 +357,9 @@ spawn_guts (const char *prog_arg, const char *const *argv, wascygexec = real_path.iscygexec (); res = newargv.fixup (prog_arg, real_path, ext); + if (res) + goto out; + if (!real_path.iscygexec () && (cygheap->cwd.drive_length == 0 || cygheap->cwd.win32.Length >= MAX_PATH * sizeof (WCHAR))) @@ -372,9 +375,6 @@ spawn_guts (const char *prog_arg, const char *const *argv, goto out; } - if (res) - goto out; - if (ac == 3 && argv[1][0] == '/' && argv[1][1] == 'c' && (iscmd (argv[0], "command.com") || iscmd (argv[0], "cmd.exe"))) { @@ -1078,6 +1078,11 @@ just_shell: arg1 = NULL; } + /* Check if script is executable. Otherwise we start non-executable + scripts successfully, which is incorrect behaviour. */ + if (check_file_access (real_path, X_OK) < 0) + return -1; /* errno is already set. */ + /* Replace argv[0] with the full path to the script if this is the first time through the loop. */ replace0_maybe (prog_arg); |