* fhandler_tty.cc (fhandler_tty_common::dup): Just copy cygheap->ctty to child

if duping the current ctty.
(fhandler_tty_common::close): Move debugging statement earlier in function.
(fhandler_tty_slave::close): Return success when closing ctty.
* syscalls.cc (close_all_files): Avoid calling fhandler_tty_slave close method
so that open_fhs will not be decremented when closing cygheap ctty.
(setsid): Ditto.
* dcrt0.cc (do_exit): Reorganize to avoid leaving a critical section active
after vfork.
* fhandler.h (fhandler_tty_slave::get_unit): Remove regparm parameter since it
can't work in a virtualized function.

1 files changed, 2 insertions, 8 deletions

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 268c34f46..1a77c360f 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -98,10 +98,7 @@ close_all_files (void)
       }
 
   if (cygheap->ctty.get_io_handle ())
-    {
-      myself->ctty = -1;
-      cygheap->ctty.close ();
-    }
+    cygheap->ctty.fhandler_tty_common::close ();
 
   ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "close_all_files");
   user_shared->delqueue.process_queue ();
@@ -324,10 +321,7 @@ setsid (void)
       myself->sid = getpid ();
       myself->pgid = getpid ();
       if (cygheap->ctty.get_io_handle ())
-	{
-	  cygheap->ctty.close ();
-	  cygheap->ctty.set_io_handle (NULL);
-	}
+	cygheap->ctty.fhandler_tty_common::close ();
       syscall_printf ("sid %d, pgid %d, ctty %d, open_fhs %d", myself->sid,
 		      myself->pgid, myself->ctty, fhandler_console::open_fhs);
       return myself->sid;