libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-01-18 12:29:32 +08:00
Code Issues Projects Releases Wiki Activity

(check in files that should have been checked in previously)

Browse Source 
* fhandler.cc (fhandler_base::open_9x): Remove (broken) check for
O_CREAT|O_EXCL.
* syscalls.cc (open): Do O_CREAT|O_EXCL check here first.
This commit is contained in:
Christopher Faylor 2005-04-28 03:41:09 +00:00
parent faae8c50a5
commit 5c70f2f92e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/fhandler.cc
View File

@ -520,9 +520,7 @@ fhandler_base::open_9x (int flags, mode_t mode)
{ {
if (pc.isdir ()) if (pc.isdir ())
{ {
if (flags & (O_CREAT | O_EXCL) == (O_CREAT | O_EXCL)) if (flags & (O_WRONLY | O_RDWR))
set_errno (EEXIST);
else if (flags & (O_WRONLY | O_RDWR))
set_errno (EISDIR); set_errno (EISDIR);
else else
nohandle (true); nohandle (true);

6
winsup/cygwin/syscalls.cc
View File

@ -564,6 +564,12 @@ open (const char *unix_path, int flags, ...)
{ {
if (!(fh = build_fh_name (unix_path, NULL, PC_SYM_FOLLOW))) if (!(fh = build_fh_name (unix_path, NULL, PC_SYM_FOLLOW)))
res = -1; // errno already set res = -1; // errno already set
else if (((flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL)) && fh->exists ())
{
delete fh;
res = -1;
set_errno (EEXIST);
}
else if (fh->is_fs_special () && fh->device_access_denied (flags)) else if (fh->is_fs_special () && fh->device_access_denied (flags))
{ {
delete fh; delete fh;