* fhandler_console.cc (get_tty_stuff): Don't initialize shared memory console

area if it is already initialized.
* fhandler_termios.cc (fhandler_termios::tcsetpgrp): Augment debugging info.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index bf1cda119e2cc32885eae3275456fd313ab7bd36..473c8f58fd2429188a05f5b1ba1f850c796c1d67 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+Tue Aug  7 01:13:58 2001  Christopher Faylor <cgf@cygnus.com>
+
+       * fhandler_console.cc (get_tty_stuff): Don't initialize shared memory
+       console area if it is already initialized.
+
+       * fhandler_termios.cc (fhandler_termios::tcsetpgrp): Augment debugging
+       info.
+
 Mon Aug  6 19:58:43 2001  Christopher Faylor <cgf@cygnus.com>
 
        * cygheap.cc (cygheap_root::set): Avoid treating '/' specially.

diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index e9b1c49f44ca864457b0f5b7b1139defb37f0539..1b3b0270ce31d1316f828d7403e57fd5b022d22d 100644 (file)
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -107,9 +107,12 @@ get_tty_stuff (int flags = 0)
                                                 sizeof (*shared_console_info),
                                                 NULL);
   ProtectHandle (cygheap->console_h);
-  shared_console_info->setntty (TTY_CONSOLE);
-  shared_console_info->setsid (myself->sid);
-  shared_console_info->set_ctty (TTY_CONSOLE, flags);
+  if (!shared_console_info->ntty)
+    {
+      shared_console_info->setntty (TTY_CONSOLE);
+      shared_console_info->setsid (myself->sid);
+      shared_console_info->set_ctty (TTY_CONSOLE, flags);
+    }
   return shared_console_info;
 }
 

diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_termios.cc
index 606c689ca0c2441fdbc43b247d727e4f9da0d84f..4a8c238629a99e1307c9d9255b1e9f03f2e6c7b7 100644 (file)
--- a/winsup/cygwin/fhandler_termios.cc
+++ b/winsup/cygwin/fhandler_termios.cc
@@ -65,7 +65,7 @@ fhandler_termios::tcinit (tty_min *this_tc, int force)
 int
 fhandler_termios::tcsetpgrp (const pid_t pgid)
 {
-  termios_printf ("pgid %d, sid %d, tsid %d", pgid,
+  termios_printf ("tty %d pgid %d, sid %d, tsid %d", tc->ntty, pgid,
                    myself->sid, tc->getsid ());
   if (myself->sid != tc->getsid ())
     {