From: Yoann Vandoorselaere <yoann.v@prelude-ids.com>
Date: Thu, 11 Sep 2008 16:09:17 +0000 (+0200)
Subject: poll: fix polling unconnected server sockets on WIN32
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2075aae40d2ce87695428cfbe1c5f00ec27e1f55;p=pspp

poll: fix polling unconnected server sockets on WIN32

2008-09-11  Yoann Vandoorselaere  <yoann.v@prelude-ids.com>

	* lib/poll.c (poll): Fix polling unconnected server sockets on WIN32.
---

diff --git a/ChangeLog b/ChangeLog
index 4ffbb6fff1..3375a19d4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-11  Yoann Vandoorselaere  <yoann.v@prelude-ids.com>
+
+	* lib/poll.c (poll): Fix polling unconnected server sockets on WIN32.
+
 2008-09-11  Jim Meyering  <meyering@redhat.com>
 
 	* users.txt: Add gtk-vnc.
diff --git a/lib/poll.c b/lib/poll.c
index 4a62dc1df1..e0714f09a9 100644
--- a/lib/poll.c
+++ b/lib/poll.c
@@ -180,6 +180,12 @@ poll (pfd, nfd, timeout)
 #else
 	    char data[64];
 	    r = recv (pfd[i].fd, data, sizeof (data), MSG_PEEK);
+            
+# ifdef WIN32
+	    if (r < 0 && GetLastError() == 10057) /* server socket */
+              socket_errno = ENOTCONN;
+	    else
+# endif
 	    socket_errno = (r < 0) ? errno : 0;
 #endif
 	    if (r == 0)