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
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>
* cygthread.cc (cygthread::exiting): New variable.

55
winsup/cygwin/fhandler_disk_file.cc
View File

@@ -300,35 +300,38 @@ fhandler_disk_file::fstat_helper (struct __stat64 *buf, path_conv *pc,
else
{
buf->st_mode |= S_IFREG;
if (pc->exec_state () == dont_know_if_executable)
{
DWORD cur, done;
char magic[3];
/* First retrieve current position, set to beginning
of file if not already there. */
cur = SetFilePointer (get_handle (), 0, NULL, FILE_CURRENT);
if (cur != INVALID_SET_FILE_POINTER &&
(!cur ||
SetFilePointer (get_handle (), 0, NULL, FILE_BEGIN)
!= INVALID_SET_FILE_POINTER))
{
/* FIXME should we use /etc/magic ? */
magic[0] = magic[1] = magic[2] = '\0';
if (ReadFile (get_handle (), magic, 3, &done, NULL) &&
has_exec_chars (magic, done))
{
set_execable_p ();
pc->set_exec ();
}
SetFilePointer (get_handle (), cur, NULL, FILE_BEGIN);
}
}
if (pc->exec_state () == is_executable)
buf->st_mode |= STD_XBITS;
}
}
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;
char magic[3];
/* First retrieve current position, set to beginning
of file if not already there. */
cur = SetFilePointer (get_handle (), 0, NULL, FILE_CURRENT);
if (cur != INVALID_SET_FILE_POINTER
&& (!cur || SetFilePointer (get_handle (), 0, NULL, FILE_BEGIN)
!= INVALID_SET_FILE_POINTER))
{
/* FIXME should we use /etc/magic ? */
magic[0] = magic[1] = magic[2] = '\0';
if (ReadFile (get_handle (), magic, 3, &done, NULL) &&
has_exec_chars (magic, done))
{
set_execable_p ();
pc->set_exec ();
buf->st_mode |= STD_XBITS;
}
SetFilePointer (get_handle (), cur, NULL, FILE_BEGIN);
}
}
buf->st_uid = uid;
buf->st_gid = gid;