diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2010-06-15 15:10:42 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2010-06-15 15:10:42 +0000 |
| commit | 342814df299d08e24673250d61a2588487e339e2 (patch) | |
| tree | 2e0ae4ba382d8b9207b4d3d5ef696fff5fcb86fc | |
| parent | 5a0d1edba4b31ee2965fdbc86533982eadc91df4 (diff) | |
| download | cygnal-342814df299d08e24673250d61a2588487e339e2.tar.gz cygnal-342814df299d08e24673250d61a2588487e339e2.tar.bz2 cygnal-342814df299d08e24673250d61a2588487e339e2.zip | |
* fhandler_disk_file.cc (fhandler_base::fstat_by_nfs_ea): Use handle
returned by get_stat_handle.
(fhandler_base::fstat_helper): Reinstatiate code to re-open the file
when checking for executability if called via fstat. Explain why.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 32 |
2 files changed, 36 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 2bdbf730e..660517e40 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,12 @@ 2010-06-15 Corinna Vinschen <corinna@vinschen.de> + * fhandler_disk_file.cc (fhandler_base::fstat_by_nfs_ea): Use handle + returned by get_stat_handle. + (fhandler_base::fstat_helper): Reinstatiate code to re-open the file + when checking for executability if called via fstat. Explain why. + +2010-06-15 Corinna Vinschen <corinna@vinschen.de> + * dtable.cc (dtable::dup_worker): Reset path_conv handle in duplicated fhandler. * fhandler.cc (fhandler_base::fstatvfs): Keep handle in created diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index e456b11f7..04b6e3cd8 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -294,7 +294,7 @@ fhandler_base::fstat_by_nfs_ea (struct __stat64 *buf) fgei_buf.fgei.NextEntryOffset = 0; fgei_buf.fgei.EaNameLength = sizeof (NFS_V3_ATTR) - 1; stpcpy (fgei_buf.fgei.EaName, NFS_V3_ATTR); - status = NtQueryEaFile (get_handle (), &io, + status = NtQueryEaFile (get_stat_handle (), &io, &ffei_buf.ffei, sizeof ffei_buf, TRUE, &fgei_buf.fgei, sizeof fgei_buf, NULL, TRUE); if (NT_SUCCESS (status)) @@ -674,10 +674,34 @@ fhandler_base::fstat_helper (struct __stat64 *buf, { LARGE_INTEGER off = { QuadPart:0LL }; char magic[3]; - NTSTATUS status; + NTSTATUS status = 0; IO_STATUS_BLOCK io; + bool opened = false; - if (get_stat_access () & (GENERIC_READ | FILE_READ_DATA)) + if (h == get_handle ()) + { + /* We have been opened via fstat. We have to re-open the + file. Either the file is not opened for reading, or the + read will change the file position. */ + OBJECT_ATTRIBUTES attr; + if (pc.fs_is_nwfs ()) + InitializeObjectAttributes (&attr, pc.get_nt_native_path (), + OBJ_CASE_INSENSITIVE, + NULL, NULL) + else + InitializeObjectAttributes (&attr, &ro_u_empty, 0, + get_handle (), NULL); + status = NtOpenFile (&h, SYNCHRONIZE | FILE_READ_DATA, + &attr, &io, FILE_SHARE_VALID_FLAGS, + FILE_OPEN_FOR_BACKUP_INTENT + | FILE_OPEN_REPARSE_POINT); + if (!NT_SUCCESS (status)) + debug_printf ("%p = NtOpenFile(%S)", status, + pc.get_nt_native_path ()); + else + opened = true; + } + if (NT_SUCCESS (status)) { status = NtReadFile (h, NULL, NULL, NULL, &io, magic, 3, &off, NULL); @@ -692,6 +716,8 @@ fhandler_base::fstat_helper (struct __stat64 *buf, buf->st_mode |= STD_XBITS; } } + if (opened) + NtClose (h); } } if (pc.exec_state () == is_executable) |