From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id 9CB623858C54; Fri, 16 Feb 2024 09:29:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9CB623858C54 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1708075762; bh=A/8+gAtFRJ70U+u9pb0pKKS+50M25Cv1PWUfY+Yib+4=; h=From:To:Subject:Date:From; b=JYBOoPMWO8tlIlRXY4nvtqup2Yq3gI8AfsJOlQGmFjbM03m1fKBYggpUOlNF2rOYv uH0jtGJSkO6F2ss8hZvo+ceA6xkd43n9wJbdqeQXx4ysXIo5nVmqMN+baJnKr7qCaH wYyTO6qJ5kj/EPHK4ybYVqH/zL2KJ7X/UnNEIo8Y= 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_5-branch] Cygwin: pty: Re-fix the last bug regarding nat-pipe. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/cygwin-3_5-branch X-Git-Oldrev: 384ea1f53bdfc424c24b6956153bb08eab912483 X-Git-Newrev: 57b9425878dc796f5dd65970a3ee11fb6d973c45 Message-Id: <20240216092922.9CB623858C54@sourceware.org> Date: Fri, 16 Feb 2024 09:29:22 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D57b9425878d= c796f5dd65970a3ee11fb6d973c45 commit 57b9425878dc796f5dd65970a3ee11fb6d973c45 Author: Takashi Yano Date: Fri Feb 16 18:11:46 2024 +0900 Cygwin: pty: Re-fix the last bug regarding nat-pipe. =20 Fixes: f907b5f405a3 ("Cygwin: pty: Fix failure to revert from nat-pipe = in disable_pcon.") Signed-off-by: Takashi Yano 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 (hand= le_set_t *p, tty *ttyp, DWORD force_switch_to) { ttyp->wait_fwd (); - 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); + DWORD switch_to =3D 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)) {