From b9cd8fb5ff87cc260ea2fadb50f03f18c7833b6f Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 7 Oct 2004 08:03:24 +0000 Subject: * fhandler_tty.cc (fhandler_tty_slave::read): Use previously evaluated time_to_wait value. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/fhandler_tty.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * fhandler_tty.cc (fhandler_tty_slave::read): Use previously + evaluated time_to_wait value. + 2004-10-05 Pierre Humblet * 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); -- cgit v1.1