Fix for `psftp-pscp-ignore-load': Default Settings is now loaded

[u/mdw/putty] / plink.c

diff --git a/plink.c b/plink.c
index f0fe60c..3afd73c 100644 (file)
--- a/plink.c
+++ b/plink.c
@@ -1,11 +1,7 @@
 /*
- * PLink - a command-line (stdin/stdout) variant of PuTTY.
+ * PLink - a Windows command-line (stdin/stdout) variant of PuTTY.
  */
 
-#ifndef AUTO_WINSOCK
-#include <winsock2.h>
-#endif
-#include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -35,7 +31,6 @@ void fatalbox(char *p, ...)
     vfprintf(stderr, p, ap);
     va_end(ap);
     fputc('\n', stderr);
-    WSACleanup();
     cleanup_exit(1);
 }
 void modalfatalbox(char *p, ...)
@@ -46,7 +41,6 @@ void modalfatalbox(char *p, ...)
     vfprintf(stderr, p, ap);
     va_end(ap);
     fputc('\n', stderr);
-    WSACleanup();
     cleanup_exit(1);
 }
 void connection_fatal(void *frontend, char *p, ...)
@@ -57,7 +51,6 @@ void connection_fatal(void *frontend, char *p, ...)
     vfprintf(stderr, p, ap);
     va_end(ap);
     fputc('\n', stderr);
-    WSACleanup();
     cleanup_exit(1);
 }
 void cmdline_error(char *p, ...)
@@ -217,6 +210,7 @@ static void usage(void)
     printf("Usage: plink [options] [user@]host [command]\n");
     printf("       (\"host\" can also be a PuTTY saved session name)\n");
     printf("Options:\n");
+    printf("  -V        print version information\n");
     printf("  -v        show verbose messages\n");
     printf("  -load sessname  Load settings from saved session\n");
     printf("  -ssh -telnet -rlogin -raw\n");
@@ -227,11 +221,12 @@ static void usage(void)
     printf("  -batch    disable all interactive prompts\n");
     printf("The following options only apply to SSH connections:\n");
     printf("  -pw passw login with specified password\n");
-    printf("  -D listen-port   Dynamic SOCKS-based port forwarding\n");
-    printf("  -L listen-port:host:port   Forward local port to "
-          "remote address\n");
-    printf("  -R listen-port:host:port   Forward remote port to"
-          " local address\n");
+    printf("  -D [listen-IP:]listen-port\n");
+    printf("            Dynamic SOCKS-based port forwarding\n");
+    printf("  -L [listen-IP:]listen-port:host:port\n");
+    printf("            Forward local port to remote address\n");
+    printf("  -R [listen-IP:]listen-port:host:port\n");
+    printf("            Forward remote port to local address\n");
     printf("  -X -x     enable / disable X11 forwarding\n");
     printf("  -A -a     enable / disable agent forwarding\n");
     printf("  -t -T     enable / disable pty allocation\n");
@@ -242,6 +237,12 @@ static void usage(void)
     exit(1);
 }
 
+static void version(void)
+{
+    printf("plink: %s\n", ver);
+    exit(1);
+}
+
 char *do_select(SOCKET skt, int startup)
 {
     int events;
@@ -251,12 +252,12 @@ char *do_select(SOCKET skt, int startup)
     } else {
        events = 0;
     }
-    if (WSAEventSelect(skt, netevent, events) == SOCKET_ERROR) {
-       switch (WSAGetLastError()) {
+    if (p_WSAEventSelect(skt, netevent, events) == SOCKET_ERROR) {
+       switch (p_WSAGetLastError()) {
          case WSAENETDOWN:
            return "Network is down";
          default:
-           return "WSAAsyncSelect(): unknown error";
+           return "WSAEventSelect(): unknown error";
        }
     }
     return NULL;
@@ -264,8 +265,6 @@ char *do_select(SOCKET skt, int startup)
 
 int main(int argc, char **argv)
 {
-    WSADATA wsadata;
-    WORD winsock_ver;
     WSAEVENT stdinevent, stdoutevent, stderrevent;
     HANDLE handles[4];
     DWORD in_threadid, out_threadid, err_threadid;
@@ -296,6 +295,7 @@ int main(int argc, char **argv)
      * Process the command line.
      */
     do_defaults(NULL, &cfg);
+    loaded_session = FALSE;
     default_protocol = cfg.protocol;
     default_port = cfg.port;
     errors = 0;
@@ -334,6 +334,8 @@ int main(int argc, char **argv)
            } else if (!strcmp(p, "-s")) {
                /* Save status to write to cfg later. */
                use_subsystem = 1;
+           } else if (!strcmp(p, "-V")) {
+                version();
            } else {
                fprintf(stderr, "plink: unknown option \"%s\"\n", p);
                errors = 1;
@@ -408,13 +410,15 @@ int main(int argc, char **argv)
                         */
                        Config cfg2;
                        do_defaults(p, &cfg2);
-                       if (cfg2.host[0] == '\0') {
+                       if (loaded_session || cfg2.host[0] == '\0') {
                            /* No settings for this host; use defaults */
+                           /* (or session was already loaded with -load) */
                            strncpy(cfg.host, p, sizeof(cfg.host) - 1);
                            cfg.host[sizeof(cfg.host) - 1] = '\0';
                            cfg.port = default_port;
                        } else {
                            cfg = cfg2;
+                           /* Ick: patch up internal pointer after copy */
                            cfg.remote_cmd_ptr = cfg.remote_cmd;
                        }
                    } else {
@@ -545,22 +549,11 @@ int main(int argc, char **argv)
     if (portnumber != -1)
        cfg.port = portnumber;
 
-    /*
-     * Initialise WinSock.
-     */
-    winsock_ver = MAKEWORD(2, 0);
-    if (WSAStartup(winsock_ver, &wsadata)) {
-       MessageBox(NULL, "Unable to initialise WinSock", "WinSock Error",
-                  MB_OK | MB_ICONEXCLAMATION);
-       return 1;
-    }
-    if (LOBYTE(wsadata.wVersion) != 2 || HIBYTE(wsadata.wVersion) != 0) {
-       MessageBox(NULL, "WinSock version is incompatible with 2.0",
-                  "WinSock Error", MB_OK | MB_ICONEXCLAMATION);
-       WSACleanup();
+    sk_init();
+    if (p_WSAEventSelect == NULL) {
+       fprintf(stderr, "Plink requires WinSock 2\n");
        return 1;
     }
-    sk_init();
 
     /*
      * Start up the connection.
@@ -574,7 +567,7 @@ int main(int argc, char **argv)
            (GetFileType(GetStdHandle(STD_INPUT_HANDLE)) == FILE_TYPE_CHAR);
 
        error = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port,
-                          &realhost, nodelay);
+                          &realhost, nodelay, cfg.tcp_keepalives);
        if (error) {
            fprintf(stderr, "Unable to open connection:\n%s", error);
            return 1;
@@ -702,7 +695,7 @@ int main(int argc, char **argv)
                WPARAM wp;
                socket = sklist[i];
                wp = (WPARAM) socket;
-               if (!WSAEnumNetworkEvents(socket, NULL, &things)) {
+               if (!p_WSAEnumNetworkEvents(socket, NULL, &things)) {
                     static const struct { int bit, mask; } eventtypes[] = {
                         {FD_CONNECT_BIT, FD_CONNECT},
                         {FD_READ_BIT, FD_READ},
@@ -780,11 +773,11 @@ int main(int argc, char **argv)
            bufchain_size(&stderr_data) == 0)
            break;                     /* we closed the connection */
     }
-    WSACleanup();
     exitcode = back->exitcode(backhandle);
     if (exitcode < 0) {
        fprintf(stderr, "Remote process exit code unavailable\n");
        exitcode = 1;                  /* this is an error condition */
     }
-    return exitcode;
+    cleanup_exit(exitcode);
+    return 0;                         /* placate compiler warning */
 }