X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/33b82b22614b29838e5118fbc4c04f1db22d431c..86256dc6603a868a4aca9ea47a9d23de5c25e893:/plink.c diff --git a/plink.c b/plink.c index 528eee65..b4f8e848 100644 --- a/plink.c +++ b/plink.c @@ -256,6 +256,7 @@ int main(int argc, char **argv) int skcount, sksize; int connopen; int exitcode; + int errors; ssh_get_line = console_get_line; @@ -275,6 +276,7 @@ int main(int argc, char **argv) do_defaults(NULL, &cfg); default_protocol = cfg.protocol; default_port = cfg.port; + errors = 0; { /* * Override the default protocol if PLINK_PROTOCOL is set. @@ -299,12 +301,16 @@ int main(int argc, char **argv) if (ret == -2) { fprintf(stderr, "plink: option \"%s\" requires an argument\n", p); + errors = 1; } else if (ret == 2) { --argc, ++argv; } else if (ret == 1) { continue; } else if (!strcmp(p, "-batch")) { console_batch_mode = 1; + } else { + fprintf(stderr, "plink: unknown option \"%s\"\n", p); + errors = 1; } } else if (*p) { if (!*cfg.host) { @@ -426,6 +432,9 @@ int main(int argc, char **argv) } } + if (errors) + return 1; + if (!*cfg.host) { usage(); }