From 84e2d2e6cffb7ac9c3f7d8f01e608cfad749f270 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 11 Jul 2008 16:37:29 +0000 Subject: [PATCH] * select.cc (peek_pipe): Temporarily revert patch from 2008-05-30. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/select.cc | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 416288ee7..2bb73d0e8 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2008-07-11 Corinna Vinschen + + * select.cc (peek_pipe): Temporarily revert patch from 2008-05-30. + 2008-07-11 Corinna Vinschen Change length for domain buffers from INTERNET_MAX_HOST_NAME_LENGTH to diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc index d11a1158e..874c14469 100644 --- 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 } }