libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* 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.
This commit is contained in:
Corinna Vinschen 2006-01-31 21:09:43 +00:00
parent d968b3c86f
commit 0ad7b0eb02
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
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> 2006-01-31 Corinna Vinschen <corinna@vinschen.de>
* path.cc (cwdstuff::set): Don't set win32 error, only POSIX errno. * path.cc (cwdstuff::set): Don't set win32 error, only POSIX errno.

2
winsup/cygwin/path.cc
View File

@ -3118,7 +3118,7 @@ suffix_scan::next ()
} }
while (suffixes && suffixes->name) while (suffixes && suffixes->name)
if (!suffixes->addon) if (nextstate == SCAN_EXTRALNK && !suffixes->addon)
suffixes++; suffixes++;
else else
{ {

29
winsup/cygwin/spawn.cc
View File

@ -162,6 +162,11 @@ find_exec (const char *name, path_conv& buf, const char *mywinenv,
if ((suffix = perhaps_suffix (tmp, buf, err)) != NULL) 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) if (posix == tmp)
{ {
eotmp = strccpy (tmp, &posix_path, ':'); 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; return 0;
while (1) while (1)
{ {
char *pgm = NULL;
char *arg1 = NULL;
HANDLE h = CreateFile (real_path, GENERIC_READ, HANDLE h = CreateFile (real_path, GENERIC_READ,
FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
&sec_none_nih, OPEN_EXISTING, &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); HANDLE hm = CreateFileMapping (h, &sec_none_nih, PAGE_READONLY, 0, 0, NULL);
CloseHandle (h); CloseHandle (h);
if (!hm) 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); char *buf = (char *) MapViewOfFile(hm, FILE_MAP_READ, 0, 0, 0);
CloseHandle (hm); CloseHandle (hm);
if (!buf) 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); 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; char *ptr = buf;
if (*ptr++ == '#' && *ptr++ == '!') if (*ptr++ == '#' && *ptr++ == '!')
{ {
@ -1131,6 +1137,7 @@ av::fixup (child_info_types chtype, const char *prog_arg, path_conv& real_path,
} }
} }
UnmapViewOfFile (buf); UnmapViewOfFile (buf);
just_shell:
if (!pgm) if (!pgm)
{ {
if (strcasematch (ext, ".com")) if (strcasematch (ext, ".com"))