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

Send event if an error occurs in -open

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24422 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2007-01-28 07:15:27 +00:00
parent f6b873822c
commit 7ccd13517b
3 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-01-28 Richard Frith-Macdonald <rfm@gnu.org>
* unix/NSStream.m:
* win32/NSStreamWin32.m:
Send event if an error occurs in the -open method.
2007-01-25 Richard Frith-Macdonald <rfm@gnu.org> 2007-01-25 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSUserDefaults.m: fix failure to unlock thread lock when * Source/NSUserDefaults.m: fix failure to unlock thread lock when

7
Source/unix/NSStream.m
View file

@ -360,6 +360,7 @@ static void setNonblocking(int fd)
if (fd < 0) if (fd < 0)
{ {
[self _recordError]; [self _recordError];
[self _sendEvent: NSStreamEventErrorOccurred];
return; return;
} }
_loopID = (void*)(intptr_t)fd; _loopID = (void*)(intptr_t)fd;
@ -472,6 +473,7 @@ static void setNonblocking(int fd)
return; return;
} }
[self _recordError]; [self _recordError];
[self _sendEvent: NSStreamEventErrorOccurred];
return; return;
} }
} }
@ -756,9 +758,10 @@ static void setNonblocking(int fd)
else else
flag = flag | O_TRUNC; flag = flag | O_TRUNC;
fd = open([_path fileSystemRepresentation], flag, mode); fd = open([_path fileSystemRepresentation], flag, mode);
if (fd< 0) if (fd < 0)
{ // make an error { // make an error
[self _recordError]; [self _recordError];
[self _sendEvent: NSStreamEventErrorOccurred];
return; return;
} }
_loopID = (void*)(intptr_t)fd; _loopID = (void*)(intptr_t)fd;
@ -917,6 +920,7 @@ static void setNonblocking(int fd)
return; return;
} }
[self _recordError]; [self _recordError];
[self _sendEvent: NSStreamEventErrorOccurred];
return; return;
} }
} }
@ -1450,6 +1454,7 @@ static void setNonblocking(int fd)
if (bindReturn < 0 || listenReturn < 0) if (bindReturn < 0 || listenReturn < 0)
{ {
[self _recordError]; [self _recordError];
[self _sendEvent: NSStreamEventErrorOccurred];
return; return;
} }
setNonblocking((intptr_t)_loopID); setNonblocking((intptr_t)_loopID);

8
Source/win32/NSStreamWin32.m
View file

@ -326,6 +326,7 @@ static void setNonblocking(SOCKET fd)
if (h == INVALID_HANDLE_VALUE) if (h == INVALID_HANDLE_VALUE)
{ {
[self _recordError]; [self _recordError];
[self _sendEvent: NSStreamEventErrorOccurred];
return; return;
} }
[self _setLoopID: (void*)h]; [self _setLoopID: (void*)h];
@ -765,6 +766,7 @@ static void setNonblocking(SOCKET fd)
&& WSAGetLastError() != WSAEWOULDBLOCK) && WSAGetLastError() != WSAEWOULDBLOCK)
{// make an error {// make an error
[self _recordError]; [self _recordError];
[self _sendEvent: NSStreamEventErrorOccurred];
return; return;
} }
// waiting on writable, as an indication of opened // waiting on writable, as an indication of opened
@ -1077,6 +1079,7 @@ static void setNonblocking(SOCKET fd)
if (h == INVALID_HANDLE_VALUE) if (h == INVALID_HANDLE_VALUE)
{ {
[self _recordError]; [self _recordError];
[self _sendEvent: NSStreamEventErrorOccurred];
return; return;
} }
else if (_shouldAppend == NO) else if (_shouldAppend == NO)
@ -1084,6 +1087,7 @@ static void setNonblocking(SOCKET fd)
if (SetEndOfFile(h) == 0) // Truncate to current file pointer (0) if (SetEndOfFile(h) == 0) // Truncate to current file pointer (0)
{ {
[self _recordError]; [self _recordError];
[self _sendEvent: NSStreamEventErrorOccurred];
} }
} }
[self _setLoopID: (void*)h]; [self _setLoopID: (void*)h];
@ -1539,6 +1543,7 @@ static void setNonblocking(SOCKET fd)
&& WSAGetLastError() != WSAEWOULDBLOCK) && WSAGetLastError() != WSAEWOULDBLOCK)
{// make an error {// make an error
[self _recordError]; [self _recordError];
[self _sendEvent: NSStreamEventErrorOccurred];
return; return;
} }
// waiting on writable, as an indication of opened // waiting on writable, as an indication of opened
@ -2231,6 +2236,7 @@ done:
if (bindReturn < 0 || listenReturn < 0) if (bindReturn < 0 || listenReturn < 0)
{ {
[self _recordError]; [self _recordError];
[self _sendEvent: NSStreamEventErrorOccurred];
return; return;
} }
setNonblocking(_sock); setNonblocking(_sock);
@ -2444,6 +2450,7 @@ done:
if (handle == INVALID_HANDLE_VALUE) if (handle == INVALID_HANDLE_VALUE)
{ {
[self _recordError]; [self _recordError];
[self _sendEvent: NSStreamEventErrorOccurred];
return; return;
} }
@ -2466,6 +2473,7 @@ done:
else if (errno != ERROR_IO_PENDING) else if (errno != ERROR_IO_PENDING)
{ {
[self _recordError]; [self _recordError];
[self _sendEvent: NSStreamEventErrorOccurred];
return; return;
} }
} }