[newlib-cygwin/cygwin-3_5-branch] Cygwin: pty: Fix failure to revert from nat-pipe in disable_pcon.

Takashi Yano tyan0@sourceware.org
Fri Feb 16 08:28:25 GMT 2024


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=384ea1f53bdfc424c24b6956153bb08eab912483

commit 384ea1f53bdfc424c24b6956153bb08eab912483
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date:   Fri Feb 16 17:15:29 2024 +0900

    Cygwin: pty: Fix failure to revert from nat-pipe in disable_pcon.
    
    Fixes: a9038789488e ("Cygwin: pty: Additional fix for transferring input at exit.");
    Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>

Diff:
---
 winsup/cygwin/fhandler/pty.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/winsup/cygwin/fhandler/pty.cc b/winsup/cygwin/fhandler/pty.cc
index e52590c9d..27a2c774a 100644
--- a/winsup/cygwin/fhandler/pty.cc
+++ b/winsup/cygwin/fhandler/pty.cc
@@ -4108,8 +4108,6 @@ fhandler_pty_slave::cleanup_for_non_cygwin_app (handle_set_t *p, tty *ttyp,
   WaitForSingleObject (p->pipe_sw_mutex, INFINITE);
   if (!switch_to)
     switch_to = get_console_process_id (current_pid, false, true, true);
-  if (!switch_to)
-    switch_to = get_console_process_id (current_pid, false, true, false);
   if ((!switch_to && (ttyp->pcon_activated || stdin_is_ptys))
       && ttyp->pty_input_state_eq (tty::to_nat))
     {


More information about the Cygwin-cvs mailing list