public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: console, pty: Stop ignoring Ctrl-C by IGNBRK.
Date: Mon,  8 Mar 2021 09:34:29 +0000 (GMT)	[thread overview]
Message-ID: <20210308093429.B38F73857C7B@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=b92a6303f1d02d8b583cd6b0509a80da76c8e3ea

commit b92a6303f1d02d8b583cd6b0509a80da76c8e3ea
Author: Takashi Yano via Cygwin-patches <cygwin-patches@cygwin.com>
Date:   Sun Mar 7 10:41:11 2021 +0900

    Cygwin: console, pty: Stop ignoring Ctrl-C by IGNBRK.
    
    - Perhaps current code misunderstand meaning of the IGNBRK. As far
      as I investigated, IGNBRK is concerned with break signal in serial
      port but there is no evidence that it has effect to ignore Ctrl-C.
      This patch stops ignoring Ctrl-C by IGNBRK for non-cygwin apps.

Diff:
---
 winsup/cygwin/fhandler_console.cc | 2 +-
 winsup/cygwin/fhandler_tty.cc     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 96a8729e8..0b33a1370 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -484,7 +484,7 @@ fhandler_console::set_input_mode (tty::cons_mode m, const termios *t,
 	/* This is illegal, so turn off the echo here, and fake it
 	   when we read the characters */
 	flags &= ~ENABLE_ECHO_INPUT;
-      if ((t->c_lflag & ISIG) && !(t->c_iflag & IGNBRK))
+      if (t->c_lflag & ISIG)
 	flags |= ENABLE_PROCESSED_INPUT;
       break;
     }
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 244147a80..4358bceec 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -2165,8 +2165,8 @@ fhandler_pty_master::write (const void *ptr, size_t len)
 	}
 
       WaitForSingleObject (input_mutex, INFINITE);
-      if ((ti.c_lflag & ISIG) && !(ti.c_iflag & IGNBRK)
-	  && !(ti.c_lflag & NOFLSH) && memchr (buf, '\003', nlen))
+      if ((ti.c_lflag & ISIG) && !(ti.c_lflag & NOFLSH)
+	  && memchr (buf, '\003', nlen))
 	get_ttyp ()->discard_input = true;
       DWORD n;
       WriteFile (to_slave, buf, nlen, &n, NULL);
@@ -3307,7 +3307,7 @@ skip_create:
 	/* This is illegal, so turn off the echo here, and fake it
 	   when we read the characters */
 	mode &= ~ENABLE_ECHO_INPUT;
-      if ((t.c_lflag & ISIG) && !(t.c_iflag & IGNBRK))
+      if (t.c_lflag & ISIG)
 	mode |= ENABLE_PROCESSED_INPUT;
       SetConsoleMode (hpConIn, mode);
       /* Set output mode */


                 reply	other threads:[~2021-03-08  9:34 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=20210308093429.B38F73857C7B@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    /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).