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

dscho · dscho · commit 75cea84f08df · 2025-01-26T21:52:57.000+01:00
Fix SSH hangs
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
@@ -784,7 +784,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;
     }
@@ -998,7 +998,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;
     }
@@ -1424,7 +1424,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
`@@ -784,7 +784,7 @@ peek_pipe (select_record *s, bool from_select)`
`784`	`784`	`}`
`785`	`785`	`ssize_t n = pipe_data_available (s->fd, fh, h, PDA_SELECT \| PDA_WRITE);`
`786`	`786`	`select_printf ("write: %s, n %d", fh->get_name (), n);`
`787`		`- gotone += s->write_ready = (n >= PIPE_BUF);`
	`787`	`+ gotone += s->write_ready = (n > 0);`
`788`	`788`	`if (n < 0 && s->except_selected)`
`789`	`789`	`gotone += s->except_ready = true;`
`790`	`790`	`}`
`@@ -998,7 +998,7 @@ peek_fifo (select_record *s, bool from_select)`
`998`	`998`	`ssize_t n = pipe_data_available (s->fd, fh, fh->get_handle (),`
`999`	`999`	`PDA_SELECT \| PDA_WRITE);`
`1000`	`1000`	`select_printf ("write: %s, n %d", fh->get_name (), n);`
`1001`		`- gotone += s->write_ready = (n >= PIPE_BUF);`
	`1001`	`+ gotone += s->write_ready = (n > 0);`
`1002`	`1002`	`if (n < 0 && s->except_selected)`
`1003`	`1003`	`gotone += s->except_ready = true;`
`1004`	`1004`	`}`
`@@ -1424,7 +1424,7 @@ peek_pty_slave (select_record *s, bool from_select)`
`1424`	`1424`	`{`
`1425`	`1425`	`ssize_t n = pipe_data_available (s->fd, fh, h, PDA_SELECT \| PDA_WRITE);`
`1426`	`1426`	`select_printf ("write: %s, n %d", fh->get_name (), n);`
`1427`		`- gotone += s->write_ready = (n >= PIPE_BUF);`
	`1427`	`+ gotone += s->write_ready = (n > 0);`
`1428`	`1428`	`if (n < 0 && s->except_selected)`
`1429`	`1429`	`gotone += s->except_ready = true;`
`1430`	`1430`	`}`