diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2005-11-13 16:24:40 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2005-11-13 16:24:40 +0000 |
| commit | 6ba3f6bb2d088c7b5ffc84a6ed74ad3d525fde37 (patch) | |
| tree | 3cde8e0e13957e58867864e7e6c979e5c7ea6192 /winsup/cygwin | |
| parent | 5f2790492859fd5d6f61ec9ed95bf89f25c18111 (diff) | |
| download | cygnal-6ba3f6bb2d088c7b5ffc84a6ed74ad3d525fde37.tar.gz cygnal-6ba3f6bb2d088c7b5ffc84a6ed74ad3d525fde37.tar.bz2 cygnal-6ba3f6bb2d088c7b5ffc84a6ed74ad3d525fde37.zip | |
* fhandler_socket.cc (fhandler_socket::recvfrom): Just return 0 (EOF)
in case of WSAESHUTDOWN.
(fhandler_socket::recvmsg): Ditto.
* poll.cc (poll): Set revents to POLLIN instead of POLLHUP. Add comment.
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_socket.cc | 10 | ||||
| -rw-r--r-- | winsup/cygwin/poll.cc | 7 |
3 files changed, 22 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index ae5185eaf..836ad3c7d 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +2005-11-13 Corinna Vinschen <corinna@vinschen.de> + + * fhandler_socket.cc (fhandler_socket::recvfrom): Just return 0 (EOF) + in case of WSAESHUTDOWN. + (fhandler_socket::recvmsg): Ditto. + * poll.cc (poll): Set revents to POLLIN instead of POLLHUP. Add comment. + 2005-11-11 Christopher Faylor <cgf@timesys.com> * cygheap.h (init_cygheap::_gtod): Remove. diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 79b59ff9b..5ed7d041a 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -1061,6 +1061,11 @@ fhandler_socket::recvfrom (void *ptr, size_t len, int flags, if (WSAGetLastError () == WSAEMSGSIZE) return len; + /* ESHUTDOWN isn't defined for recv in SUSv3. Simply EOF is returned + in this case. */ + if (WSAGetLastError () == WSAESHUTDOWN) + return 0; + set_winsock_errno (); } else @@ -1142,6 +1147,11 @@ fhandler_socket::recvmsg (struct msghdr *msg, int flags, ssize_t tot) if (WSAGetLastError () == WSAEMSGSIZE) return len; + /* ESHUTDOWN isn't defined for recv in SUSv3. Simply EOF is returned + in this case. */ + if (WSAGetLastError () == WSAESHUTDOWN) + return 0; + set_winsock_errno (); } else diff --git a/winsup/cygwin/poll.cc b/winsup/cygwin/poll.cc index 633696c80..0ff62379e 100644 --- a/winsup/cygwin/poll.cc +++ b/winsup/cygwin/poll.cc @@ -118,8 +118,11 @@ poll (struct pollfd *fds, unsigned int nfds, int timeout) else fds[i].revents |= POLLIN; break; - case 0: /* Closed on the read side. */ - fds[i].revents |= POLLHUP; + case 0: /* Closed on the read side... */ + /* ...or shutdown(SHUT_WR) on the write side. + We set revents to POLLHUP until 1.5.18, but + this is semantically borderline. */ + fds[i].revents |= POLLIN; break; default: fds[i].revents |= POLLIN; |