A zero timeout in the VCLI functions should mean "infinity".

This fixes "varnishadm -t 0"
varnish · Jun 2, 2011 · 4ea9641 · 4ea9641
1 parent 31a65a9
commit 4ea9641
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/libvarnish/cli_common.c b/lib/libvarnish/cli_common.c
@@ -118,13 +118,17 @@ VCLI_WriteResult(int fd, const struct cli *cli)
 static int
 read_tmo(int fd, char *ptr, unsigned len, double tmo)
 {
-	int i, j;
+	int i, j, to;
 	struct pollfd pfd;
 
+	if (tmo > 0) 
+		to = tmo * 1e3;
+	else
+		to = -1;
 	pfd.fd = fd;
 	pfd.events = POLLIN;
 	for (j = 0; len > 0; ) {
-		i = poll(&pfd, 1, (int)(tmo * 1e3));
+		i = poll(&pfd, 1, to);
 		if (i == 0) {
 			errno = ETIMEDOUT;
 			return (-1);