(main) [_WIN32]: Don't call WSAStartup() until after option

processing, so that we can version and help even when it fails.  Fix
program exit status on failure.

diff --git a/src/client/main.c b/src/client/main.c
index 1a9f11bc449750dcdb1839a4686d6e13d563da1c..bf49dd838cdbef4c49e64f0facbdbbc5334c56c2 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -125,12 +125,6 @@ main(int argc, char **argv)
      * after each prompt is required.
      */
     setvbuf(stdout, NULL, _IOLBF, 4096);
-    wVersionRequested = MAKEWORD(2, 0);
-    err = WSAStartup(wVersionRequested, &WsaData);
-    if (err != 0) {
-       printf("WSAStartup Failed, error code %d\n", err);
-       return FALSE;
-    }
 #else
     FD_ZERO(&mask);
     FD_ZERO(&savemask);
@@ -204,6 +198,15 @@ main(int argc, char **argv)
        exit(1);
     }
 
+#ifdef _WIN32
+    wVersionRequested = MAKEWORD(2, 0);
+    err = WSAStartup(wVersionRequested, &WsaData);
+    if (err != 0) {
+       printf("WSAStartup Failed, error code %d\n", err);
+       exit(1);
+    }
+#endif
+
     sock = tcp_connect(host, port);
 
     if (!login(sock, uname, country, passwd, send_kill, utf8)) {