nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-05 21:42:47 -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
Download Patch File Download Diff File Expand all files Collapse all files

7
window.c
View File

@ -329,7 +329,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
char *p = argv[i];
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) {
cmdline_error("option \"%s\" requires an argument", p);
} 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
* 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);
} 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()) {
WSACleanup();