summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog6
-rw-r--r--winsup/cygwin/fhandler_console.cc3
2 files changed, 8 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9c1fc2f47..7249f9d3d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,11 @@
2011-06-30 Corinna Vinschen <corinna@vinschen.de>
+ * fhandler_console.cc (fhandler_console::read): Add comment.
+ (fhandler_console::input_tcsetattr): Don't set ENABLE_PROCESSED_INPUT
+ if IGNBRK flag is set.
+
+2011-06-30 Corinna Vinschen <corinna@vinschen.de>
+
* dtable.cc (fh_oom): New static fhandler storage.
(fh_calloc): New static function. Add a comment to explain why this
is needed.
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index eb4a41f16..665e2b225 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -441,6 +441,7 @@ restart:
if (control_key_state & LEFT_ALT_PRESSED)
dev_state.nModifiers |= 8;
+ /* Allow Backspace to emit ^? and escape sequences. */
if (input_rec.Event.KeyEvent.wVirtualScanCode == 14)
{
char c = dev_state.backspace_keycode;
@@ -969,7 +970,7 @@ fhandler_console::input_tcsetattr (int, struct termios const *t)
flags &= ~ENABLE_ECHO_INPUT;
}
- if (t->c_lflag & ISIG)
+ if ((t->c_lflag & ISIG) && !(t->c_iflag & IGNBRK))
{
flags |= ENABLE_PROCESSED_INPUT;
}