Been meaning to do this for years: introduce a configuration option

[u/mdw/putty] / cmdline.c

diff --git a/cmdline.c b/cmdline.c
index 79f2981..e0d4392 100644 (file)
--- a/cmdline.c
+++ b/cmdline.c
@@ -203,6 +203,13 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
        strncpy(cfg->username, value, sizeof(cfg->username));
        cfg->username[sizeof(cfg->username) - 1] = '\0';
     }
+    if (!strcmp(p, "-loghost")) {
+       RETURN(2);
+       UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+       SAVEABLE(0);
+       strncpy(cfg->loghost, value, sizeof(cfg->loghost));
+       cfg->loghost[sizeof(cfg->loghost) - 1] = '\0';
+    }
     if ((!strcmp(p, "-L") || !strcmp(p, "-R") || !strcmp(p, "-D"))) {
        char *fwd, *ptr, *q, *qq;
        int dynamic, i=0;
@@ -263,8 +270,8 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
            unsigned len = portp - host;
            if (len >= sizeof(cfg->ssh_nc_host))
                len = sizeof(cfg->ssh_nc_host) - 1;
-           strncpy(cfg->ssh_nc_host, value, len);
-           cfg->ssh_nc_host[sizeof(cfg->ssh_nc_host) - 1] = '\0';
+           memcpy(cfg->ssh_nc_host, value, len);
+           cfg->ssh_nc_host[len] = '\0';
            cfg->ssh_nc_port = atoi(portp+1);
        } else {
            cmdline_error("-nc expects argument of form 'host:port'");
@@ -315,19 +322,33 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
     if (!strcmp(p, "-pw")) {
        RETURN(2);
        UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
-       cmdline_password = value;
+       SAVEABLE(1);
+       /* We delay evaluating this until after the protocol is decided,
+        * so that we can warn if it's of no use with the selected protocol */
+       if (cfg->protocol != PROT_SSH)
+           cmdline_error("the -pw option can only be used with the "
+                         "SSH protocol");
+       else {
+           cmdline_password = dupstr(value);
+           /* Assuming that `value' is directly from argv, make a good faith
+            * attempt to trample it, to stop it showing up in `ps' output
+            * on Unix-like systems. Not guaranteed, of course. */
+           memset(value, 0, strlen(value));
+       }
     }
 
     if (!strcmp(p, "-agent") || !strcmp(p, "-pagent") ||
        !strcmp(p, "-pageant")) {
        RETURN(1);
        UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+       SAVEABLE(0);
        cfg->tryagent = TRUE;
     }
     if (!strcmp(p, "-noagent") || !strcmp(p, "-nopagent") ||
        !strcmp(p, "-nopageant")) {
        RETURN(1);
        UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+       SAVEABLE(0);
        cfg->tryagent = FALSE;
     }
 
@@ -360,13 +381,13 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
     if (!strcmp(p, "-t")) {
        RETURN(1);
        UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
-       SAVEABLE(0);
+       SAVEABLE(1);    /* lower priority than -m */
        cfg->nopty = 0;
     }
     if (!strcmp(p, "-T")) {
        RETURN(1);
        UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
-       SAVEABLE(0);
+       SAVEABLE(1);
        cfg->nopty = 1;
     }