aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Yano <takashi.yano@nifty.ne.jp>2024-02-16 18:11:46 +0900
committerTakashi Yano <takashi.yano@nifty.ne.jp>2024-02-16 18:25:14 +0900
commit57b9425878dc796f5dd65970a3ee11fb6d973c45 (patch)
tree48c49c3237db43fa6cba65a364ac8329fa8a664b
parent384ea1f53bdfc424c24b6956153bb08eab912483 (diff)
downloadnewlib-57b9425878dc796f5dd65970a3ee11fb6d973c45.zip
newlib-57b9425878dc796f5dd65970a3ee11fb6d973c45.tar.gz
newlib-57b9425878dc796f5dd65970a3ee11fb6d973c45.tar.bz2
Cygwin: pty: Re-fix the last bug regarding nat-pipe.
Fixes: f907b5f405a3 ("Cygwin: pty: Fix failure to revert from nat-pipe in disable_pcon.") Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
-rw-r--r--winsup/cygwin/fhandler/pty.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/winsup/cygwin/fhandler/pty.cc b/winsup/cygwin/fhandler/pty.cc
index 27a2c77..9d7ef3c 100644
--- a/winsup/cygwin/fhandler/pty.cc
+++ b/winsup/cygwin/fhandler/pty.cc
@@ -4103,11 +4103,8 @@ fhandler_pty_slave::cleanup_for_non_cygwin_app (handle_set_t *p, tty *ttyp,
DWORD force_switch_to)
{
ttyp->wait_fwd ();
- DWORD current_pid = myself->exec_dwProcessId ?: myself->dwProcessId;
- DWORD switch_to = force_switch_to;
WaitForSingleObject (p->pipe_sw_mutex, INFINITE);
- if (!switch_to)
- switch_to = get_console_process_id (current_pid, false, true, true);
+ DWORD switch_to = get_winpid_to_hand_over (ttyp, force_switch_to);
if ((!switch_to && (ttyp->pcon_activated || stdin_is_ptys))
&& ttyp->pty_input_state_eq (tty::to_nat))
{