closesocket.patch

diff --git a/nl-filesys.c b/nl-filesys.c
index 9af952c..f88d4d9 100644
--- a/nl-filesys.c
+++ b/nl-filesys.c
@@ -85,6 +85,7 @@ int setenv (const char *name, const char *value, int replace);

 #ifndef WINDOWS
 #include <sys/socket.h>
+#define closesocket(s) close(s)
 #define SOCKET_ERROR -1
 #define INVALID_SOCKET -1
 #endif
@@ -1347,7 +1348,7 @@ SPAWN_LIST * spawnList;
 while(mySpawnList != NULL)
     {
     if(sockFlag)
-        close(mySpawnList->socket);
+        closesocket(mySpawnList->socket);
     spawnList = mySpawnList->next;
     free(mySpawnList);
     mySpawnList = spawnList;
@@ -1476,7 +1477,7 @@ if(forkPid == 0) /* the child process */
     srandom(getpid());
     /* get parent pid */
     parentPid = pid;
-    if(sockets[0]) close(sockets[0]);
+    if(sockets[0]) closesocket(sockets[0]);
     thisSocket = sockets[1];
     /* purge inherited spawnlist */
     purgeSpawnList(FALSE);
@@ -1485,7 +1486,7 @@ if(forkPid == 0) /* the child process */
     exit(0);
     }

-if(sockets[1]) close(sockets[1]);
+if(sockets[1]) closesocket(sockets[1]);
 addSpawnedChild(address, symPtr, forkPid, sockets[0]);

 return(stuffInteger(forkPid));
diff --git a/nl-sock.c b/nl-sock.c
index 00efa7b..8c2e2e7 100644
--- a/nl-sock.c
+++ b/nl-sock.c
@@ -111,10 +111,9 @@ struct icmp
 #define MAX_PENDING_CONNECTS 128
 #define NO_FLAGS_SET 0

-#ifdef WINDOWS
-#define close closesocket
-#else
-#define SOCKET_ERROR -1
+#ifndef WINDOWS
+#define closesocket(s) close(s)
+#define SOCKET_ERROR   -1
 #define INVALID_SOCKET -1
 #endif

@@ -223,7 +222,7 @@ while(session)
             previous->next = session->next;
         if(session->stream != NULL)
             fclose(session->stream);
-        else close(handle);
+        else closesocket(handle);
         free((char *)session);
         return(TRUE);
         }
@@ -481,7 +480,7 @@ strncpy(remote_sun.sun_path, path, sizeof(remote_sun.sun_path) - 1);
 remote_sun.sun_path[sizeof (remote_sun.sun_path) - 1] = '\0';
 if (connect(sock, (struct sockaddr *)&remote_sun, SUN_LEN(&remote_sun)) == -1)
     {
-    close(sock);
+    closesocket(sock);
     netErrorIdx = ERR_INET_CONNECT_FAILED;
     return(SOCKET_ERROR);
     }
@@ -650,7 +649,7 @@ return(sock);

 CONNECT_FAILED:
 freeaddrinfo(res0);
-close(sock);
+closesocket(sock);
 return(SOCKET_ERROR);
 }

@@ -1065,7 +1064,7 @@ if(wait > 0)
         {
         if((elapsed = wait_ready(sock, wait, READY_READ)) <= 0)
                 {
-                close(sock);
+                closesocket(sock);
                 if(elapsed == 0) return(netError(ERR_INET_TIMEOUT));
                 else netError(ERR_INET_SELECT_FAILED);
                 }
@@ -1169,7 +1168,7 @@ else
     bytesSent = sendto((int)sock, buffer, size, NO_FLAGS_SET,
         (struct sockaddr *)destination, destination_len);

-if(type == SEND_TO_UDP) close((int)sock);
+if(type == SEND_TO_UDP) closesocket((int)sock);

 if(bytesSent == SOCKET_ERROR)
         return(netError(ERR_INET_WRITE));
@@ -1271,14 +1270,14 @@ if(bind(sock, (struct sockaddr *)&local_sun, sizeof(struct sockaddr_un)) == -1)
 if(bind(sock, (struct sockaddr *)&local_sun, SUN_LEN(&local_sun)) != 0)
 #endif
     {
-    close(sock);
+    closesocket(sock);
     netErrorIdx = ERR_INET_CANNOT_BIND;
     return(SOCKET_ERROR);
     }

 if(listen(sock, MAX_PENDING_CONNECTS) == SOCKET_ERROR)
     {
-    close(sock);
+    closesocket(sock);
     netErrorIdx = ERR_INET_LISTEN_FAILED;
     return(SOCKET_ERROR);
     }
@@ -1318,7 +1317,7 @@ setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const void*)&one, sizeof(one));

 if(bind(sock, (struct sockaddr *)local, local_len) == SOCKET_ERROR)
     {
-    close(sock);
+    closesocket(sock);
     netErrorIdx = ERR_INET_CANNOT_BIND;
     return(SOCKET_ERROR);
     }
