don't say we have data/bytes available if an error occurred.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23241 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-08-10 06:23:08 +00:00
parent 8236d09007
commit 8fb233e3dc

View file

@ -405,7 +405,7 @@ static void setNonblocking(SOCKET fd)
- (BOOL) hasBytesAvailable - (BOOL) hasBytesAvailable
{ {
if ([self _isOpened] && [self streamStatus] != NSStreamStatusAtEnd) if ([self streamStatus] == NSStreamStatusOpen)
return YES; return YES;
return NO; return NO;
} }
@ -768,7 +768,7 @@ static void setNonblocking(SOCKET fd)
- (BOOL) hasBytesAvailable - (BOOL) hasBytesAvailable
{ {
if ([self _isOpened] && [self streamStatus] != NSStreamStatusAtEnd) if ([self streamStatus] == NSStreamStatusOpen)
return YES; return YES;
return NO; return NO;
} }
@ -802,7 +802,7 @@ static void setNonblocking(SOCKET fd)
{ {
error = WSAGetLastError(); error = WSAGetLastError();
} }
//else NSLog(@"EVENTS 0x%x on %p", events.lNetworkEvents, self); else NSLog(@"EVENTS 0x%x on %p", events.lNetworkEvents, self);
if ([self streamStatus] == NSStreamStatusOpening) if ([self streamStatus] == NSStreamStatusOpening)
{ {
@ -948,7 +948,7 @@ static void setNonblocking(SOCKET fd)
- (BOOL) hasSpaceAvailable - (BOOL) hasSpaceAvailable
{ {
if ([self _isOpened]) if ([self streamStatus] == NSStreamStatusOpen)
return YES; return YES;
return NO; return NO;
} }
@ -1061,7 +1061,7 @@ static void setNonblocking(SOCKET fd)
- (BOOL) hasSpaceAvailable - (BOOL) hasSpaceAvailable
{ {
if ([self _isOpened] && [self streamStatus] != NSStreamStatusWriting) if ([self streamStatus] == NSStreamStatusOpen)
return YES; return YES;
return NO; return NO;
} }
@ -1309,7 +1309,7 @@ static void setNonblocking(SOCKET fd)
- (BOOL) hasSpaceAvailable - (BOOL) hasSpaceAvailable
{ {
if ([self _isOpened]) if ([self streamStatus] == NSStreamStatusOpen)
return YES; return YES;
return NO; return NO;
} }
@ -1419,7 +1419,7 @@ static void setNonblocking(SOCKET fd)
{ {
error = WSAGetLastError(); error = WSAGetLastError();
} }
//else NSLog(@"EVENTS 0x%x on %p", events.lNetworkEvents, self); else NSLog(@"EVENTS 0x%x on %p", events.lNetworkEvents, self);
if ([self streamStatus] == NSStreamStatusOpening) if ([self streamStatus] == NSStreamStatusOpening)
{ {