* tty.cc (tty_list::allocate_tty): Leave tty_mutex armed on successful return

from !with_console
* fhandler_tty.cc (fhandler_pty_master::open): Release tty_mutex here after all
initialization is done.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 8fae3f8e6492ce63915d6e379b7c9eca3f291b31..8a763f9bc0ff35ae055711d966422612ff1eb8d3 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-20  Christopher Faylor  <cgf@alum.bu.edu>
+
+       * tty.cc (tty_list::allocate_tty): Leave tty_mutex armed on successful
+       return from !with_console
+       * fhandler_tty.cc (fhandler_pty_master::open): Release tty_mutex here
+       after all initialization is done.
+
 2004-05-17  Corinna Vinschen  <corinna@vinschen.de>
 
        * grp.cc (getgrgid_r): Replace struct group by struct __group32 in

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 8b98c2dbaae5a0dcef1fd3f0612203a786a1c4e5..bf17e833128493d56607ee58e32084e317309656 100644 (file)
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1164,6 +1164,7 @@ fhandler_pty_master::open (int flags, mode_t)
   slave = *ttys_dev;
   slave.setunit (ntty);
   cygwin_shared->tty[ntty]->common_init (this);
+  ReleaseMutex (tty_mutex);    // lock was set in allocate_tty
   inuse = get_ttyp ()->create_inuse (TTY_MASTER_ALIVE);
   set_flags ((flags & ~O_TEXT) | O_BINARY);
   set_open_status ();

diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc
index fd8132c3a118e7bca0d88f3ce20bf3495c912a07..e374acb7c11c664602ef86c1b48004fc49d34dde 100644 (file)
--- a/winsup/cygwin/tty.cc
+++ b/winsup/cygwin/tty.cc
@@ -282,16 +282,22 @@ tty_list::allocate_tty (bool with_console)
 
 out:
   if (freetty < 0)
-    system_printf ("No tty allocated");
+    {
+      ReleaseMutex (tty_mutex);
+      system_printf ("No tty allocated");
+    }
   else if (!with_console)
-    termios_printf ("tty%d allocated", freetty);
+    {
+      termios_printf ("tty%d allocated", freetty);
+      /* exit with tty_mutex still held -- caller has more work to do */
+    }
   else
     {
       termios_printf ("console %p associated with tty%d", console, freetty);
       if (!hmaster)
        create_tty_master (freetty);
+      ReleaseMutex (tty_mutex);
     }
-  ReleaseMutex (tty_mutex);
   return freetty;
 }