X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32sck.c;h=0ce53c376b8cb3837475758c7faa06ba3b748c77;hb=2b7d8dfb16883bbf415fa28447ef22b443aa29c1;hp=2e4dc778250619fccf7e29b9d0023f6193e35f3a;hpb=0401f8415cd90e2eed98f1f8939fbc02af4a0c74;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/win32sck.c b/win32/win32sck.c
index 2e4dc77..0ce53c3 100644
--- a/win32/win32sck.c
+++ b/win32/win32sck.c
@@ -105,7 +105,7 @@ set_socktype(void)
 {
 #ifdef USE_SOCKETS_AS_HANDLES
 #if defined(USE_THREADS) || defined(USE_ITHREADS)
-    dTHX;
+    dTHXo;
     if (!w32_init_socktype) {
 #endif
 	int iSockOpt = SO_SYNCHRONOUS_NONALERT;
@@ -143,7 +143,7 @@ my_fdopen(int fd, char *mode)
     /*
      * If we get here, then fd is actually a socket.
      */
-    Newz(1310, fp, 1, FILE);
+    Newz(1310, fp, 1, FILE);	/* XXX leak, good thing this code isn't used */
     if(fp == NULL) {
 	errno = ENOMEM;
 	return NULL;
@@ -422,18 +422,28 @@ win32_socket(int af, int type, int protocol)
 int
 my_fclose (FILE *pf)
 {
-    int osf, retval;
+    int osf;
     if (!wsock_started)		/* No WinSock? */
 	return(fclose(pf));	/* Then not a socket. */
     osf = TO_SOCKET(fileno(pf));/* Get it now before it's gone! */
-    retval = fclose(pf);	/* Must fclose() before closesocket() */
-    if (osf != -1
-	&& closesocket(osf) == SOCKET_ERROR
-	&& WSAGetLastError() != WSAENOTSOCK)
-    {
-	return EOF;
+    if (osf != -1) {
+	int err;
+	win32_fflush(pf);
+	err = closesocket(osf);
+	if (err == 0) {
+	    (void)fclose(pf);	/* handle already closed, ignore error */
+	    return 0;
+	}
+	else if (err == SOCKET_ERROR) {
+	    err = WSAGetLastError();
+	    if (err != WSAENOTSOCK) {
+		(void)fclose(pf);
+		errno = err;
+		return EOF;
+	    }
+	}
     }
-    return retval;
+    return fclose(pf);
 }
 
 struct hostent *