aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2004-10-07 08:03:24 +0000
committerCorinna Vinschen <corinna@vinschen.de>2004-10-07 08:03:24 +0000
commitb9cd8fb5ff87cc260ea2fadb50f03f18c7833b6f (patch)
tree61a578b2b2398fb16028ddcf669e0de5b8dc243e
parent72db1c11e9887439125ce798bb1b6d571fe7d840 (diff)
downloadnewlib-b9cd8fb5ff87cc260ea2fadb50f03f18c7833b6f.zip
newlib-b9cd8fb5ff87cc260ea2fadb50f03f18c7833b6f.tar.gz
newlib-b9cd8fb5ff87cc260ea2fadb50f03f18c7833b6f.tar.bz2
* fhandler_tty.cc (fhandler_tty_slave::read): Use previously
evaluated time_to_wait value.
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/fhandler_tty.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ac3b8ac..8ded614 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-07 Mark Paulus <mark.paulus@mci.com>
+
+ * fhandler_tty.cc (fhandler_tty_slave::read): Use previously
+ evaluated time_to_wait value.
+
2004-10-05 Pierre Humblet <pierre.humblet@ieee.org>
* external.cc (check_ntsec): Do not call wincap.has_security.
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 3506381..c64aac7 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -765,7 +765,7 @@ fhandler_tty_slave::read (void *ptr, size_t& len)
w4[0] = signal_arrived;
w4[1] = input_available_event;
- DWORD waiter = !ptr ? 0 : INFINITE;
+ DWORD waiter = time_to_wait;
while (len)
{
rc = WaitForMultipleObjects (2, w4, FALSE, waiter);