From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id 81A7B3858010; Mon, 9 May 2022 11:34:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 81A7B3858010 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: pty: Avoid script command crash in console. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/master X-Git-Oldrev: a19161a6d3f2da706e6a6b3ea026d209848c3ad3 X-Git-Newrev: 92b576dcc1577e2484c9ce484baa54de3bb60a55 Message-Id: <20220509113436.81A7B3858010@sourceware.org> Date: Mon, 9 May 2022 11:34:36 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 May 2022 11:34:36 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D92b576dcc15= 77e2484c9ce484baa54de3bb60a55 commit 92b576dcc1577e2484c9ce484baa54de3bb60a55 Author: Takashi Yano Date: Mon May 9 19:45:18 2022 +0900 Cygwin: pty: Avoid script command crash in console. =20 - Previously, script command sometimes crashes by Ctrl-C in Win 7 if it is running in console, and non-cygwin app is foreground. This patch fixes the issue. Diff: --- winsup/cygwin/fhandler_tty.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index bb18d139e..9dfc3c495 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -4184,8 +4184,7 @@ fhandler_pty_common::attach_console_temporarily (DWOR= D target_pid) { FreeConsole (); AttachConsole (target_pid); - init_console_handler (::cygheap->ctty - && ::cygheap->ctty->is_console ()); + init_console_handler (false); } return console_exists ? resume_pid : (DWORD) -1; } @@ -4200,8 +4199,7 @@ fhandler_pty_common::resume_from_temporarily_attach (= DWORD resume_pid) if (console_exists) if (!resume_pid || !AttachConsole (resume_pid)) AttachConsole (ATTACH_PARENT_PROCESS); - init_console_handler (::cygheap->ctty - && ::cygheap->ctty->is_console ()); + init_console_handler (false); } release_attach_mutex (); }