X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fclose.c;h=74a7adfbbc0ebf370976baa0e12f384508bb9925;hb=1a2869593e115e4a6c74aaa0b23ca612357403ce;hp=9b050668a8ba9dc3e6b936ec83843ed48910fa34;hpb=59a539f3e601f4639e67d9a6d2a20c9450e642f4;p=gnulib.git

diff --git a/lib/close.c b/lib/close.c
index 9b050668a..74a7adfbb 100644
--- a/lib/close.c
+++ b/lib/close.c
@@ -20,9 +20,46 @@
 #include <unistd.h>
 
 #if GNULIB_SYS_SOCKET
+# define WIN32_LEAN_AND_MEAN
 # include <sys/socket.h>
 #endif
 
+#if HAVE__GL_CLOSE_FD_MAYBE_SOCKET
+
+/* Get set_winsock_errno, FD_TO_SOCKET etc. */
+#include "w32sock.h"
+
+static int
+_gl_close_fd_maybe_socket (int fd)
+{
+  SOCKET sock = FD_TO_SOCKET (fd);
+  WSANETWORKEVENTS ev;
+
+  ev.lNetworkEvents = 0xDEADBEEF;
+  WSAEnumNetworkEvents (sock, NULL, &ev);
+  if (ev.lNetworkEvents != 0xDEADBEEF)
+    {
+      /* FIXME: other applications, like squid, use an undocumented
+	 _free_osfhnd free function.  But this is not enough: The 'osfile'
+	 flags for fd also needs to be cleared, but it is hard to access it.
+	 Instead, here we just close twice the file descriptor.  */
+      if (closesocket (sock))
+	{
+	  set_winsock_errno ();
+	  return -1;
+	}
+      else
+	{
+	  /* This call frees the file descriptor and does a
+	     CloseHandle ((HANDLE) _get_osfhandle (fd)), which fails.  */
+	  _close (fd);
+	  return 0;
+	}
+    }
+  else
+    return _close (fd);
+}
+#endif
 
 /* Override close() to call into other gnulib modules.  */