@@ -1340,7 +1339,7 @@ if(stype == SOCK_STREAM)
     {
     if(listen(sock, MAX_PENDING_CONNECTS) == SOCKET_ERROR)
         {
-        close(sock);
+        closesocket(sock);
         netErrorIdx = ERR_INET_LISTEN_FAILED;
         return(SOCKET_ERROR);
         }
@@ -1660,7 +1659,7 @@ if( sendall(sock, "[cmd]\n", 6)  == SOCKET_ERROR ||
     sendall(sock, prog, size) == SOCKET_ERROR ||
     sendall(sock, "(exit)\n[/cmd]\n", 14) == SOCKET_ERROR )
     {
-    close(sock);
+    closesocket(sock);
     session->result = netEvalError(ERR_INET_WRITE);
     goto CONTINUE_CREATE_SESSION;
     }
@@ -2433,7 +2432,7 @@ return(fPtr);
 int win32_fclose(FILE * fPtr)
 {
 if(IOchannelIsSocketStream)
-   return(close(getSocket(fPtr)));
+   return(closesocket(getSocket(fPtr)));

 return(fclose(fPtr));
 }
@@ -2450,7 +2449,7 @@ pSize = strlen(buffer);

 if((pSize = sendall(getSocket(fPtr), buffer, pSize)) == SOCKET_ERROR)
      {
-     close(getSocket(fPtr));
+     closesocket(getSocket(fPtr));
      return(-1);
      }

@@ -2466,7 +2465,7 @@ if(!IOchannelIsSocketStream)

 if(recv(getSocket(fPtr), &chr, 1, NO_FLAGS_SET) <= 0)
     {
-    close(getSocket(fPtr));
+    closesocket(getSocket(fPtr));
     return(-1);
     }

@@ -2486,7 +2485,7 @@ while(bytesReceived < size)
     {
     if(recv(getSocket(fPtr), &chr, 1, NO_FLAGS_SET) <= 0)
         {
-        close(getSocket(fPtr));
+        closesocket(getSocket(fPtr));
         return(NULL);
         }

diff --git a/nl-web.c b/nl-web.c
index 518fca0..50f421c 100644
--- a/nl-web.c
+++ b/nl-web.c
@@ -37,10 +37,10 @@
 #define BUFFSIZE 10240

 #ifndef WINDOWS
+#define closesocket(s) close(s)
 #define SOCKET_ERROR -1
 #else
 #define fgets win32_fgets
-#define close closesocket
 #endif

 /* from nl-sock.c */
@@ -407,7 +407,7 @@ gettimeofday(&socketStart, NULL);
 /* connect to host */
 CONNECT_TO_HOST:
 if(sock)
-    close(sock);
+    closesocket(sock);


 if((sock = netConnect(pHost, pPort, SOCK_STREAM, NULL, timeout)) == SOCKET_ERROR)
@@ -459,7 +459,7 @@ else /* HTTP_GET, HTTP_DELETE */

 if(setjmp(socketTimeoutJump) != 0)
     {
-    if(sock) close(sock);
+    if(sock) closesocket(sock);
     if(resultPtr != NULL) free(resultPtr);
     return(webError(ERR_INET_TIMEOUT));
     }
@@ -643,7 +643,7 @@ else
     result->aux = resultSize + 1;
     }

-close(sock);
+closesocket(sock);

 if(listFlag)
     {
@@ -1016,7 +1016,7 @@ IOchannel = NULL;
 if(IOchannel != NULL && IOchannelIsSocketStream)
     {
     sendall(getSocket(IOchannel), content, size);
-    close(getSocket(IOchannel));
+    closesocket(getSocket(IOchannel));
     }
 else
     varPrintf(OUT_CONSOLE, "%s", content);