From 6bb769efa0a993613e311a586362dbd780a41ca5 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sat, 6 Jul 2002 11:16:07 +0000 Subject: * fhandler.h (fhandler_socket::is_unconnected): Constify. (fhandler_socket::is_connect_pending): Ditto. (fhandler_socket::is_connected): Ditto. (fhandler_socket::set_connect_state): New method. (struct select_record): Add member `except_on_write'. (select_record::select_record): Initialize all bool values to `false'. * fhandler_socket.cc: Use set_connect_state() method throughout. (fhandler_socket::connect): Set state always to connected if connection isn't pending. * net.cc (cygwin_getsockopt): Revert erroneous previous patch. * select.cc (set_bits): Check for `except_on_write'. Set fd in write_fds if set. Set connect state to connected if fd has been returned by WINSOCK_SELECT. (peek_socket): Check for `except_on_write'. (start_thread_socket): Ditto. (fhandler_socket::select_write): Don't set `write_ready' if connect is pending. Set `except_on_write' if connect is pending. --- winsup/cygwin/net.cc | 2 -- 1 file changed, 2 deletions(-) (limited to 'winsup/cygwin/net.cc') diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 1445ae683..870bf7865 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -712,8 +712,6 @@ cygwin_getsockopt (int fd, int level, int optname, void *optval, int *optlen) if (optname == SO_ERROR) { int *e = (int *) optval; - if (!*e && fh->is_connect_pending ()) - *e = WSAEINPROGRESS; *e = find_winsock_errno (*e); } -- cgit v1.2.3