From 0407dc9e41c8a631a1681f13ee3b7e5e227d2ee7 Mon Sep 17 00:00:00 2001 From: CaS Date: Thu, 6 May 2004 12:10:03 +0000 Subject: [PATCH] Applied mingw fixes by Mateu Batle git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@19242 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Headers/Foundation/NSPort.h | 2 +- Source/NSSocketPort.m | 6 +++--- Source/NSUser.m | 4 ++++ Tools/gdomap.c | 6 +++--- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93a53a28c..8a49917f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-05-06 Mateu Batle + + * Tools/gdomap.c: mingw fixes. + * Headers/Foundation/NSPort.h: ditto + * Source/NSSocketPort.m: ditto + 2004-05-03 22:12 Alexander Malmberg * Source/NSString.m (-hash), diff --git a/Headers/Foundation/NSPort.h b/Headers/Foundation/NSPort.h index f8b581938..72d9d8c5d 100644 --- a/Headers/Foundation/NSPort.h +++ b/Headers/Foundation/NSPort.h @@ -124,7 +124,7 @@ typedef SOCKET NSSocketNativeHandle; - (void) addHandle: (GSTcpHandle*)handle forSend: (BOOL)send; - (NSString*) address; -- (void) getFds: (SOCKET*)fds count: (int*)count; +- (void) getFds: (int*)fds count: (int*)count; - (GSTcpHandle*) handleForPort: (NSSocketPort*)recvPort beforeDate: (NSDate*)when; - (void) handlePortMessage: (NSPortMessage*)m; diff --git a/Source/NSSocketPort.m b/Source/NSSocketPort.m index 6690dfd68..1d44fa0c3 100644 --- a/Source/NSSocketPort.m +++ b/Source/NSSocketPort.m @@ -611,7 +611,7 @@ static Class runLoopClass; desc, inet_ntoa(sockAddr.sin_addr), ntohs(sockAddr.sin_port)]; } -- (SOCKET) descriptor +- (int) descriptor { return desc; } @@ -1583,7 +1583,7 @@ static unsigned wordAlign; * This is a callback method used by the NSRunLoop class to determine which * descriptors to watch for the port. */ -- (void) getFds: (SOCKET*)fds count: (int*)count +- (void) getFds: (int*)fds count: (int*)count { NSMapEnumerator me; SOCKET sock; @@ -1894,7 +1894,7 @@ static unsigned wordAlign; handle->recvPort = nil; } NSMapRemove(handles, (void*)(gsaddr)[handle descriptor]); - if (listener < 0 && NSCountMapTable(handles) == 0) + if (((int) listener) < 0 && NSCountMapTable(handles) == 0) { [self invalidate]; } diff --git a/Source/NSUser.m b/Source/NSUser.m index 7e29bddd4..34da86f0d 100644 --- a/Source/NSUser.m +++ b/Source/NSUser.m @@ -851,6 +851,9 @@ NSTemporaryDirectory(void) perm = [[attr objectForKey: NSFilePosixPermissions] intValue]; perm = perm & 0777; +// Mateu Batle: secure temporary directories don't work in MinGW +#ifndef __MINGW__ + #if defined(__MINGW__) uid = owner; #else @@ -900,6 +903,7 @@ NSTemporaryDirectory(void) return nil; /* Not reached. */ } } +#endif if ([manager isWritableFileAtPath: tempDirName] == NO) { diff --git a/Tools/gdomap.c b/Tools/gdomap.c index e6b0b1184..5859bf0ea 100644 --- a/Tools/gdomap.c +++ b/Tools/gdomap.c @@ -1082,7 +1082,7 @@ init_iface() if (desc == INVALID_SOCKET) { - sprintf(ebuf, "Failed to get a socket. Error %s\n", WSAGetLastError()); + sprintf(ebuf, "Failed to get a socket. Error %d\n", WSAGetLastError()); gdomap_log(LOG_CRIT); exit(EXIT_FAILURE); } @@ -1091,7 +1091,7 @@ init_iface() if (WSAIoctl(desc, SIO_GET_INTERFACE_LIST, 0, 0, (void*)InterfaceList, sizeof(InterfaceList), &nBytesReturned, 0, 0) == SOCKET_ERROR) { - sprintf(ebuf, "Failed WSAIoctl. Error %s\n", WSAGetLastError()); + sprintf(ebuf, "Failed WSAIoctl. Error %d\n", WSAGetLastError()); gdomap_log(LOG_CRIT); exit(EXIT_FAILURE); } @@ -1159,7 +1159,7 @@ init_iface() if (addr[interfaces].s_addr == 0) { addr[interfaces].s_addr = htonl(0x8f000001); - fprintf(stderr, "Bad iface addr (0.0.0.0) guess (127.0.0.1)\n", + fprintf(stderr, "Bad iface addr (0.0.0.0) guess (%s)\n", inet_ntoa(addr[interfaces])); } if (mask[interfaces].s_addr == 0)