xread: retry after poll on EAGAIN/EWOULDBLOCK

Eric Wong · gitster · commit c22f6202052c · 2016-06-27T08:33:21.000-07:00
We should continue to loop after EAGAIN/EWOULDBLOCK as the intent of xread is to try until there is available data, EOF, or an unrecoverable error. Fixes: 1079c4b ("xread: poll on non blocking fds") Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/wrapper.c b/wrapper.c
@@ -252,6 +252,7 @@ ssize_t xread(int fd, void *buf, size_t len)
 				 * call to read(2).
 				 */
 				poll(&pfd, 1, -1);
+				continue;
 			}
 		}
 		return nr;

Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,7 @@ ssize_t xread(int fd, void *buf, size_t len)`
`252`	`252`	`* call to read(2).`
`253`	`253`	`*/`
`254`	`254`	`poll(&pfd, 1, -1);`
	`255`	`+ continue;`
`255`	`256`	`}`
`256`	`257`	`}`
`257`	`258`	`return nr;`