Porting changes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@12770 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,13 @@
+2002-02-26  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GSTcpPort.m: Fixes to work on mingw.
+	* Source/NSHost.m: Update for current winsock on mingw.
+	* Source/NSPortNameServer.m: Update for current winsock on mingw.
+	* Source/WindowsFileHandle.m: Fix to work for basic socket I/O.
+	* Tools/gdomap.c: many changes ... several fixes to work on mingw
+	rewrite some clumsy inefficient code, make variables and functions
+	local. etc.
+
 Mon Feb 25 15:26:38 2002  Nicola Pero  <nicola@brainstorm.co.uk>
 
 	* Source/NSBundle.m ([-initWithPath:]): Return nil if the path

Source/GSTcpPort.m

@@ -57,7 +57,7 @@
 #include <ctype.h>		/* for strchr() */
 #include <fcntl.h>
 #ifdef __MINGW__
-#include <winsock.h>
+#include <winsock2.h>
 #include <wininet.h>
 #include <process.h>
 #include <sys/time.h>

Source/GSUnixSSLHandle.m

@@ -45,7 +45,7 @@
 #include <Foundation/NSByteOrder.h>
 
 #if defined(__MINGW__)
-#include <winsock.h>
+#include <winsock2.h>
 #else
 #include <time.h>
 #include <sys/time.h>

Source/NSHost.m

@@ -38,7 +38,7 @@
 #include <Foundation/NSDebug.h>
 
 #if defined(__MINGW__)
-#include <winsock.h>
+#include <winsock2.h>
 #else
 #include <netdb.h>
 #if HAVE_UNISTD_H

Source/NSPortNameServer.m

@@ -44,7 +44,7 @@
 #include <Foundation/NSPortNameServer.h>
 #include <Foundation/NSDebug.h>
 #ifdef __MINGW__
-#include <winsock.h>
+#include <winsock2.h>
 #include <wininet.h>
 #else
 #include <netinet/in.h>

Source/UnixFileHandle.m

@@ -39,7 +39,7 @@
 #include <Foundation/NSByteOrder.h>
 
 #if defined(__MINGW__)
-#include <winsock.h>
+#include <winsock2.h>
 #else
 #include <time.h>
 #include <sys/time.h>

Source/WindowsFileHandle.m

@@ -37,7 +37,7 @@
 #include <Foundation/NSHost.h>
 #include <Foundation/NSByteOrder.h>
 
-#include <winsock.h>
+#include <winsock2.h>
 #include <fcntl.h>
 
 #include <sys/file.h>
@@ -202,6 +202,7 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin)
   self = [self initWithFileDescriptor: net closeOnDealloc: YES];
   if (self)
     {
+      [self setNonBlocking: NO];
       if (connect(net, (struct sockaddr*)&sin, sizeof(sin)) < 0)
 	{
 	  NSLog(@"unable to make connection to %s:%d - %s",
@@ -256,7 +257,8 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin)
 
       [self setNonBlocking: YES];
       if (connect(net, (struct sockaddr*)&sin, sizeof(sin)) < 0)
-	if (WSAGetLastError() == WSAEINPROGRESS)
+	{
+	  if (WSAGetLastError() != WSAEWOULDBLOCK)
 	    {
 	      NSLog(@"unable to make connection to %s:%d - %s",
 		inet_ntoa(sin.sin_addr),
@@ -264,6 +266,7 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin)
 	      [self release];
 	      return nil;
 	    }
+	}
 	
       info = [[NSMutableDictionary dictionaryWithCapacity: 4] retain];
       [info setObject: address forKey: NSFileHandleNotificationDataItem];
@@ -465,11 +468,14 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin)
   self = [super init];
   if (self)
     {
+#if 0
       struct stat sbuf;
 
+// FIXME
       if (fstat(desc, &sbuf) < 0)
 	{
-          NSLog(@"unable to get status of descriptor - %s", GSLastErrorStr(errno));
+          NSLog(@"unable to get status of descriptor - %s",
+	    GSLastErrorStr(errno));
 	  [self release];
 	  return nil;
 	}
@@ -477,18 +483,18 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin)
         isStandardFile = YES;
       else
         isStandardFile = NO;
-
+#else
-      dummy = 1;
+      isStandardFile = NO;
-#if 0
-      if (ioctlsocket(desc, FIONBIO, &dummy) >= 0)
-	{
-	  if (e & NBLK_OPT)
-	    wasNonBlocking = YES;
-	  else
-	    wasNonBlocking = NO;
-	}
 #endif
 
+      dummy = 0;
+      if (ioctlsocket(desc, FIONBIO, &dummy) < 0)
+        {
+          NSLog(@"unable to get blocking mode - %s", GSLastErrorStr(errno));
+	  wasNonBlocking = (dummy == 0) ? NO : YES;
+	  ioctlsocket(desc, FIONBIO, &dummy);	// Reset
+        }
+
       isNonBlocking = wasNonBlocking;
       descriptor = desc;
       closeOnDealloc = flag;
@@ -638,7 +644,7 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin)
     }
   else
     {
-      if ((len = read(descriptor, buf, sizeof(buf))) > 0)
+      if ((len = recv(descriptor, buf, sizeof(buf), 0)) > 0)
 	{
 	  [d appendBytes: buf length: len];
 	}
@@ -1214,7 +1220,7 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin)
 	  item = [readInfo objectForKey: NSFileHandleNotificationDataItem];
 	  length = [item length];
 
-	  received = read(descriptor, buf, sizeof(buf));
+	  received = recv(descriptor, buf, sizeof(buf), 0);
 	  if (received == 0)
 	    { // Read up to end of file.
 	      [self postReadNotification];
@@ -1261,7 +1267,16 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin)
 	    {
 	      int	written;
 
-	      written = write(descriptor, (char*)ptr+writePos, length-writePos);
+	      if (isStandardFile)
+		{
+		  written = write(descriptor, (char*)ptr+writePos,
+		    length-writePos);
+		}
+	      else
+		{
+		  written = send(descriptor, (char*)ptr+writePos,
+		    length-writePos, 0);
+		}
 	      if (written <= 0)
 		{
 		  if (written < 0 && errno != EAGAIN && errno != EINTR)
@@ -1336,17 +1351,22 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin)
   if (isStandardFile)
     return;
 
-  if (isNonBlocking == flag)
-    return;
-
-  dummy = 1;
   if (flag)
     {
+      dummy = 1;
       if (ioctlsocket(descriptor, FIONBIO, &dummy) < 0)
         {
           NSLog(@"unable to set non-blocking mode - %s", GSLastErrorStr(errno));
         }
     }
+  else
+    {
+      dummy = 0;
+      if (ioctlsocket(descriptor, FIONBIO, &dummy) < 0)
+        {
+          NSLog(@"unable to set blocking mode - %s", GSLastErrorStr(errno));
+        }
+    }
 }
 
 - (NSString*) socketAddress