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

* dtable.cc (dtable::dup_worker): Add comment explaining why refcnt isn't

Browse Source 
incremented here.
(dtable::dup3): Simplify slightly.  Add comment.
* syscalls.cc (dup3): Increment refcnt here, similarly to dup2.
This commit is contained in:
Christopher Faylor
2012-02-01 17:20:02 +00:00
parent 4c68bf65c8
commit 8fa8b3a389
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,10 @@
2012-02-01 Christopher Faylor <me.cygwin2012@cgf.cx>
* dtable.cc (dtable::dup_worker): Add comment explaining why refcnt
isn't incremented here.
(dtable::dup3): Simplify slightly. Add comment.
* syscalls.cc (dup3): Increment refcnt here, similarly to dup2.
2012-02-01 Christopher Faylor <me.cygwin2012@cgf.cx>
* fhandler.cc (fhandler_base_overlapped::has_ongoing_io): Don't block

10
winsup/cygwin/dtable.cc
View File

@@ -669,8 +669,12 @@ dtable::dup_worker (fhandler_base *oldfh, int flags)
}
else
{
/* Don't increment refcnt here since we don't know if this is a
allocated fd. So we leave this chore to the caller. */
newfh->usecount = 0;
newfh->archetype_usecount (1);
/* The O_CLOEXEC flag enforces close-on-exec behaviour. */
newfh->set_close_on_exec (!!(flags & O_CLOEXEC));
debug_printf ("duped '%s' old %p, new %p", oldfh->get_name (), oldfh->get_io_handle (), newfh->get_io_handle ());
@@ -735,9 +739,9 @@ dtable::dup3 (int oldfd, int newfd, int flags)
if (!not_open (newfd))
close (newfd);
else if ((size_t) newfd < size)
/* nothing to do */;
else if (find_unused_handle (newfd) < 0)
else if ((size_t) newfd > size
&& find_unused_handle (newfd) < 0)
/* couldn't extend fdtab */
{
newfh->close ();
res = -1;

5
winsup/cygwin/syscalls.cc
View File

@@ -161,8 +161,9 @@ dup3 (int oldfd, int newfd, int flags)
set_errno (cfd < 0 ? EBADF : EINVAL);
res = -1;
}
else
res = cygheap->fdtab.dup3 (oldfd, newfd, flags);
else if ((res = cygheap->fdtab.dup3 (oldfd, newfd, flags)) == newfd)
cygheap->fdtab[newfd]->refcnt (1);
syscall_printf ("%R = dup3(%d, %d, %p)", res, oldfd, newfd, flags);
return res;
}