Add a load of new command-line options pilfered from OpenSSH. Full

list is: -A, -a, -X, -x, -T, -t, -C, -1, -2, -i keyfile.

git-svn-id: svn://svn.tartarus.org/sgt/putty@1817 cda61777-01e9-0310-a592-d414129be87e

diff --git a/cmdline.c b/cmdline.c
index f26625b..572a433 100644 (file)
--- a/cmdline.c
+++ b/cmdline.c
@@ -222,7 +222,7 @@ int cmdline_process_param(char *p, char *value, int need_save)
        cfg.remote_cmd_ptr2 = NULL;\r
        cfg.nopty = TRUE;      /* command => no terminal */\r
     }\r
-    if (!strcmp(p, "-P")) {\r
+    if (!strcmp(p, "-P") || !strcmp(p, "-p")) {\r
        RETURN(2);\r
        SAVEABLE(2);                   /* lower priority than -ssh,-telnet */\r
        cfg.port = atoi(value);\r
@@ -233,6 +233,64 @@ int cmdline_process_param(char *p, char *value, int need_save)
        ssh_get_line = cmdline_get_line;\r
        ssh_getline_pw_only = TRUE;\r
     }\r
+\r
+    if (!strcmp(p, "-A")) {\r
+       RETURN(1);\r
+       SAVEABLE(1);\r
+       cfg.agentfwd = 1;\r
+    }\r
+    if (!strcmp(p, "-a")) {\r
+       RETURN(1);\r
+       SAVEABLE(1);\r
+       cfg.agentfwd = 0;\r
+    }\r
+\r
+    if (!strcmp(p, "-X")) {\r
+       RETURN(1);\r
+       SAVEABLE(1);\r
+       cfg.x11_forward = 1;\r
+    }\r
+    if (!strcmp(p, "-x")) {\r
+       RETURN(1);\r
+       SAVEABLE(1);\r
+       cfg.x11_forward = 0;\r
+    }\r
+\r
+    if (!strcmp(p, "-t")) {\r
+       RETURN(1);\r
+       SAVEABLE(1);\r
+       cfg.nopty = 0;\r
+    }\r
+    if (!strcmp(p, "-T")) {\r
+       RETURN(1);\r
+       SAVEABLE(1);\r
+       cfg.nopty = 1;\r
+    }\r
+\r
+    if (!strcmp(p, "-C")) {\r
+       RETURN(1);\r
+       SAVEABLE(1);\r
+       cfg.compression = 1;\r
+    }\r
+\r
+    if (!strcmp(p, "-1")) {\r
+       RETURN(1);\r
+       SAVEABLE(1);\r
+       cfg.sshprot = 0;               /* ssh protocol 1 only */\r
+    }\r
+    if (!strcmp(p, "-2")) {\r
+       RETURN(1);\r
+       SAVEABLE(1);\r
+       cfg.sshprot = 3;               /* ssh protocol 2 only */\r
+    }\r
+\r
+    if (!strcmp(p, "-i")) {\r
+       RETURN(2);\r
+       SAVEABLE(1);\r
+       strncpy(cfg.keyfile, value, sizeof(cfg.keyfile));\r
+       cfg.keyfile[sizeof(cfg.keyfile)-1] = '\0';\r
+    }\r
+\r
     return ret;                               /* unrecognised */\r
 }\r
 \r