diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2006-02-01 00:09:43 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2006-02-01 00:09:43 +0300 |
| commit | 0ad7b0eb028c6505192eed19595cdaba38ab2886 (patch) | |
| tree | 9de0a9861bb1429b3e707e163ffdade0479aa9a1 /winsup/cygwin | |
| parent | d968b3c86fc59507e3604ebc704aeb111f301a12 (diff) | |
* spawn.cc (find_exec): Only return files with execute permission set
if ntsec is on. Don't check execute permission of Windows batch files.
(av::fixup): Handle empty files gracefully. Drop execute permission
test here.
* path.cc (suffix_scan::next): Don't skip any suffix on first run.
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/cygwin/path.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/spawn.cc | 29 |
3 files changed, 27 insertions, 12 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 0c467fded..2d00e1eb6 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,13 @@ 2006-01-31 Corinna Vinschen <corinna@vinschen.de> + * spawn.cc (find_exec): Only return files with execute permission set + if ntsec is on. Don't check execute permission of Windows batch files. + (av::fixup): Handle empty files gracefully. Drop execute permission + test here. + * path.cc (suffix_scan::next): Don't skip any suffix on first run. + +2006-01-31 Corinna Vinschen <corinna@vinschen.de> + * path.cc (cwdstuff::set): Don't set win32 error, only POSIX errno. 2006-01-31 Corinna Vinschen <corinna@vinschen.de> diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index f23debb8a..091b4ace2 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -3118,7 +3118,7 @@ suffix_scan::next () } while (suffixes && suffixes->name) - if (!suffixes->addon) + if (nextstate == SCAN_EXTRALNK && !suffixes->addon) suffixes++; else { diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 8edbf55eb..7bc1b6942 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -162,6 +162,11 @@ find_exec (const char *name, path_conv& buf, const char *mywinenv, if ((suffix = perhaps_suffix (tmp, buf, err)) != NULL) { + if (buf.has_acls () && allow_ntsec + && (*suffix == '\0' || strcmp (suffix, ".exe")) + && check_file_access (buf, X_OK)) + continue; + if (posix == tmp) { eotmp = strccpy (tmp, &posix_path, ':'); @@ -1052,6 +1057,9 @@ av::fixup (child_info_types chtype, const char *prog_arg, path_conv& real_path, return 0; while (1) { + char *pgm = NULL; + char *arg1 = NULL; + HANDLE h = CreateFile (real_path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, &sec_none_nih, OPEN_EXISTING, @@ -1062,7 +1070,15 @@ av::fixup (child_info_types chtype, const char *prog_arg, path_conv& real_path, HANDLE hm = CreateFileMapping (h, &sec_none_nih, PAGE_READONLY, 0, 0, NULL); CloseHandle (h); if (!hm) - goto err; + { + /* ERROR_FILE_INVALID indicates very likely an empty file. */ + if (GetLastError () == ERROR_FILE_INVALID) + { + debug_printf ("zero length file, treat as script."); + goto just_shell; + } + goto err; + } char *buf = (char *) MapViewOfFile(hm, FILE_MAP_READ, 0, 0, 0); CloseHandle (hm); if (!buf) @@ -1093,16 +1109,6 @@ av::fixup (child_info_types chtype, const char *prog_arg, path_conv& real_path, debug_printf ("%s is possibly a script", (char *) real_path); - if (real_path.has_acls () && allow_ntsec - && check_file_access (real_path, X_OK)) - { - UnmapViewOfFile (buf); - debug_printf ("... but not executable"); - break; - } - - char *pgm = NULL; - char *arg1 = NULL; char *ptr = buf; if (*ptr++ == '#' && *ptr++ == '!') { @@ -1131,6 +1137,7 @@ av::fixup (child_info_types chtype, const char *prog_arg, path_conv& real_path, } } UnmapViewOfFile (buf); +just_shell: if (!pgm) { if (strcasematch (ext, ".com")) |