drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ken Brown 2021-09-15 12:56:34 -04:00
parent 6e64fccb5f
commit 18fab2f834
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
winsup/cygwin/select.cc
View File

@ -753,8 +753,11 @@ out:
gotone += s->except_ready = true; gotone += s->except_ready = true;
return gotone; return gotone;
} }
gotone += s->write_ready = pipe_data_available (s->fd, fh, h, true); int n = pipe_data_available (s->fd, fh, h, true);
select_printf ("write: %s, gotone %d", fh->get_name (), gotone); 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; return gotone;
} }
@ -953,9 +956,11 @@ peek_fifo (select_record *s, bool from_select)
out: out:
if (s->write_selected) if (s->write_selected)
{ {
gotone += s->write_ready int n = pipe_data_available (s->fd, fh, fh->get_handle (), true);
= pipe_data_available (s->fd, fh, fh->get_handle (), true); select_printf ("write: %s, n %d", fh->get_name (), n);
select_printf ("write: %s, gotone %d", fh->get_name (), gotone); gotone += s->write_ready = n;
if (n < 0 && s->except_selected)
gotone += s->except_ready = true;
} }
return gotone; return gotone;
} }
@ -1394,8 +1399,11 @@ out:
HANDLE h = ptys->get_output_handle (); HANDLE h = ptys->get_output_handle ();
if (s->write_selected) if (s->write_selected)
{ {
gotone += s->write_ready = pipe_data_available (s->fd, fh, h, true); int n = pipe_data_available (s->fd, fh, h, true);
select_printf ("write: %s, gotone %d", fh->get_name (), gotone); 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; return gotone;
} }