summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
875e0b1)
never deferred, but is evaluated instantly. This _should_ fix all
the irritating problems with (for example) proxy settings and saved
sessions not playing nicely. Or it may have some other ghastly side-
effect I haven't considered; really I ought to have been keeping
better track of all the problems in this area :-(
git-svn-id: svn://svn.tartarus.org/sgt/putty@2976
cda61777-01e9-0310-a592-
d414129be87e
* 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.
* 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.)
struct cmdline_saved_param {
char *p, *value;
struct cmdline_saved_param {
char *p, *value;
if (!strcmp(p, "-load")) {
RETURN(2);
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);
do_defaults(value, cfg);
return 2;
}
if (!strcmp(p, "-ssh")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
default_protocol = cfg->protocol = PROT_SSH;
default_port = cfg->port = 22;
return 1;
default_protocol = cfg->protocol = PROT_SSH;
default_port = cfg->port = 22;
return 1;
if (!strcmp(p, "-telnet")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
if (!strcmp(p, "-telnet")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
default_protocol = cfg->protocol = PROT_TELNET;
default_port = cfg->port = 23;
return 1;
default_protocol = cfg->protocol = PROT_TELNET;
default_port = cfg->port = 23;
return 1;
if (!strcmp(p, "-rlogin")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
if (!strcmp(p, "-rlogin")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
default_protocol = cfg->protocol = PROT_RLOGIN;
default_port = cfg->port = 513;
return 1;
default_protocol = cfg->protocol = PROT_RLOGIN;
default_port = cfg->port = 513;
return 1;
if (!strcmp(p, "-raw")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
if (!strcmp(p, "-raw")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
default_protocol = cfg->protocol = PROT_RAW;
}
if (!strcmp(p, "-v")) {
default_protocol = cfg->protocol = PROT_RAW;
}
if (!strcmp(p, "-v")) {
}
if (!strcmp(p, "-l")) {
RETURN(2);
}
if (!strcmp(p, "-l")) {
RETURN(2);
strncpy(cfg->username, value, sizeof(cfg->username));
cfg->username[sizeof(cfg->username) - 1] = '\0';
}
strncpy(cfg->username, value, sizeof(cfg->username));
cfg->username[sizeof(cfg->username) - 1] = '\0';
}
int i=0;
RETURN(2);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
int i=0;
RETURN(2);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
fwd = value;
ptr = cfg->portfwd;
/* if multiple forwards, find end of list */
fwd = value;
ptr = cfg->portfwd;
/* if multiple forwards, find end of list */
RETURN(2);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
RETURN(2);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
}
if (!strcmp(p, "-P")) {
RETURN(2);
}
if (!strcmp(p, "-P")) {
RETURN(2);
- SAVEABLE(2); /* lower priority than -ssh,-telnet */
+ SAVEABLE(1); /* lower priority than -ssh,-telnet */
cfg->port = atoi(value);
}
if (!strcmp(p, "-pw")) {
cfg->port = atoi(value);
}
if (!strcmp(p, "-pw")) {
if (!strcmp(p, "-A")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
if (!strcmp(p, "-A")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
cfg->agentfwd = 1;
}
if (!strcmp(p, "-a")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
cfg->agentfwd = 1;
}
if (!strcmp(p, "-a")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
cfg->agentfwd = 0;
}
if (!strcmp(p, "-X")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
cfg->agentfwd = 0;
}
if (!strcmp(p, "-X")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
cfg->x11_forward = 1;
}
if (!strcmp(p, "-x")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
cfg->x11_forward = 1;
}
if (!strcmp(p, "-x")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
cfg->x11_forward = 0;
}
if (!strcmp(p, "-t")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
cfg->x11_forward = 0;
}
if (!strcmp(p, "-t")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
cfg->nopty = 0;
}
if (!strcmp(p, "-T")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
cfg->nopty = 0;
}
if (!strcmp(p, "-T")) {
RETURN(1);
UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
cfg->nopty = 1;
}
if (!strcmp(p, "-C")) {
RETURN(1);
cfg->nopty = 1;
}
if (!strcmp(p, "-C")) {
RETURN(1);
cfg->compression = 1;
}
if (!strcmp(p, "-1")) {
RETURN(1);
cfg->compression = 1;
}
if (!strcmp(p, "-1")) {
RETURN(1);
cfg->sshprot = 0; /* ssh protocol 1 only */
}
if (!strcmp(p, "-2")) {
RETURN(1);
cfg->sshprot = 0; /* ssh protocol 1 only */
}
if (!strcmp(p, "-2")) {
RETURN(1);
cfg->sshprot = 3; /* ssh protocol 2 only */
}
if (!strcmp(p, "-i")) {
RETURN(2);
cfg->sshprot = 3; /* ssh protocol 2 only */
}
if (!strcmp(p, "-i")) {
RETURN(2);
cfg->keyfile = filename_from_str(value);
}
cfg->keyfile = filename_from_str(value);
}