public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Ken Brown <kbrown@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: select: check for negative return from pipe_data_available
Date: Thu, 16 Sep 2021 12:56:25 +0000 (GMT) [thread overview]
Message-ID: <20210916125625.B899F3858C39@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=18fab2f834cce4f0494610cc3085c5a1c6649635
commit 18fab2f834cce4f0494610cc3085c5a1c6649635
Author: Ken Brown <kbrown@cornell.edu>
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;
}
reply other threads:[~2021-09-16 12:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210916125625.B899F3858C39@sourceware.org \
--to=kbrown@sourceware.org \
--cc=cygwin-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).