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

* dtable.cc (dtable::dup3): Only return with lock set when O_EXCL flag is

Browse Source 
passed in.
* syscalls.cc (dup_finish): Pass O_EXCL in flags to dtable::dup3.
This commit is contained in:
Christopher Faylor
2012-06-04 01:26:05 +00:00
parent 3143cb7c00
commit b9c61a8d7b
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,9 @@
2012-06-03 Christopher Faylor <me.cygwin2012@cgf.cx>
* dtable.cc (dtable::dup3): Only return with lock set when O_EXCL flag
is passed in.
* syscalls.cc (dup_finish): Pass O_EXCL in flags to dtable::dup3.
2012-06-03 Christopher Faylor <me.cygwin2012@cgf.cx>
* DevNotes: Add entry cgf-000011.

10
winsup/cygwin/dtable.cc
View File

@@ -714,6 +714,14 @@ dtable::dup3 (int oldfd, int newfd, int flags)
debug_printf ("dup3 (%d, %d, %p)", oldfd, newfd, flags);
lock ();
bool do_unlock = true;
bool unlock_on_return;
if (!(flags & O_EXCL))
unlock_on_return = true; /* Relinquish lock on return */
else
{
flags &= ~O_EXCL;
unlock_on_return = false; /* Return with lock set on success */
}
if (not_open (oldfd))
{
@@ -761,11 +769,11 @@ dtable::dup3 (int oldfd, int newfd, int flags)
goto done;
}
do_unlock = false;
fds[newfd] = newfh;
if ((res = newfd) <= 2)
set_std_handle (res);
do_unlock = unlock_on_return;
done:
MALLOC_CHECK;

2
winsup/cygwin/syscalls.cc
View File

@@ -130,7 +130,7 @@ inline int
dup_finish (int oldfd, int newfd, int flags)
{
int res;
if ((res = cygheap->fdtab.dup3 (oldfd, newfd, flags)) == newfd)
if ((res = cygheap->fdtab.dup3 (oldfd, newfd, flags | O_EXCL)) == newfd)
{
cygheap_fdget (newfd)->inc_refcnt ();
cygheap->fdtab.unlock (); /* dup3 exits with lock set on success */