Do proper non-blocking reads.

Spotted: drwilco Fixes: #914

Do proper non-blocking reads.
Spotted: drwilco Fixes: #914
50a77ab0 · Martin Blix Grydeland · effaadab · 50a77ab0
Commit 50a77ab0 authored May 31, 2011 by Martin Blix Grydeland
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

cli_common.c lib/libvarnish/cli_common.c +5 -5

No files found.
--- a/lib/libvarnish/cli_common.c
+++ b/lib/libvarnish/cli_common.c
@@ -123,12 +123,12 @@ read_tmo(int fd, char *ptr, unsigned len, double tmo)

 	pfd.fd = fd;
 	pfd.events = POLLIN;
-	i = poll(&pfd, 1, (int)(tmo * 1e3));
-	if (i == 0) {
-		errno = ETIMEDOUT;
-		return (-1);
-	}
 	for (j = 0; len > 0; ) {
+		i = poll(&pfd, 1, (int)(tmo * 1e3));
+		if (i == 0) {
+			errno = ETIMEDOUT;
+			return (-1);
+		}
 		i = read(fd, ptr, len);
 		if (i < 0)
 			return (i);