diff options
| author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2023-06-02 04:19:18 +0300 |
|---|---|---|
| committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2023-06-02 04:28:12 +0300 |
| commit | b553457f68bf8a34f3e9f3266d361e9a99530017 (patch) | |
| tree | 060a0ab4126e86cc21436eb302d3c5056a1ae4d9 | |
| parent | 3456e8b7db5b37cf9e10aedbbf552df10f75e055 (diff) | |
Cygwin: pty: Additional fix for transferring input at exit.cygwin-3.4.7
The commit 3456e8b7db5b does not fix transferring input at exit
appropriately. If the more than one non-cygwin apps are executed
simultaneously and one of them is terminated, the pty master failed
to send input to the other non-cygwin apps. This patch fixes that.
Fixes: 3456e8b7db5b ("Cygwin: pty: Fix transferring type-ahead input between input pipes.")
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
| -rw-r--r-- | winsup/cygwin/fhandler/pty.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler/pty.cc b/winsup/cygwin/fhandler/pty.cc index 9ca3b64b6..bb34d1006 100644 --- a/winsup/cygwin/fhandler/pty.cc +++ b/winsup/cygwin/fhandler/pty.cc @@ -4128,7 +4128,14 @@ fhandler_pty_slave::cleanup_for_non_cygwin_app (handle_set_t *p, tty *ttyp, DWORD force_switch_to) { ttyp->wait_fwd (); - if ((ttyp->pcon_activated || stdin_is_ptys) + 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); + 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)) { WaitForSingleObject (p->input_mutex, mutex_timeout); @@ -4138,7 +4145,6 @@ fhandler_pty_slave::cleanup_for_non_cygwin_app (handle_set_t *p, tty *ttyp, release_attach_mutex (); ReleaseMutex (p->input_mutex); } - WaitForSingleObject (p->pipe_sw_mutex, INFINITE); if (ttyp->pcon_activated) close_pseudoconsole (ttyp, force_switch_to); else |