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 --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 96a8729e898414f846f88256ebf19aadb5aed020..0b33a13708f1fc571b7828191f0ccd3fb2408c61 100644 (file)
--- 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 244147a808d3e228a08778527dc9af8b9211412d..4358bceec94c4f29de48ec5bcddb85629852b0e1 100644 (file)
--- 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 */