From 47497ee19d5d180045485e323ff66be819ba104b Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Thu, 8 Mar 2018 21:47:39 +0100 Subject: [PATCH] ws: report the correct error when WSAStartup() fails --- src/error.c | 7 ++++++- src/ws.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/error.c b/src/error.c index 6b81179..373fd41 100644 --- a/src/error.c +++ b/src/error.c @@ -87,6 +87,7 @@ X(WSAEFAULT, EFAULT) \ X(WSAEHOSTDOWN, EHOSTUNREACH) \ X(WSAEHOSTUNREACH, EHOSTUNREACH) \ + X(WSAEINPROGRESS, EBUSY) \ X(WSAEINTR, EINTR) \ X(WSAEINVAL, EINVAL) \ X(WSAEISCONN, EISCONN) \ @@ -98,9 +99,13 @@ X(WSAENOTCONN, ENOTCONN) \ X(WSAENOTSOCK, ENOTSOCK) \ X(WSAEOPNOTSUPP, EOPNOTSUPP) \ + X(WSAEPROCLIM, ENOMEM) \ X(WSAESHUTDOWN, EPIPE) \ X(WSAETIMEDOUT, ETIMEDOUT) \ - X(WSAEWOULDBLOCK, EWOULDBLOCK) + X(WSAEWOULDBLOCK, EWOULDBLOCK) \ + X(WSANOTINITIALISED, ENETDOWN) \ + X(WSASYSNOTREADY, ENETDOWN) \ + X(WSAVERNOTSUPPORTED, ENOSYS) errno_t err_map_win_error_to_errno(DWORD error) { switch (error) { diff --git a/src/ws.c b/src/ws.c index 4260b28..774a269 100644 --- a/src/ws.c +++ b/src/ws.c @@ -8,7 +8,7 @@ int ws_global_init(void) { r = WSAStartup(MAKEWORD(2, 2), &wsa_data); if (r != 0) - return_error(-1); + return_error(-1, r); return 0; }