diff options
| author | Takashi Yano via Cygwin-patches <cygwin-patches@cygwin.com> | 2021-03-07 10:41:11 +0900 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2021-03-08 10:33:30 +0100 |
| commit | b92a6303f1d02d8b583cd6b0509a80da76c8e3ea (patch) | |
| tree | f96522a522ca41a8139714ce82e2e7bcff43add8 | |
| parent | 4e16e575db04b2d1f8af215bff299339348016f4 (diff) | |
| download | cygnal-b92a6303f1d02d8b583cd6b0509a80da76c8e3ea.tar.gz cygnal-b92a6303f1d02d8b583cd6b0509a80da76c8e3ea.tar.bz2 cygnal-b92a6303f1d02d8b583cd6b0509a80da76c8e3ea.zip | |
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.
| -rw-r--r-- | winsup/cygwin/fhandler_console.cc | 2 | ||||
| -rw-r--r-- | 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 */ |