d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

accept() returns a file descriptor when it succeeds which is very

Browse Source 
likely to be non-zero.  When leaving the cancellation point, check
the return value against -1 to see if cancellation should be
checked.  While I'm here, make the same change to connect() just
to be consisitent.

Pointed out by: davidxu
This commit is contained in:
Daniel Eischen 2003-12-09 23:40:27 +00:00
parent 67ba867827
commit 6ed6ccb310
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libkse/thread/thr_accept.c
View File

@ -43,7 +43,7 @@ __accept(int s, struct sockaddr *addr, socklen_t *addrlen)
curthread = _get_curthread();
_thr_cancel_enter(curthread);
ret = __sys_accept(s, addr, addrlen);
_thr_cancel_leave(curthread, ret != 0);
_thr_cancel_leave(curthread, ret == -1);
return (ret);
}

2
lib/libkse/thread/thr_connect.c
View File

@ -43,7 +43,7 @@ __connect(int fd, const struct sockaddr *name, socklen_t namelen)
curthread = _get_curthread();
_thr_cancel_enter(curthread);
ret = __sys_connect(fd, name, namelen);
_thr_cancel_leave(curthread, ret != 0);
_thr_cancel_leave(curthread, ret == -1);
return (ret);
}

2
lib/libpthread/thread/thr_accept.c
View File

@ -43,7 +43,7 @@ __accept(int s, struct sockaddr *addr, socklen_t *addrlen)
curthread = _get_curthread();
_thr_cancel_enter(curthread);
ret = __sys_accept(s, addr, addrlen);
_thr_cancel_leave(curthread, ret != 0);
_thr_cancel_leave(curthread, ret == -1);
return (ret);
}

2
lib/libpthread/thread/thr_connect.c
View File

@ -43,7 +43,7 @@ __connect(int fd, const struct sockaddr *name, socklen_t namelen)
curthread = _get_curthread();
_thr_cancel_enter(curthread);
ret = __sys_connect(fd, name, namelen);
_thr_cancel_leave(curthread, ret != 0);
_thr_cancel_leave(curthread, ret == -1);
return (ret);
}