[newlib-cygwin] Cygwin: pty: Re-fix the last bug regarding nat-pipe.
Takashi Yano
tyan0@sourceware.org
Fri Feb 16 09:29:35 GMT 2024
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=f9542a2e8e7532626298f02015337fdeb4e7bac0
commit f9542a2e8e7532626298f02015337fdeb4e7bac0
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Fri Feb 16 18:11:46 2024 +0900
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>
Diff:
---
winsup/cygwin/fhandler/pty.cc | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/winsup/cygwin/fhandler/pty.cc b/winsup/cygwin/fhandler/pty.cc
index 27a2c774a..9d7ef3c9d 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))
{
More information about the Cygwin-cvs
mailing list