public inbox for cygwin-patches@cygwin.com
 help / color / mirror / Atom feed
From: Takashi Yano <takashi.yano@nifty.ne.jp>
To: cygwin-patches@cygwin.com
Subject: [PATCH] Cygwin: pty: Avoid script command crash in console.
Date: Mon,  9 May 2022 20:21:59 +0900	[thread overview]
Message-ID: <20220509112159.37125-1-takashi.yano@nifty.ne.jp> (raw)

- Previously, script command sometimes crashes by Ctrl-C if it is
  running in console, and non-cygwin app is foreground. This patch
  fixes the issue.
---
 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 (DWORD 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 ();
 }
-- 
2.36.0


                 reply	other threads:[~2022-05-09 11:22 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220509112159.37125-1-takashi.yano@nifty.ne.jp \
    --to=takashi.yano@nifty.ne.jp \
    --cc=cygwin-patches@cygwin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).