From 54aefcc6bc3422afd8b59b000202e17bf3baab2d Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 1 Apr 2004 09:48:15 +0000 Subject: * fhandler_socket.cc (fhandler_socket::sendto): Drop out of loop if has_been_closed gets set. (fhandler_socket::sendmsg): Ditto. * net.cc (wsock_event::wait): Don't initialize evts. Don't try to evaluate network events if WSAEnumNetworkEvents fails. (wsock_event::release): Save last WSA error and set it again unless resetting to blocking socket fails. * wsock_event.h (class wsock_event): Remove destructor. --- winsup/cygwin/fhandler_socket.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/fhandler_socket.cc') diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 952b87b82..878880da0 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -953,7 +953,8 @@ fhandler_socket::sendto (const void *ptr, size_t len, int flags, break; } } - while (!(res = wsock_evt.wait (get_socket (), has_been_closed))); + while (!(res = wsock_evt.wait (get_socket (), has_been_closed)) + && !has_been_closed); wsock_evt.release (get_socket ()); } } @@ -1088,7 +1089,8 @@ fhandler_socket::sendmsg (const struct msghdr *msg, int flags, ssize_t tot) break; } } - while (!(res = wsock_evt.wait (get_socket (), has_been_closed))); + while (!(res = wsock_evt.wait (get_socket (), has_been_closed)) + && !has_been_closed); wsock_evt.release (get_socket ()); } } -- cgit v1.2.3