From 98332409329554de31a32f75780f8f278efc5c19 Mon Sep 17 00:00:00 2001 From: corinna Date: Tue, 14 Dec 2004 17:19:20 +0000 Subject: [PATCH] * tty.cc (tty_list::terminate): Guard releasing the tty with tty_mutex. (tty::init): Set master_pid to 0. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/tty.cc | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 41bacc9512..67d9664a8e 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2004-12-14 Corinna Vinschen + + * tty.cc (tty_list::terminate): Guard releasing the tty with tty_mutex. + (tty::init): Set master_pid to 0. + 2004-12-14 Thomas Wolff * fhandler_console.cc (read): Consider offset within scrolling diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc index ef77bd527f..e2883fec5f 100644 --- a/winsup/cygwin/tty.cc +++ b/winsup/cygwin/tty.cc @@ -151,6 +151,9 @@ tty_list::terminate (void) low_priority_sleep (200); } + if (WaitForSingleObject (tty_mutex, INFINITE) == WAIT_FAILED) + termios_printf ("WFSO for tty_mutex %p failed, %E", tty_mutex); + termios_printf ("tty %d master about to finish", ttynum); ForceCloseHandle1 (t->to_slave, to_pty); ForceCloseHandle1 (t->from_slave, from_pty); @@ -160,6 +163,8 @@ tty_list::terminate (void) char buf[20]; __small_sprintf (buf, "tty%d", ttynum); logout (buf); + + ReleaseMutex (tty_mutex); } } @@ -369,6 +374,7 @@ tty::init (void) to_slave = NULL; from_slave = NULL; was_opened = 0; + master_pid = 0; } HANDLE -- 2.11.0