* dtable.cc (dtable::delete_archetype): Add debugging.

(dtable::release): Move archetype deletion here.
(dtable::vfork_child_dup): Increment ctty usecount to catch later
close_all_files case in parent/child.
(dtable::vfork_child_fixup): Avoid using cygheap->foo where this should really
be using local references.  Call close on archetyped handles since the handles
haven't had the noninherit flag set.
* fhandler_tty.cc (fhandler_tty_slave::close): Remove archetype deletion code.
Add defensive error message when DEBUGGING.
(fhandler_tty_common::set_close_on_exec): Use more robust method for checking
whether to set handles into noninherit if there is an archetype associated with
the fhandler.

1 files changed, 10 insertions, 4 deletions

diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
index 70e52f484..c6c300b00 100644
--- a/winsup/cygwin/dtable.cc
+++ b/winsup/cygwin/dtable.cc
@@ -188,6 +188,7 @@ dtable::delete_archetype (fhandler_base *fh)
   for (unsigned i = 0; i < narchetypes; i++)
     if (fh == archetypes[i])
       {
+	debug_printf ("deleting archive element %d for %s", i, fh->get_name ());
 	if (i < --farchetype)
 	  archetypes[i] = archetypes[farchetype];
 	break;
@@ -218,7 +219,10 @@ dtable::release (int fd)
     {
       if (fds[fd]->need_fixup_before ())
 	dec_need_fixup_before ();
+      fhandler_base *arch = fds[fd]->archetype;
       delete fds[fd];
+      if (arch && !arch->usecount)
+	cygheap->fdtab.delete_archetype (arch);
       fds[fd] = NULL;
     }
 }
@@ -697,6 +701,8 @@ dtable::vfork_child_dup ()
 
   /* Remove impersonation */
   cygheap->user.deimpersonate ();
+  if (cygheap->ctty)
+    cygheap->ctty->usecount++;
 
   for (size_t i = 0; i < size; i++)
     if (not_open (i))
@@ -746,16 +752,16 @@ dtable::vfork_child_fixup ()
   fds = fds_on_hold;
 
   fhandler_base *fh;
-  for (int i = 0; i < (int) cygheap->fdtab.size; i++)
-    if ((fh = cygheap->fdtab[i]) != NULL)
+  for (int i = 0; i < (int) size; i++)
+    if ((fh = fds[i]) != NULL)
       {
 	fh->clear_readahead ();
-	if (fh->get_close_on_exec ())
+	if (!fh->archetype && fh->get_close_on_exec ())
 	  release (i);
 	else
 	  {
 	    fh->close ();
-	    cygheap->fdtab.release (i);
+	    release (i);
 	  }
       }