JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Always consider

Browse Source 
.exe files and '#!' shell scripts to be executable.
This commit is contained in:
Christopher Faylor 2002-10-22 20:41:31 +00:00
parent d525130f04
commit 7dcbb978e0
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2002-10-22 Christopher Faylor <cgf@redhat.com>
* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Always
consider .exe files and '#!' shell scripts to be executable.
2002-10-22 Christopher Faylor <cgf@redhat.com> 2002-10-22 Christopher Faylor <cgf@redhat.com>
* cygthread.cc (cygthread::exiting): New variable. * cygthread.cc (cygthread::exiting): New variable.

19
winsup/cygwin/fhandler_disk_file.cc
View File

@ -300,7 +300,14 @@ fhandler_disk_file::fstat_helper (struct __stat64 *buf, path_conv *pc,
else else
{ {
buf->st_mode |= S_IFREG; buf->st_mode |= S_IFREG;
if (pc->exec_state () == dont_know_if_executable) }
}
if (buf->st_mode & STD_XBITS)
/* already derived */;
else if (pc->exec_state () == is_executable)
buf->st_mode |= STD_XBITS;
else if (pc->exec_state () == dont_know_if_executable)
{ {
DWORD cur, done; DWORD cur, done;
char magic[3]; char magic[3];
@ -308,9 +315,8 @@ fhandler_disk_file::fstat_helper (struct __stat64 *buf, path_conv *pc,
/* First retrieve current position, set to beginning /* First retrieve current position, set to beginning
of file if not already there. */ of file if not already there. */
cur = SetFilePointer (get_handle (), 0, NULL, FILE_CURRENT); cur = SetFilePointer (get_handle (), 0, NULL, FILE_CURRENT);
if (cur != INVALID_SET_FILE_POINTER && if (cur != INVALID_SET_FILE_POINTER
(!cur || && (!cur || SetFilePointer (get_handle (), 0, NULL, FILE_BEGIN)
SetFilePointer (get_handle (), 0, NULL, FILE_BEGIN)
!= INVALID_SET_FILE_POINTER)) != INVALID_SET_FILE_POINTER))
{ {
/* FIXME should we use /etc/magic ? */ /* FIXME should we use /etc/magic ? */
@ -320,14 +326,11 @@ fhandler_disk_file::fstat_helper (struct __stat64 *buf, path_conv *pc,
{ {
set_execable_p (); set_execable_p ();
pc->set_exec (); pc->set_exec ();
buf->st_mode |= STD_XBITS;
} }
SetFilePointer (get_handle (), cur, NULL, FILE_BEGIN); SetFilePointer (get_handle (), cur, NULL, FILE_BEGIN);
} }
} }
if (pc->exec_state () == is_executable)
buf->st_mode |= STD_XBITS;
}
}
buf->st_uid = uid; buf->st_uid = uid;
buf->st_gid = gid; buf->st_gid = gid;