From fe861ce9344d7577a909fc2878b2e61483bf6107 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sat, 27 Dec 2003 02:41:07 +0000 Subject: [PATCH] * syscalls.cc (close_all_files): Simplify logic around closing ctty. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/syscalls.cc | 15 ++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6067f5e1b..345224889 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2003-12-26 Christopher Faylor + + * syscalls.cc (close_all_files): Simplify logic around closing ctty. + 2003-12-26 Christopher Faylor * pinfo.cc (_pinfo::set_ctty): *Always* call close on opened ctty since diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 4a8cadefa..8bf74d5ae 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -89,15 +89,6 @@ close_all_files (void) { SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "close_all_files"); - if (cygheap->ctty) - { - if (cygheap->ctty->usecount == 1) - cygheap->ctty->close (); - else - cygheap->ctty->usecount--; - debug_printf ("ctty usecount %d", cygheap->ctty->archetype->usecount); - } - fhandler_base *fh; for (int i = 0; i < (int) cygheap->fdtab.size; i++) if ((fh = cygheap->fdtab[i]) != NULL) @@ -109,6 +100,12 @@ close_all_files (void) cygheap->fdtab.release (i); } + if (cygheap->ctty) + { + debug_printf ("closing ctty"); + cygheap->ctty->close (); + } + ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "close_all_files"); user_shared->delqueue.process_queue (); } -- 2.43.5