Merge pull request #75 from dscho/fix-ssh-hangs

dscho · web-flow · commit 7913a41703db · 2024-10-10T22:48:02.000+02:00
Fix SSH hangs
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
@@ -776,7 +776,7 @@ peek_pipe (select_record *s, bool from_select)
 	}
       ssize_t n = pipe_data_available (s->fd, fh, h, PDA_SELECT | PDA_WRITE);
       select_printf ("write: %s, n %d", fh->get_name (), n);
-      gotone += s->write_ready = (n >= PIPE_BUF);
+      gotone += s->write_ready = (n > 0);
       if (n < 0 && s->except_selected)
 	gotone += s->except_ready = true;
     }
@@ -990,7 +990,7 @@ peek_fifo (select_record *s, bool from_select)
       ssize_t n = pipe_data_available (s->fd, fh, fh->get_handle (),
 				       PDA_SELECT | PDA_WRITE);
       select_printf ("write: %s, n %d", fh->get_name (), n);
-      gotone += s->write_ready = (n >= PIPE_BUF);
+      gotone += s->write_ready = (n > 0);
       if (n < 0 && s->except_selected)
 	gotone += s->except_ready = true;
     }
@@ -1416,7 +1416,7 @@ peek_pty_slave (select_record *s, bool from_select)
     {
       ssize_t n = pipe_data_available (s->fd, fh, h, PDA_SELECT | PDA_WRITE);
       select_printf ("write: %s, n %d", fh->get_name (), n);
-      gotone += s->write_ready = (n >= PIPE_BUF);
+      gotone += s->write_ready = (n > 0);
       if (n < 0 && s->except_selected)
 	gotone += s->except_ready = true;
     }

Original file line number	Diff line number	Diff line change
`@@ -776,7 +776,7 @@ peek_pipe (select_record *s, bool from_select)`
`776`	`776`	`}`
`777`	`777`	`ssize_t n = pipe_data_available (s->fd, fh, h, PDA_SELECT \| PDA_WRITE);`
`778`	`778`	`select_printf ("write: %s, n %d", fh->get_name (), n);`
`779`		`- gotone += s->write_ready = (n >= PIPE_BUF);`
	`779`	`+ gotone += s->write_ready = (n > 0);`
`780`	`780`	`if (n < 0 && s->except_selected)`
`781`	`781`	`gotone += s->except_ready = true;`
`782`	`782`	`}`
`@@ -990,7 +990,7 @@ peek_fifo (select_record *s, bool from_select)`
`990`	`990`	`ssize_t n = pipe_data_available (s->fd, fh, fh->get_handle (),`
`991`	`991`	`PDA_SELECT \| PDA_WRITE);`
`992`	`992`	`select_printf ("write: %s, n %d", fh->get_name (), n);`
`993`		`- gotone += s->write_ready = (n >= PIPE_BUF);`
	`993`	`+ gotone += s->write_ready = (n > 0);`
`994`	`994`	`if (n < 0 && s->except_selected)`
`995`	`995`	`gotone += s->except_ready = true;`
`996`	`996`	`}`
`@@ -1416,7 +1416,7 @@ peek_pty_slave (select_record *s, bool from_select)`
`1416`	`1416`	`{`
`1417`	`1417`	`ssize_t n = pipe_data_available (s->fd, fh, h, PDA_SELECT \| PDA_WRITE);`
`1418`	`1418`	`select_printf ("write: %s, n %d", fh->get_name (), n);`
`1419`		`- gotone += s->write_ready = (n >= PIPE_BUF);`
	`1419`	`+ gotone += s->write_ready = (n > 0);`
`1420`	`1420`	`if (n < 0 && s->except_selected)`
`1421`	`1421`	`gotone += s->except_ready = true;`
`1422`	`1422`	`}`