gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-20 20:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

([GSFileHandle -gcFinalize]): if __MINGW__ also

Browse source 
close ordinary file descriptor, not only the socket.
([GSFileHandle -closeFile]): in __MINGW__ defined block:
changed test of !isStandardFile to isSocket, and make sure that the
ordinary file descriptor is also closed.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@19784 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
wim 2004-07-28 11:36:09 +00:00
parent 0f67f2c129
commit 206cc783e7
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/GSFileHandle.m
View file

@ -297,12 +297,11 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin)
{ {
#if defined(__MINGW__) #if defined(__MINGW__)
if (isSocket) if (isSocket)
closesocket((SOCKET)_get_osfhandle(descriptor)); {
else closesocket((SOCKET)_get_osfhandle(descriptor));
close(descriptor); }
#else
close(descriptor);
#endif #endif
close(descriptor);
descriptor = -1; descriptor = -1;
} }
} }
@ -1688,17 +1687,12 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
} }
#endif #endif
#if defined(__MINGW__) #if defined(__MINGW__)
if (isStandardFile) if (isSocket)
{
(void)_close(descriptor);
}
else
{ {
(void)closesocket((SOCKET)_get_osfhandle(descriptor)); (void)closesocket((SOCKET)_get_osfhandle(descriptor));
} }
#else
(void)close(descriptor);
#endif #endif
(void)close(descriptor);
descriptor = -1; descriptor = -1;
acceptOK = NO; acceptOK = NO;
connectOK = NO; connectOK = NO;