* select.cc (verify_console): New function.

(verify_windows): Ditto.
(fhandler_console::select_read): Really do need to verify that there is
something to read.
(fhandler_console::select_windows): Ditto.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index afb46cadd8798305d7df6ce6392a4166da2590cc..507c58ce16b99c5af87c86e7cfb80938f615a66c 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-03  Christopher Faylor  <cgf@redhat.com>
+
+       * select.cc (verify_console): New function.
+       (verify_windows): Ditto.
+       (fhandler_console::select_read): Really do need to verify that there is
+       something to read.
+       (fhandler_console::select_windows): Ditto.
+
 2001-11-03  Christopher Faylor  <cgf@redhat.com>
 
        * fhandler.h (fhandler_base::ready_for_read): Remove unused argument.

diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index f25baaefd0bbd07744df89b9e18512fb503e0f63..37fe2f1898a5e96f7ee9f948e6b4da90ce9e7867 100644 (file)
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -659,6 +659,14 @@ peek_console (select_record *me, bool)
 
   return me->write_ready;
 }
+ 
+static int
+verify_console (select_record *me, fd_set *rfds, fd_set *wfds,
+             fd_set *efds)
+{
+  return peek_console (me, true);
+}
+
 
 select_record *
 fhandler_console::select_read (select_record *s)
@@ -667,7 +675,7 @@ fhandler_console::select_read (select_record *s)
     {
       s = new select_record;
       s->startup = no_startup;
-      s->verify = verify_ok;
+      s->verify = verify_console;
       set_cursor_maybe ();
     }
 
@@ -1439,6 +1447,13 @@ peek_windows (select_record *me, bool)
   return me->write_ready;
 }
 
+static int
+verify_windows (select_record *me, fd_set *rfds, fd_set *wfds,
+               fd_set *efds)
+{
+  return peek_windows (me, true);
+}
+
 select_record *
 fhandler_windows::select_read (select_record *s)
 {
@@ -1446,8 +1461,8 @@ fhandler_windows::select_read (select_record *s)
     {
       s = new select_record;
       s->startup = no_startup;
-      s->verify = verify_ok;
     }
+  s->verify = verify_windows;
   s->peek = peek_windows;
   s->read_selected = true;
   s->read_ready = false;