From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id 8E8263858C50; Fri, 2 Jun 2023 01:33:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8E8263858C50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1685669589; bh=NmhFox9BuKq46N6bH5Cw3sxI/S8PuA18KSxHsjXqQQo=; h=From:To:Subject:Date:From; b=JluLQWEVv3FDKTNKoPD0OJCa61ainBsHiJRjQSOigjBSjCU+Qyin+9DFwtDUHidlU TsjSzgKf5bJRJFpiUaEcoj0igZhC4P+sRzMJyUoS6kMcCDRXZ8d8o+rM/jg16zWohf gx3giKgJzNw8bsuIQuvoNp91v0Yfyx3aNlpFbkdY= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Takashi Yano To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_4-branch] Cygwin: pty: Additional fix for transferring input at exit. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/cygwin-3_4-branch X-Git-Oldrev: 3456e8b7db5b37cf9e10aedbbf552df10f75e055 X-Git-Newrev: b553457f68bf8a34f3e9f3266d361e9a99530017 Message-Id: <20230602013309.8E8263858C50@sourceware.org> Date: Fri, 2 Jun 2023 01:33:09 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Db553457f68b= f8a34f3e9f3266d361e9a99530017 commit b553457f68bf8a34f3e9f3266d361e9a99530017 Author: Takashi Yano Date: Fri Jun 2 10:19:18 2023 +0900 Cygwin: pty: Additional fix for transferring input at exit. =20 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. =20 Fixes: 3456e8b7db5b ("Cygwin: pty: Fix transferring type-ahead input be= tween input pipes.") Signed-off-by: Takashi Yano Diff: --- winsup/cygwin/fhandler/pty.cc | 10 ++++++++-- 1 file 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 (hand= le_set_t *p, tty *ttyp, DWORD force_switch_to) { ttyp->wait_fwd (); - if ((ttyp->pcon_activated || stdin_is_ptys) + DWORD current_pid =3D myself->exec_dwProcessId ?: myself->dwProcessId; + DWORD switch_to =3D force_switch_to; + WaitForSingleObject (p->pipe_sw_mutex, INFINITE); + if (!switch_to) + switch_to =3D get_console_process_id (current_pid, false, true, true); + if (!switch_to) + switch_to =3D 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 (handl= e_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