[PATCH] Cygwin: console, pty: Stop ignoring Ctrl-C by IGNBRK.
Takashi Yano
takashi.yano@nifty.ne.jp
Sun Mar 7 01:41:11 GMT 2021
- 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.
---
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 */
--
2.30.1
More information about the Cygwin-patches
mailing list