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

* path.cc (symlink_info::check_shortcut): Minimize requested file

Browse Source 
access flags.
	(symlink_info::check_sysfile): Ditto.  Add missing `else'.
	(symlink_info::check): Only retry to open file if first try failed
	with access denied.
This commit is contained in:
Corinna Vinschen
2008-05-20 18:19:32 +00:00
parent a9309ff5b6
commit c44e0ba1f5
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,11 @@
2008-05-20 Corinna Vinschen <corinna@vinschen.de>
* path.cc (symlink_info::check_shortcut): Minimize requested file
access flags.
(symlink_info::check_sysfile): Ditto. Add missing `else'.
(symlink_info::check): Only retry to open file if first try failed
with access denied.
2008-05-20 Corinna Vinschen <corinna@vinschen.de> 2008-05-20 Corinna Vinschen <corinna@vinschen.de>
* path.cc (fs_info::update): Re-add opening the unsplitted path * path.cc (fs_info::update): Re-add opening the unsplitted path

11
winsup/cygwin/path.cc
View File

@@ -1857,7 +1857,7 @@ symlink_info::check_shortcut (HANDLE in_h)
FILE_STANDARD_INFORMATION fsi; FILE_STANDARD_INFORMATION fsi;
InitializeObjectAttributes (&attr, &same, 0, in_h, NULL); InitializeObjectAttributes (&attr, &same, 0, in_h, NULL);
status = NtOpenFile (&h, FILE_GENERIC_READ, status = NtOpenFile (&h, FILE_READ_DATA | SYNCHRONIZE,
&attr, &io, FILE_SHARE_VALID_FLAGS, &attr, &io, FILE_SHARE_VALID_FLAGS,
FILE_OPEN_FOR_BACKUP_INTENT FILE_OPEN_FOR_BACKUP_INTENT
| FILE_SYNCHRONOUS_IO_NONALERT); | FILE_SYNCHRONOUS_IO_NONALERT);
@@ -1941,14 +1941,15 @@ symlink_info::check_sysfile (HANDLE in_h)
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
InitializeObjectAttributes (&attr, &same, 0, in_h, NULL); InitializeObjectAttributes (&attr, &same, 0, in_h, NULL);
status = NtOpenFile (&h, FILE_GENERIC_READ, status = NtOpenFile (&h, FILE_READ_DATA | SYNCHRONIZE,
&attr, &io, FILE_SHARE_VALID_FLAGS, &attr, &io, FILE_SHARE_VALID_FLAGS,
FILE_OPEN_FOR_BACKUP_INTENT FILE_OPEN_FOR_BACKUP_INTENT
| FILE_SYNCHRONOUS_IO_NONALERT); | FILE_SYNCHRONOUS_IO_NONALERT);
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))
set_error (EIO); set_error (EIO);
if (!NT_SUCCESS (status = NtReadFile (h, NULL, NULL, NULL, &io, cookie_buf, else if (!NT_SUCCESS (status = NtReadFile (h, NULL, NULL, NULL, &io,
sizeof (cookie_buf), NULL, NULL))) cookie_buf, sizeof (cookie_buf),
NULL, NULL)))
{ {
debug_printf ("ReadFile1 failed"); debug_printf ("ReadFile1 failed");
if (status != STATUS_END_OF_FILE) if (status != STATUS_END_OF_FILE)
@@ -2367,7 +2368,7 @@ symlink_info::check (char *path, const suffix_info *suffixes, unsigned opt,
FILE_OPEN_REPARSE_POINT FILE_OPEN_REPARSE_POINT
| FILE_OPEN_FOR_BACKUP_INTENT, | FILE_OPEN_FOR_BACKUP_INTENT,
&nfs_aol_ffei, sizeof nfs_aol_ffei); &nfs_aol_ffei, sizeof nfs_aol_ffei);
if (!NT_SUCCESS (status)) if (status == STATUS_ACCESS_DENIED) /* No right to access EAs? */
{ {
no_ea = true; no_ea = true;
status = NtCreateFile (&h, status = NtCreateFile (&h,