X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/9a30e26b7801d63e4ccfe8d36169299c09b89dff..46a3419bd5693b8b3e42290e370d10aa82c67b61:/cmdline.c

diff --git a/cmdline.c b/cmdline.c
index 0361b884..0038ad17 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -16,9 +16,14 @@
  * local modifications such as -L are evaluated; and if you specify
  * a protocol and a port, the protocol is set up first so that the
  * port can override its choice of port number.
+ * 
+ * (In fact -load is not saved at all, since in at least Plink the
+ * processing of further command-line options depends on whether or
+ * not the loaded session contained a hostname. So it must be
+ * executed immediately.)
  */
 
-#define NPRIORITIES 3
+#define NPRIORITIES 2
 
 struct cmdline_saved_param {
     char *p, *value;
@@ -38,9 +43,8 @@ static void cmdline_save_param(char *p, char *value, int pri)
 {
     if (saves[pri].nsaved >= saves[pri].savesize) {
 	saves[pri].savesize = saves[pri].nsaved + 32;
-	saves[pri].params =
-	    srealloc(saves[pri].params,
-		     saves[pri].savesize*sizeof(*saves[pri].params));
+	saves[pri].params = sresize(saves[pri].params, saves[pri].savesize,
+				    struct cmdline_saved_param);
     }
     saves[pri].params[saves[pri].nsaved].p = p;
     saves[pri].params[saves[pri].nsaved].value = value;
@@ -107,6 +111,7 @@ static int cmdline_check_unavailable(int flag, char *p)
 #define RETURN(x) do { \
     if ((x) == 2 && !value) return -2; \
     ret = x; \
+    if (need_save < 0) return x; \
 } while (0)
 
 int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
@@ -115,38 +120,39 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
 
     if (!strcmp(p, "-load")) {
 	RETURN(2);
-	SAVEABLE(0);		       /* very high priority */
+	/* This parameter must be processed immediately rather than being
+	 * saved. */
 	do_defaults(value, cfg);
 	return 2;
     }
     if (!strcmp(p, "-ssh")) {
 	RETURN(1);
-	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	default_protocol = cfg->protocol = PROT_SSH;
 	default_port = cfg->port = 22;
 	return 1;
     }
     if (!strcmp(p, "-telnet")) {
 	RETURN(1);
-	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	default_protocol = cfg->protocol = PROT_TELNET;
 	default_port = cfg->port = 23;
 	return 1;
     }
     if (!strcmp(p, "-rlogin")) {
 	RETURN(1);
-	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	default_protocol = cfg->protocol = PROT_RLOGIN;
 	default_port = cfg->port = 513;
 	return 1;
     }
     if (!strcmp(p, "-raw")) {
 	RETURN(1);
-	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	default_protocol = cfg->protocol = PROT_RAW;
     }
     if (!strcmp(p, "-v")) {
@@ -155,7 +161,8 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
     }
     if (!strcmp(p, "-l")) {
 	RETURN(2);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	strncpy(cfg->username, value, sizeof(cfg->username));
 	cfg->username[sizeof(cfg->username) - 1] = '\0';
     }
@@ -163,8 +170,8 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
 	char *fwd, *ptr, *q, *qq;
 	int i=0;
 	RETURN(2);
-	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	fwd = value;
 	ptr = cfg->portfwd;
 	/* if multiple forwards, find end of list */
@@ -208,8 +215,8 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
 	int c, d;
 
 	RETURN(2);
-	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 
 	filename = value;
 
@@ -228,7 +235,7 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
 		d = 0;
 	    if (cmdlen >= cmdsize) {
 		cmdsize = cmdlen + 512;
-		command = srealloc(command, cmdsize);
+		command = sresize(command, cmdsize, char);
 	    }
 	    command[cmdlen++] = d;
 	} while (c != EOF);
@@ -238,11 +245,13 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
     }
     if (!strcmp(p, "-P")) {
 	RETURN(2);
-	SAVEABLE(2);		       /* lower priority than -ssh,-telnet */
+	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+	SAVEABLE(1);		       /* lower priority than -ssh,-telnet */
 	cfg->port = atoi(value);
     }
     if (!strcmp(p, "-pw")) {
 	RETURN(2);
+	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
 	cmdline_password = value;
 	ssh_get_line = cmdline_get_line;
 	ssh_getline_pw_only = TRUE;
@@ -250,63 +259,67 @@ int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
 
     if (!strcmp(p, "-A")) {
 	RETURN(1);
-	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	cfg->agentfwd = 1;
     }
     if (!strcmp(p, "-a")) {
 	RETURN(1);
-	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	cfg->agentfwd = 0;
     }
 
     if (!strcmp(p, "-X")) {
 	RETURN(1);
-	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	cfg->x11_forward = 1;
     }
     if (!strcmp(p, "-x")) {
 	RETURN(1);
-	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	cfg->x11_forward = 0;
     }
 
     if (!strcmp(p, "-t")) {
 	RETURN(1);
-	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	cfg->nopty = 0;
     }
     if (!strcmp(p, "-T")) {
 	RETURN(1);
-	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	cfg->nopty = 1;
     }
 
     if (!strcmp(p, "-C")) {
 	RETURN(1);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	cfg->compression = 1;
     }
 
     if (!strcmp(p, "-1")) {
 	RETURN(1);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	cfg->sshprot = 0;	       /* ssh protocol 1 only */
     }
     if (!strcmp(p, "-2")) {
 	RETURN(1);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	cfg->sshprot = 3;	       /* ssh protocol 2 only */
     }
 
     if (!strcmp(p, "-i")) {
 	RETURN(2);
-	SAVEABLE(1);
+	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
 	cfg->keyfile = filename_from_str(value);
     }