X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/783c82b3c5bb0f07deae79e012a864a54bec8749..6f3370a03ed6393c049a13b78d2188135624beea:/cmdline.c

diff --git a/cmdline.c b/cmdline.c
index cf114c0e..2c3b7ce5 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -105,15 +105,12 @@ int cmdline_get_passwd_input(prompts_t *p, unsigned char *in, int inlen) {
     if (tried_once)
 	return 0;
 
-    strncpy(p->prompts[0]->result, cmdline_password,
-	    p->prompts[0]->result_len);
-    p->prompts[0]->result[p->prompts[0]->result_len-1] = '\0';
+    prompt_set_result(p->prompts[0], cmdline_password);
     memset(cmdline_password, 0, strlen(cmdline_password));
     sfree(cmdline_password);
     cmdline_password = NULL;
     tried_once = 1;
     return 1;
-
 }
 
 /*
@@ -457,12 +454,13 @@ int cmdline_process_param(char *p, char *value, int need_save, Conf *conf)
     }
 
     if (!strcmp(p, "-i")) {
-	Filename fn;
+	Filename *fn;
 	RETURN(2);
 	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
 	SAVEABLE(0);
 	fn = filename_from_str(value);
-	conf_set_filename(conf, CONF_keyfile, &fn);
+	conf_set_filename(conf, CONF_keyfile, fn);
+        filename_free(fn);
     }
 
     if (!strcmp(p, "-4") || !strcmp(p, "-ipv4")) {
@@ -504,6 +502,10 @@ int cmdline_process_param(char *p, char *value, int need_save, Conf *conf)
 		    break;
 
 		  case '5':
+		  case '6':
+		  case '7':
+		  case '8':
+		  case '9':
 		    conf_set_int(conf, CONF_serdatabits, *nextitem-'0');
 		    break;