From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2210) id B899F3858C39; Thu, 16 Sep 2021 12:56:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B899F3858C39 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ken Brown To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: select: check for negative return from pipe_data_available X-Act-Checkin: newlib-cygwin X-Git-Author: Ken Brown X-Git-Refname: refs/heads/master X-Git-Oldrev: 6e64fccb5f181f632494f88208eea84c1bedf99f X-Git-Newrev: 18fab2f834cce4f0494610cc3085c5a1c6649635 Message-Id: <20210916125625.B899F3858C39@sourceware.org> Date: Thu, 16 Sep 2021 12:56:25 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2021 12:56:25 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=18fab2f834cce4f0494610cc3085c5a1c6649635 commit 18fab2f834cce4f0494610cc3085c5a1c6649635 Author: Ken Brown Date: Wed Sep 15 12:56:34 2021 -0400 Cygwin: select: check for negative return from pipe_data_available Make sure except_ready is set (if except_selected) on a negative return from pipe_data_available. Diff: --- winsup/cygwin/select.cc | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc index 566cf66d6..33c0c0bb0 100644 --- a/winsup/cygwin/select.cc +++ b/winsup/cygwin/select.cc @@ -753,8 +753,11 @@ out: gotone += s->except_ready = true; return gotone; } - gotone += s->write_ready = pipe_data_available (s->fd, fh, h, true); - select_printf ("write: %s, gotone %d", fh->get_name (), gotone); + int n = pipe_data_available (s->fd, fh, h, true); + select_printf ("write: %s, n %d", fh->get_name (), n); + gotone += s->write_ready = n; + if (n < 0 && s->except_selected) + gotone += s->except_ready = true; } return gotone; } @@ -953,9 +956,11 @@ peek_fifo (select_record *s, bool from_select) out: if (s->write_selected) { - gotone += s->write_ready - = pipe_data_available (s->fd, fh, fh->get_handle (), true); - select_printf ("write: %s, gotone %d", fh->get_name (), gotone); + int n = pipe_data_available (s->fd, fh, fh->get_handle (), true); + select_printf ("write: %s, n %d", fh->get_name (), n); + gotone += s->write_ready = n; + if (n < 0 && s->except_selected) + gotone += s->except_ready = true; } return gotone; } @@ -1394,8 +1399,11 @@ out: HANDLE h = ptys->get_output_handle (); if (s->write_selected) { - gotone += s->write_ready = pipe_data_available (s->fd, fh, h, true); - select_printf ("write: %s, gotone %d", fh->get_name (), gotone); + int n = pipe_data_available (s->fd, fh, h, true); + select_printf ("write: %s, n %d", fh->get_name (), n); + gotone += s->write_ready = n; + if (n < 0 && s->except_selected) + gotone += s->except_ready = true; } return gotone; }