~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move x11fwd and portfwd prototypes from ssh.c into ssh.h so they can be seen
[sgt/putty]
/
unix
/
uxplink.c
diff --git
a/unix/uxplink.c
b/unix/uxplink.c
index
179f254
..
99ace88
100644
(file)
--- a/
unix/uxplink.c
+++ b/
unix/uxplink.c
@@
-186,6
+186,7
@@
int main(int argc, char **argv)
int i, skcount, sksize, socketstate;
int connopen;
int exitcode;
int i, skcount, sksize, socketstate;
int connopen;
int exitcode;
+ int errors;
void *ldisc;
ssh_get_line = console_get_line;
void *ldisc;
ssh_get_line = console_get_line;
@@
-206,6
+207,7
@@
int main(int argc, char **argv)
do_defaults(NULL, &cfg);
default_protocol = cfg.protocol;
default_port = cfg.port;
do_defaults(NULL, &cfg);
default_protocol = cfg.protocol;
default_port = cfg.port;
+ errors = 0;
{
/*
* Override the default protocol if PLINK_PROTOCOL is set.
{
/*
* Override the default protocol if PLINK_PROTOCOL is set.
@@
-230,6
+232,7
@@
int main(int argc, char **argv)
if (ret == -2) {
fprintf(stderr,
"plink: option \"%s\" requires an argument\n", p);
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) {
} else if (ret == 2) {
--argc, ++argv;
} else if (ret == 1) {
@@
-237,11
+240,17
@@
int main(int argc, char **argv)
} else if (!strcmp(p, "-batch")) {
console_batch_mode = 1;
} else if (!strcmp(p, "-o")) {
} else if (!strcmp(p, "-batch")) {
console_batch_mode = 1;
} else if (!strcmp(p, "-o")) {
- if (argc <= 1)
+ if (argc <= 1)
{
fprintf(stderr,
"plink: option \"-o\" requires an argument\n");
fprintf(stderr,
"plink: option \"-o\" requires an argument\n");
- else
- --argc, provide_xrm_string(*++argv);
+ errors = 1;
+ } else {
+ --argc;
+ provide_xrm_string(*++argv);
+ }
+ } else {
+ fprintf(stderr, "plink: unknown option \"%s\"\n", p);
+ errors = 1;
}
} else if (*p) {
if (!*cfg.host) {
}
} else if (*p) {
if (!*cfg.host) {
@@
-366,6
+375,9
@@
int main(int argc, char **argv)
}
}
}
}
+ if (errors)
+ return 1;
+
if (!*cfg.host) {
usage();
}
if (!*cfg.host) {
usage();
}
@@
-463,7
+475,7
@@
int main(int argc, char **argv)
return 1;
}
back->provide_logctx(backhandle, logctx);
return 1;
}
back->provide_logctx(backhandle, logctx);
- ldisc = ldisc_create(NULL, back, backhandle, NULL);
+ ldisc = ldisc_create(
&cfg,
NULL, back, backhandle, NULL);
sfree(realhost);
}
connopen = 1;
sfree(realhost);
}
connopen = 1;