nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-20 20:45:02 -05:00
Code Issues Projects Releases Wiki Activity

The command-line routines now take a pointer to `cfg' as an

Browse Source 
argument, so they don't depend on it being a global any more.

[originally from svn r2555]
This commit is contained in:
Simon Tatham 2003-01-12 14:17:03 +00:00
parent fee1624c69
commit 5738dc219b
6 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
cmdline.c
View File

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

5
plink.c
View File

@ -294,7 +294,8 @@ int main(int argc, char **argv)
while (--argc) { while (--argc) {
char *p = *++argv; char *p = *++argv;
if (*p == '-') { if (*p == '-') {
int ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL), 1); int ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL),
1, &cfg);
if (ret == -2) { if (ret == -2) {
fprintf(stderr, fprintf(stderr,
"plink: option \"%s\" requires an argument\n", p); "plink: option \"%s\" requires an argument\n", p);
@ -460,7 +461,7 @@ int main(int argc, char **argv)
/* /*
* Perform command-line overrides on session configuration. * Perform command-line overrides on session configuration.
*/ */
cmdline_run_saved(); cmdline_run_saved(&cfg);
/* /*
* Trim a colon suffix off the hostname if it's there. * Trim a colon suffix off the hostname if it's there.

4
psftp.c
View File

@ -1722,7 +1722,7 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
/* /*
* Enact command-line overrides. * Enact command-line overrides.
*/ */
cmdline_run_saved(); cmdline_run_saved(&cfg);
/* /*
* Trim leading whitespace off the hostname if it's there. * Trim leading whitespace off the hostname if it's there.
@ -1883,7 +1883,7 @@ int main(int argc, char *argv[])
userhost = dupstr(argv[i]); userhost = dupstr(argv[i]);
continue; continue;
} }
ret = cmdline_process_param(argv[i], i+1<argc?argv[i+1]:NULL, 1); ret = cmdline_process_param(argv[i], i+1<argc?argv[i+1]:NULL, 1, &cfg);
if (ret == -2) { if (ret == -2) {
cmdline_error("option \"%s\" requires an argument", argv[i]); cmdline_error("option \"%s\" requires an argument", argv[i]);
} else if (ret == 2) { } else if (ret == 2) {

4
putty.h
View File

@ -684,8 +684,8 @@ void printer_finish_job(printer_job *);
* defined differently in various places and required _by_ * defined differently in various places and required _by_
* cmdline.c). * cmdline.c).
*/ */
int cmdline_process_param(char *, char *, int); int cmdline_process_param(char *, char *, int, Config *);
void cmdline_run_saved(void); void cmdline_run_saved(Config *);
extern char *cmdline_password; extern char *cmdline_password;
#define TOOLTYPE_FILETRANSFER 1 #define TOOLTYPE_FILETRANSFER 1
extern int cmdline_tooltype; extern int cmdline_tooltype;

4
scp.c
View File

@ -493,7 +493,7 @@ static void do_cmd(char *host, char *user, char *cmd)
/* /*
* Enact command-line overrides. * Enact command-line overrides.
*/ */
cmdline_run_saved(); cmdline_run_saved(&cfg);
/* /*
* Trim leading whitespace off the hostname if it's there. * Trim leading whitespace off the hostname if it's there.
@ -2189,7 +2189,7 @@ int main(int argc, char *argv[])
int ret; int ret;
if (argv[i][0] != '-') if (argv[i][0] != '-')
break; break;
ret = cmdline_process_param(argv[i], i+1<argc?argv[i+1]:NULL, 1); ret = cmdline_process_param(argv[i], i+1<argc?argv[i+1]:NULL, 1, &cfg);
if (ret == -2) { if (ret == -2) {
cmdline_error("option \"%s\" requires an argument", argv[i]); cmdline_error("option \"%s\" requires an argument", argv[i]);
} else if (ret == 2) { } else if (ret == 2) {

7
window.c
View File

@ -329,7 +329,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
char *p = argv[i]; char *p = argv[i];
int ret; int ret;
ret = cmdline_process_param(p, i+1<argc?argv[i+1]:NULL, 1); ret = cmdline_process_param(p, i+1<argc?argv[i+1]:NULL,
1, &cfg);
if (ret == -2) { if (ret == -2) {
cmdline_error("option \"%s\" requires an argument", p); cmdline_error("option \"%s\" requires an argument", p);
} else if (ret == 2) { } else if (ret == 2) {
@ -365,7 +366,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
* argument, so that it will be deferred * argument, so that it will be deferred
* until it's a good moment to run it. * until it's a good moment to run it.
*/ */
int ret = cmdline_process_param("-P", p, 1); int ret = cmdline_process_param("-P", p, 1, &cfg);
assert(ret == 2); assert(ret == 2);
} else if (!strncmp(q, "telnet:", 7)) { } else if (!strncmp(q, "telnet:", 7)) {
/* /*
@ -411,7 +412,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
} }
} }
cmdline_run_saved(); cmdline_run_saved(&cfg);
if (!*cfg.host && !do_config()) { if (!*cfg.host && !do_config()) {
WSACleanup(); WSACleanup();