* 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;
{
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;
ret = x; \
} while (0)
-int cmdline_process_param(char *p, char *value, int need_save)
+int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
{
int ret = 0;
if (!strcmp(p, "-load")) {
RETURN(2);
- SAVEABLE(0); /* very high priority */
- do_defaults(value, &cfg);
+ /* 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);
- default_protocol = cfg.protocol = PROT_SSH;
- default_port = cfg.port = 22;
+ 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);
- default_protocol = cfg.protocol = PROT_TELNET;
- default_port = cfg.port = 23;
+ 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);
- default_protocol = cfg.protocol = PROT_RLOGIN;
- default_port = cfg.port = 513;
+ 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);
- default_protocol = cfg.protocol = PROT_RAW;
+ SAVEABLE(0);
+ default_protocol = cfg->protocol = PROT_RAW;
}
if (!strcmp(p, "-v")) {
RETURN(1);
}
if (!strcmp(p, "-l")) {
RETURN(2);
- SAVEABLE(1);
- strncpy(cfg.username, value, sizeof(cfg.username));
- cfg.username[sizeof(cfg.username) - 1] = '\0';
+ SAVEABLE(0);
+ strncpy(cfg->username, value, sizeof(cfg->username));
+ cfg->username[sizeof(cfg->username) - 1] = '\0';
}
if ((!strcmp(p, "-L") || !strcmp(p, "-R"))) {
char *fwd, *ptr, *q, *qq;
int i=0;
RETURN(2);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
- SAVEABLE(1);
+ SAVEABLE(0);
fwd = value;
- ptr = cfg.portfwd;
+ ptr = cfg->portfwd;
/* if multiple forwards, find end of list */
if (ptr[0]=='R' || ptr[0]=='L') {
- for (i = 0; i < sizeof(cfg.portfwd) - 2; i++)
+ for (i = 0; i < sizeof(cfg->portfwd) - 2; i++)
if (ptr[i]=='\000' && ptr[i+1]=='\000')
break;
ptr = ptr + i + 1; /* point to next forward slot */
}
ptr[0] = p[1]; /* insert a 'L' or 'R' at the start */
- if (strlen(fwd) > sizeof(cfg.portfwd) - i - 2) {
+ if (strlen(fwd) > sizeof(cfg->portfwd) - i - 2) {
cmdline_error("out of space for port forwardings");
return ret;
}
- strncpy(ptr+1, fwd, sizeof(cfg.portfwd) - i);
+ strncpy(ptr+1, fwd, sizeof(cfg->portfwd) - i);
/*
* We expect _at least_ two colons in this string. The
* possible formats are `sourceport:desthost:destport', or
qq = qqq;
}
if (q) *q = '\t'; /* replace second-last colon with \t */
- cfg.portfwd[sizeof(cfg.portfwd) - 1] = '\0';
- cfg.portfwd[sizeof(cfg.portfwd) - 2] = '\0';
+ cfg->portfwd[sizeof(cfg->portfwd) - 1] = '\0';
+ cfg->portfwd[sizeof(cfg->portfwd) - 2] = '\0';
ptr[strlen(ptr)+1] = '\000'; /* append two '\000' */
}
if (!strcmp(p, "-m")) {
RETURN(2);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
- SAVEABLE(1);
+ SAVEABLE(0);
filename = value;
d = 0;
if (cmdlen >= cmdsize) {
cmdsize = cmdlen + 512;
- command = srealloc(command, cmdsize);
+ command = sresize(command, cmdsize, char);
}
command[cmdlen++] = d;
} while (c != EOF);
- cfg.remote_cmd_ptr = command;
- cfg.remote_cmd_ptr2 = NULL;
- cfg.nopty = TRUE; /* command => no terminal */
+ cfg->remote_cmd_ptr = command;
+ cfg->remote_cmd_ptr2 = NULL;
+ cfg->nopty = TRUE; /* command => no terminal */
}
if (!strcmp(p, "-P")) {
RETURN(2);
- SAVEABLE(2); /* lower priority than -ssh,-telnet */
- cfg.port = atoi(value);
+ SAVEABLE(1); /* lower priority than -ssh,-telnet */
+ cfg->port = atoi(value);
}
if (!strcmp(p, "-pw")) {
RETURN(2);
if (!strcmp(p, "-A")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
- SAVEABLE(1);
- cfg.agentfwd = 1;
+ SAVEABLE(0);
+ cfg->agentfwd = 1;
}
if (!strcmp(p, "-a")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
- SAVEABLE(1);
- cfg.agentfwd = 0;
+ SAVEABLE(0);
+ cfg->agentfwd = 0;
}
if (!strcmp(p, "-X")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
- SAVEABLE(1);
- cfg.x11_forward = 1;
+ SAVEABLE(0);
+ cfg->x11_forward = 1;
}
if (!strcmp(p, "-x")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
- SAVEABLE(1);
- cfg.x11_forward = 0;
+ SAVEABLE(0);
+ cfg->x11_forward = 0;
}
if (!strcmp(p, "-t")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
- SAVEABLE(1);
- cfg.nopty = 0;
+ SAVEABLE(0);
+ cfg->nopty = 0;
}
if (!strcmp(p, "-T")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
- SAVEABLE(1);
- cfg.nopty = 1;
+ SAVEABLE(0);
+ cfg->nopty = 1;
}
if (!strcmp(p, "-C")) {
RETURN(1);
- SAVEABLE(1);
- cfg.compression = 1;
+ SAVEABLE(0);
+ cfg->compression = 1;
}
if (!strcmp(p, "-1")) {
RETURN(1);
- SAVEABLE(1);
- cfg.sshprot = 0; /* ssh protocol 1 only */
+ SAVEABLE(0);
+ cfg->sshprot = 0; /* ssh protocol 1 only */
}
if (!strcmp(p, "-2")) {
RETURN(1);
- SAVEABLE(1);
- cfg.sshprot = 3; /* ssh protocol 2 only */
+ SAVEABLE(0);
+ cfg->sshprot = 3; /* ssh protocol 2 only */
}
if (!strcmp(p, "-i")) {
RETURN(2);
- SAVEABLE(1);
- strncpy(cfg.keyfile, value, sizeof(cfg.keyfile));
- cfg.keyfile[sizeof(cfg.keyfile)-1] = '\0';
+ SAVEABLE(0);
+ cfg->keyfile = filename_from_str(value);
}
return ret; /* unrecognised */
}
-void cmdline_run_saved(void)
+void cmdline_run_saved(Config *cfg)
{
int pri, i;
for (pri = 0; pri < NPRIORITIES; pri++)
for (i = 0; i < saves[pri].nsaved; i++)
cmdline_process_param(saves[pri].params[i].p,
- saves[pri].params[i].value, 0);
+ saves[pri].params[i].value, 0, cfg);
}
projects / u / mdw / putty / blobdiff