* select.cc (cygwin_select): Make sure that 0 is returned when sel.wait times

out.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b16708e..7bcb6e3 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
 2011-12-08  Christopher Faylor  <me.cygwin2011@cgf.cx>
 
+       * select.cc (cygwin_select): Make sure that 0 is returned when sel.wait
+       times out.
+
+2011-12-08  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
        * include/sys/wait.h: Add in all c++ functions.
 
 2011-12-08  Christopher Faylor  <me.cygwin2011@cgf.cx>

diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index 242a160..e87e639 100644 (file)
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -147,12 +147,12 @@ cygwin_select (int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
        break;
       }
   else if ((sel.always_ready || ms == 0)
-          || (res = sel.wait (r, w, e, ms)) == 0)
+          || (res = sel.wait (r, w, e, ms)) >= 0)
     {
       copyfd_set (readfds, r, maxfds);
       copyfd_set (writefds, w, maxfds);
       copyfd_set (exceptfds, e, maxfds);
-      res = sel.poll (readfds, writefds, exceptfds);
+      res = (res > 0) ? 0 : sel.poll (readfds, writefds, exceptfds);
     }
 
   syscall_printf ("%R = select (%d, %p, %p, %p, %p)", res, maxfds, readfds,