diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2000-11-07 23:01:09 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2000-11-07 23:01:09 +0300 |
| commit | 4c25744f8646215a655604ad1a9413db59d15de5 (patch) | |
| tree | 2e40e54ba37b6df6a3d79bced56582c6c7cd33b2 | |
| parent | 64ef9db779e3909490ece705c3b16e4a7319c59a (diff) | |
* autoload.cc: Add autoload statement for `WSASetLastError'.
* net.cc (cygwin_connect): Change error code to WSAEINPROGRESS
when connect returns WSAEWOULDBLOCK.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/autoload.cc | 1 | ||||
| -rw-r--r-- | winsup/cygwin/net.cc | 9 |
3 files changed, 15 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d55b6eef7..ac02b4038 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +Tue Nov 7 20:58:00 2000 Corinna Vinschen <corinna@vinschen.de> + + * autoload.cc: Add autoload statement for `WSASetLastError'. + * net.cc (cygwin_connect): Change error code to WSAEINPROGRESS + when connect returns WSAEWOULDBLOCK. + Mon Nov 6 15:11:57 2000 Christopher Faylor <cgf@cygnus.com> * dcrt0.cc (sigthread::init): Reinstitute sigthread lock as a critical diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc index 6f9344a43..e82aa5a42 100644 --- a/winsup/cygwin/autoload.cc +++ b/winsup/cygwin/autoload.cc @@ -275,6 +275,7 @@ LoadDLLinit (wsock32) LoadDLLfunc (WSAAsyncSelect, 16, wsock32) LoadDLLfunc (WSACleanup, 0, wsock32) LoadDLLfunc (WSAGetLastError, 0, wsock32) +LoadDLLfunc (WSASetLastError, 4, wsock32) LoadDLLfunc (WSAStartup, 8, wsock32) LoadDLLfunc (__WSAFDIsSet, 8, wsock32) LoadDLLfunc (accept, 12, wsock32) diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 9f0816bad..31c40296a 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -600,7 +600,14 @@ cygwin_connect (int fd, { res = connect (sock->get_socket (), (sockaddr *) &sin, namelen); if (res) - set_winsock_errno (); + { + /* Special handling for connect to return the correct error code + when called to early on a non-blocking socket. */ + if (WSAGetLastError () == WSAEWOULDBLOCK) + WSASetLastError (WSAEINPROGRESS); + + set_winsock_errno (); + } } return res; } |