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

* fhandler.cc (fhandler_base::open): Move NFS-specific code into the

Browse Source 
code block handling FH_FS stuff.
This commit is contained in:
Corinna Vinschen 2011-07-01 11:23:43 +00:00
parent 3d938be6c5
commit 9780b0da3c
2 changed files with 20 additions and 15 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 @@
2011-07-01 Corinna Vinschen <corinna@vinschen.de>
* fhandler.cc (fhandler_base::open): Move NFS-specific code into the
code block handling FH_FS stuff.
2011-06-30 Ryan Johnson <ryan.johnson@cs.utoronto.ca> 2011-06-30 Ryan Johnson <ryan.johnson@cs.utoronto.ca>
* dtable.cc (fh_oom): Remove. * dtable.cc (fh_oom): Remove.

30
winsup/cygwin/fhandler.cc
View File

@ -539,21 +539,6 @@ fhandler_base::open (int flags, mode_t mode)
break; break;
} }
if (pc.fs_is_nfs ())
{
/* Make sure we can read EAs of files on an NFS share. Also make
sure that we're going to act on the file itself, even if it's a
a symlink. */
access |= FILE_READ_EA;
if (query_open ())
{
if (query_open () >= query_write_control)
access |= FILE_WRITE_EA;
plen = sizeof nfs_aol_ffei;
p = (PFILE_FULL_EA_INFORMATION) &nfs_aol_ffei;
}
}
if ((flags & O_TRUNC) && ((flags & O_ACCMODE) != O_RDONLY)) if ((flags & O_TRUNC) && ((flags & O_ACCMODE) != O_RDONLY))
{ {
if (flags & O_CREAT) if (flags & O_CREAT)
@ -576,6 +561,21 @@ fhandler_base::open (int flags, mode_t mode)
if (pc.is_rep_symlink ()) if (pc.is_rep_symlink ())
options |= FILE_OPEN_REPARSE_POINT; options |= FILE_OPEN_REPARSE_POINT;
if (pc.fs_is_nfs ())
{
/* Make sure we can read EAs of files on an NFS share. Also make
sure that we're going to act on the file itself, even if it's a
a symlink. */
access |= FILE_READ_EA;
if (query_open ())
{
if (query_open () >= query_write_control)
access |= FILE_WRITE_EA;
plen = sizeof nfs_aol_ffei;
p = (PFILE_FULL_EA_INFORMATION) &nfs_aol_ffei;
}
}
/* Starting with Windows 2000, when trying to overwrite an already /* Starting with Windows 2000, when trying to overwrite an already
existing file with FILE_ATTRIBUTE_HIDDEN and/or FILE_ATTRIBUTE_SYSTEM existing file with FILE_ATTRIBUTE_HIDDEN and/or FILE_ATTRIBUTE_SYSTEM
attribute set, CreateFile fails with ERROR_ACCESS_DENIED. attribute set, CreateFile fails with ERROR_ACCESS_DENIED.