~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite gprefs() in settings.c so that its input mapping includes
[sgt/putty]
/
unix
/
uxplink.c
diff --git
a/unix/uxplink.c
b/unix/uxplink.c
index
cbfcc71
..
d76bbca
100644
(file)
--- a/
unix/uxplink.c
+++ b/
unix/uxplink.c
@@
-538,7
+538,7
@@
static void usage(void)
printf(" -pgpfp print PGP key fingerprints and exit\n");
printf(" -v show verbose messages\n");
printf(" -load sessname Load settings from saved session\n");
printf(" -pgpfp print PGP key fingerprints and exit\n");
printf(" -v show verbose messages\n");
printf(" -load sessname Load settings from saved session\n");
- printf(" -ssh -telnet -rlogin -raw\n");
+ printf(" -ssh -telnet -rlogin -raw
-serial
\n");
printf(" force use of a particular protocol\n");
printf(" -P port connect to specified port\n");
printf(" -l user connect with specified username\n");
printf(" force use of a particular protocol\n");
printf(" -P port connect to specified port\n");
printf(" -l user connect with specified username\n");
@@
-565,6
+565,8
@@
static void usage(void)
printf(" -N don't start a shell/command (SSH-2 only)\n");
printf(" -nc host:port\n");
printf(" open tunnel in place of session (SSH-2 only)\n");
printf(" -N don't start a shell/command (SSH-2 only)\n");
printf(" -nc host:port\n");
printf(" open tunnel in place of session (SSH-2 only)\n");
+ printf(" -sercfg configuration-string (e.g. 19200,8,n,1,X)\n");
+ printf(" Specify the serial configuration (serial only)\n");
exit(1);
}
exit(1);
}
@@
-585,7
+587,7
@@
int main(int argc, char **argv)
int exitcode;
int errors;
int use_subsystem = 0;
int exitcode;
int errors;
int use_subsystem = 0;
-
void *ldisc
;
+
int got_host = FALSE
;
long now;
fdlist = NULL;
long now;
fdlist = NULL;
@@
-658,7
+660,7
@@
int main(int argc, char **argv)
errors = 1;
}
} else if (*p) {
errors = 1;
}
} else if (*p) {
- if (!cfg_launchable(&cfg)) {
+ if (!cfg_launchable(&cfg)
|| !(got_host || loaded_session)
) {
char *q = p;
/*
char *q = p;
/*
@@
-685,6
+687,7
@@
int main(int argc, char **argv)
cfg.port = -1;
strncpy(cfg.host, q, sizeof(cfg.host) - 1);
cfg.host[sizeof(cfg.host) - 1] = '\0';
cfg.port = -1;
strncpy(cfg.host, q, sizeof(cfg.host) - 1);
cfg.host[sizeof(cfg.host) - 1] = '\0';
+ got_host = TRUE;
} else {
char *r, *user, *host;
/*
} else {
char *r, *user, *host;
/*
@@
-733,8
+736,10
@@
int main(int argc, char **argv)
strncpy(cfg.host, host, sizeof(cfg.host) - 1);
cfg.host[sizeof(cfg.host) - 1] = '\0';
cfg.port = default_port;
strncpy(cfg.host, host, sizeof(cfg.host) - 1);
cfg.host[sizeof(cfg.host) - 1] = '\0';
cfg.port = default_port;
+ got_host = TRUE;
} else {
cfg = cfg2;
} else {
cfg = cfg2;
+ loaded_session = TRUE;
}
}
}
}
@@
-781,7
+786,7
@@
int main(int argc, char **argv)
if (errors)
return 1;
if (errors)
return 1;
- if (!cfg_launchable(&cfg)) {
+ if (!cfg_launchable(&cfg)
|| !(got_host || loaded_session)
) {
usage();
}
usage();
}
@@
-895,7
+900,7
@@
int main(int argc, char **argv)
return 1;
}
back->provide_logctx(backhandle, logctx);
return 1;
}
back->provide_logctx(backhandle, logctx);
- ldisc
= ldisc
_create(&cfg, NULL, back, backhandle, NULL);
+ ldisc_create(&cfg, NULL, back, backhandle, NULL);
sfree(realhost);
}
connopen = 1;
sfree(realhost);
}
connopen = 1;