From 7616b79e0d61490999284b18cc0a75c1a2b46568 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 5 Jul 2011 18:01:13 +0000 Subject: [PATCH] * fhandler_console.cc (fhandler_console::input_tcsetattr): Make ENABLE_PROCESSED_INPUT flag only depending on value of IGNBRK. (fhandler_console::tcgetattr): Don't set ISIG depending on ENABLE_PROCESSED_INPUT, set IGNBRK instead. --- winsup/cygwin/ChangeLog | 7 +++++++ winsup/cygwin/fhandler_console.cc | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 71ea85ae3..e8c04a1ad 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +2011-07-05 Corinna Vinschen + + * fhandler_console.cc (fhandler_console::input_tcsetattr): Make + ENABLE_PROCESSED_INPUT flag only depending on value of IGNBRK. + (fhandler_console::tcgetattr): Don't set ISIG depending on + ENABLE_PROCESSED_INPUT, set IGNBRK instead. + 2011-07-05 Corinna Vinschen * security.cc (get_file_sd): Fix comment. diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 665e2b225..8eb96b9a7 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -970,7 +970,7 @@ fhandler_console::input_tcsetattr (int, struct termios const *t) flags &= ~ENABLE_ECHO_INPUT; } - if ((t->c_lflag & ISIG) && !(t->c_iflag & IGNBRK)) + if (!(t->c_iflag & IGNBRK)) { flags |= ENABLE_PROCESSED_INPUT; } @@ -1025,8 +1025,8 @@ fhandler_console::tcgetattr (struct termios *t) if (flags & ENABLE_LINE_INPUT) t->c_lflag |= ICANON; - if (flags & ENABLE_PROCESSED_INPUT) - t->c_lflag |= ISIG; + if (!(flags & ENABLE_PROCESSED_INPUT)) + t->c_iflag |= IGNBRK; /* What about ENABLE_WINDOW_INPUT and ENABLE_MOUSE_INPUT ? */