Cygwin: pty: Fix state mismatch caused in mintty.

- PTY has a bug reported in:
  https://cygwin.com/ml/cygwin/2020-02/msg00067.html.
  This is the result of state mismatch between real pseudo console
  attaching state and state variable. This patch fixes the issue.

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index f2fd680ea7eff019552b1c101f1c5dbd5a8ea81c..260776a5621d1955c79a67c1db3abbcf046e011d 100644 (file)
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -65,6 +65,12 @@ static bool isHybrid;
 static bool do_not_reset_switch_to_pcon;
 static bool freeconsole_on_close = true;
 
+void
+clear_pcon_attached_to (void)
+{
+  pcon_attached_to = -1;
+}
+
 static void
 set_switch_to_pcon (void)
 {
@@ -727,7 +733,10 @@ fhandler_pty_slave::~fhandler_pty_slave ()
        {
          init_console_handler (false);
          if (freeconsole_on_close)
-           FreeConsole ();
+           {
+             FreeConsole ();
+             pcon_attached_to = -1;
+           }
        }
     }
 }
@@ -2988,7 +2997,10 @@ fhandler_pty_slave::fixup_after_exec ()
        {
          init_console_handler (false);
          if (freeconsole_on_close)
-           FreeConsole ();
+           {
+             FreeConsole ();
+             pcon_attached_to = -1;
+           }
        }
     }
 

diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc
index a8f0fb82a42593b1b3b6a5e2dbc53515c7ac76c8..691d08137f1e3109dd0f7e32ca06cc19cf7ef7ed 100644 (file)
--- a/winsup/cygwin/fork.cc
+++ b/winsup/cygwin/fork.cc
@@ -161,6 +161,8 @@ frok::child (volatile char * volatile here)
              }
          }
       }
+  extern void clear_pcon_attached_to (void); /* fhandler_tty.cc */
+  clear_pcon_attached_to ();
 
   HANDLE& hParent = ch.parent;