From: Ben Pfaff <blp@nicira.com>
Date: Thu, 14 Aug 2008 23:18:46 +0000 (-0700)
Subject: Fix vlogconf EINTR error returns.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9159ab1402815cf212bd1992de9ed6abf6503abb;p=sliver-openvswitch.git

Fix vlogconf EINTR error returns.

Bug #111.
---

diff --git a/lib/vlog-socket.c b/lib/vlog-socket.c
index 49d9589d1..2428bfa6d 100644
--- a/lib/vlog-socket.c
+++ b/lib/vlog-socket.c
@@ -46,6 +46,7 @@
 #include "fatal-signal.h"
 #include "poll-loop.h"
 #include "socket-util.h"
+#include "timeval.h"
 #include "util.h"
 #include "vlog.h"
 
@@ -383,11 +384,11 @@ vlog_client_recv(struct vlog_client *client, char **reply)
 
     pfd.fd = client->fd;
     pfd.events = POLLIN;
-    nfds = poll(&pfd, 1, 1000);
+    nfds = time_poll(&pfd, 1, 1000);
     if (nfds == 0) {
         return ETIMEDOUT;
     } else if (nfds < 0) {
-        return errno;
+        return -nfds;
     }
 
     nbytes = read(client->fd, buffer, sizeof buffer - 1);