aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2001-03-17 02:15:33 +0000
committerChristopher Faylor <me@cgf.cx>2001-03-17 02:15:33 +0000
commitddca580f9abc636905080a119d20461c34410bd1 (patch)
treebadd4b2c1f196e7b87351dc85cd41615cfa5b1d9
parented4c976cf2c59aac48823170908ed40cff9347d2 (diff)
downloadnewlib-ddca580f9abc636905080a119d20461c34410bd1.zip
newlib-ddca580f9abc636905080a119d20461c34410bd1.tar.gz
newlib-ddca580f9abc636905080a119d20461c34410bd1.tar.bz2
* fhandler_termios.cc (fhandler_termios::line_edit): Don't accept input when a
signal is sent or we'll end up in an EOF/signal race.
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/fhandler_termios.cc7
2 files changed, 7 insertions, 5 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index fbaeb19..a5ec80b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 16 21:13:23 2001 Christopher Faylor <cgf@cygnus.com>
+
+ * fhandler_termios.cc (fhandler_termios::line_edit): Don't accept input
+ when a signal is sent or we'll end up in an EOF/signal race.
+
Fri Mar 16 20:25:40 2001 Christopher Faylor <cgf@cygnus.com>
* path.cc: Translate scan states from defines to enums.
diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_termios.cc
index 7b8c71f..948de94 100644
--- a/winsup/cygwin/fhandler_termios.cc
+++ b/winsup/cygwin/fhandler_termios.cc
@@ -299,11 +299,8 @@ fhandler_termios::line_edit (const char *rptr, int nread, int always_accept)
set_input_done (ralen > 0);
if (sawsig)
- {
- // tc->write_error = EINTR;
- input_done = -1;
- }
- if (input_done)
+ input_done = -1;
+ else if (input_done)
(void) accept_input ();
return input_done;