gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Generate end of stream events immediately on reading eof

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24882 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2007-03-16 17:54:16 +00:00
parent 33d157dffe
commit 7dcbcdd921
3 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-03-16 Richard Frith-Macdonald <rfm@gnu.org>
* Source/unix/NSStream.m:
* Source/win32/NSStreamWin32.m:
Try to ensure that end of stream events are sent reliably.
2007-03-15 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPropertyList.m: ([GSBinaryPLParser-readCountAt:])

20
Source/unix/NSStream.m
View file

@ -321,9 +321,15 @@ static void setNonblocking(int fd)
readLen = read((intptr_t)_loopID, buffer, len);
if (readLen < 0 && errno != EAGAIN && errno != EINTR)
[self _recordError];
{
[self _recordError];
readLen = -1;
}
else if (readLen == 0)
[self _setStatus: NSStreamStatusAtEnd];
{
[self _setStatus: NSStreamStatusAtEnd];
[self _sendEvent: NSStreamEventEndEncountered];
}
return readLen;
}
@ -518,9 +524,15 @@ static void setNonblocking(int fd)
readLen = read((intptr_t)_loopID, buffer, len);
if (readLen < 0 && errno != EAGAIN && errno != EINTR)
[self _recordError];
{
[self _recordError];
readLen = -1;
}
else if (readLen == 0)
[self _setStatus: NSStreamStatusAtEnd];
{
[self _setStatus: NSStreamStatusAtEnd];
[self _sendEvent: NSStreamEventEndEncountered];
}
return readLen;
}

7
Source/win32/NSStreamWin32.m
View file

@ -860,6 +860,7 @@ static void setNonblocking(SOCKET fd)
else if (readLen == 0)
{
[self _setStatus: NSStreamStatusAtEnd];
[self _sendEvent: NSStreamEventEndEncountered];
}
else
{
@ -1019,7 +1020,7 @@ static void setNonblocking(SOCKET fd)
{
_peerAddr.sin_family = AF_INET;
_peerAddr.sin_port = htons(port);
_peerAddr.sin_addr.s_addr = inet_addr(addr_c);
_peerAddr.sin_addr.s_addr = addr_c ? inet_addr(addr_c) : INADDR_NONE;
if (_peerAddr.sin_addr.s_addr == INADDR_NONE) // error
{
DESTROY(self);
@ -1758,7 +1759,7 @@ static void setNonblocking(SOCKET fd)
{
_peerAddr.sin_family = AF_INET;
_peerAddr.sin_port = htons(port);
_peerAddr.sin_addr.s_addr = inet_addr(addr_c);
_peerAddr.sin_addr.s_addr = addr_c ? inet_addr(addr_c) : INADDR_NONE;
if (_peerAddr.sin_addr.s_addr == INADDR_NONE) // error
{
DESTROY(self);
@ -2366,7 +2367,7 @@ done:
[super init];
_serverAddr.sin_family = AF_INET;
_serverAddr.sin_port = htons(port);
_serverAddr.sin_addr.s_addr = inet_addr(addr_c);
_serverAddr.sin_addr.s_addr = addr_c ? inet_addr(addr_c) : INADDR_NONE;
_sock = socket(AF_INET, SOCK_STREAM, 0);
if (_serverAddr.sin_addr.s_addr == INADDR_NONE || _loopID < 0) // error
{