* select.cc (peek_pipe): Temporarily revert patch from 2008-05-30.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 416288e..2bb73d0 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,9 @@
 2008-07-11  Corinna Vinschen  <corinna@vinschen.de>
 
+       * select.cc (peek_pipe): Temporarily revert patch from 2008-05-30.
+
+2008-07-11  Corinna Vinschen  <corinna@vinschen.de>
+
        Change length for domain buffers from INTERNET_MAX_HOST_NAME_LENGTH to
        MAX_DOMAIN_NAME_LEN throughout.
        * cyglsa.h (CYG_LSA_MAGIC): New value.

diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index d11a115..874c144 100644 (file)
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -506,6 +506,10 @@ out:
                       fh->get_name ());
       else
        {
+#if 0
+/* FIXME: This code is not quite correct.  There's no better solution
+   so far but to make simple assumptions based on WriteQuotaAvailable. */
+
          IO_STATUS_BLOCK iosb = {0};
          FILE_PIPE_LOCAL_INFORMATION fpli = {0};
 
@@ -535,10 +539,6 @@ out:
                             fpli.WriteQuotaAvailable);
              gotone += s->write_ready = true;
            }
-#if 0
-/* FIXME: This code is not quite correct.  There's no better solution
-   so far but to make simple assumptions based on WriteQuotaAvailable. */
-
          /* If we somehow inherit a tiny pipe (size < PIPE_BUF), then consider
             the pipe writable only if it is completely empty, to minimize the
             probability that a subsequent write will block.  */
@@ -551,6 +551,8 @@ out:
                             fpli.WriteQuotaAvailable);
              gotone += s->write_ready = true;
            }
+#else
+         gotone += s->write_ready = true;
 #endif
        }
     }