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

* fhandler.cc (fhandler_base::open): *Only* handle SYSTEM and HIDDEN

Browse Source 
attributes in FILE_OVERWRITE case.
This commit is contained in:
Corinna Vinschen 2008-04-25 16:50:29 +00:00
parent 0dcfc3346a
commit 703a42b96a
2 changed files with 16 additions and 9 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 @@
2008-04-25 Corinna Vinschen <corinna@vinschen.de>
* fhandler.cc (fhandler_base::open): *Only* handle SYSTEM and HIDDEN
attributes in FILE_OVERWRITE case.
2008-04-25 Corinna Vinschen <corinna@vinschen.de> 2008-04-25 Corinna Vinschen <corinna@vinschen.de>
* fhandler.cc (fhandler_base::open): Handle SYSTEM and HIDDEN attributes * fhandler.cc (fhandler_base::open): Handle SYSTEM and HIDDEN attributes

20
winsup/cygwin/fhandler.cc
View File

@ -539,24 +539,26 @@ fhandler_base::open (int flags, mode_t mode)
if (get_device () == FH_FS) if (get_device () == FH_FS)
{ {
file_attributes = FILE_ATTRIBUTE_NORMAL;
/* Add the reparse point flag to native symlinks, otherwise we open the /* Add the reparse point flag to native symlinks, otherwise we open the
target, not the symlink. This would break lstat. */ target, not the symlink. This would break lstat. */
if (pc.is_rep_symlink ()) if (pc.is_rep_symlink ())
create_options |= FILE_OPEN_REPARSE_POINT; create_options |= FILE_OPEN_REPARSE_POINT;
if ((flags & O_CREAT) || create_disposition == FILE_OVERWRITE) /* Starting with Windows 2000, when trying to overwrite an already
existing file with FILE_ATTRIBUTE_HIDDEN and/or FILE_ATTRIBUTE_SYSTEM
attribute set, CreateFile fails with ERROR_ACCESS_DENIED.
Per MSDN you have to create the file with the same attributes as
already specified for the file. */
if (((flags & O_CREAT) || create_disposition == FILE_OVERWRITE)
&& has_attribute (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM))
file_attributes |= pc.file_attributes ();
if (flags & O_CREAT)
{ {
file_attributes = FILE_ATTRIBUTE_NORMAL;
/* If mode has no write bits set, we set the R/O attribute. */ /* If mode has no write bits set, we set the R/O attribute. */
if (!(mode & (S_IWUSR | S_IWGRP | S_IWOTH))) if (!(mode & (S_IWUSR | S_IWGRP | S_IWOTH)))
file_attributes |= FILE_ATTRIBUTE_READONLY; file_attributes |= FILE_ATTRIBUTE_READONLY;
/* Starting with Windows 2000, when trying to overwrite an already
existing file with FILE_ATTRIBUTE_HIDDEN and/or FILE_ATTRIBUTE_SYSTEM
attribute set, CreateFile fails with ERROR_ACCESS_DENIED.
Per MSDN you have to create the file with the same attributes as
already specified for the file. */
if (has_attribute (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM))
file_attributes |= pc.file_attributes ();
/* If the file should actually be created and ntsec is on, /* If the file should actually be created and ntsec is on,
set files attributes. */ set files attributes. */