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

Enable protocol prefix on [user@]host argument in Plink

Browse Source 
[originally from svn r670]
This commit is contained in:
Simon Tatham 2000-10-04 14:35:31 +00:00
parent 9a9bd54197
commit 2b9707fcf8
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plink.c
View File

@ -171,6 +171,11 @@ int main(int argc, char **argv) {
if (!strcmp(p, "-ssh")) { if (!strcmp(p, "-ssh")) {
default_protocol = cfg.protocol = PROT_SSH; default_protocol = cfg.protocol = PROT_SSH;
default_port = cfg.port = 22; default_port = cfg.port = 22;
} else if (!strcmp(p, "-telnet")) {
default_protocol = cfg.protocol = PROT_TELNET;
default_port = cfg.port = 23;
} else if (!strcmp(p, "-raw")) {
default_protocol = cfg.protocol = PROT_RAW;
} else if (!strcmp(p, "-v")) { } else if (!strcmp(p, "-v")) {
flags |= FLAG_VERBOSE; flags |= FLAG_VERBOSE;
} else if (!strcmp(p, "-log")) { } else if (!strcmp(p, "-log")) {
@ -212,6 +217,27 @@ int main(int argc, char **argv) {
strncpy (cfg.host, q, sizeof(cfg.host)-1); strncpy (cfg.host, q, sizeof(cfg.host)-1);
cfg.host[sizeof(cfg.host)-1] = '\0'; cfg.host[sizeof(cfg.host)-1] = '\0';
} else { } else {
char *r;
/*
* Before we process the [user@]host string, we
* first check for the presence of a protocol
* prefix (a protocol name followed by ",").
*/
r = strchr(p, ',');
if (r) {
int i, j;
for (i = 0; backends[i].backend != NULL; i++) {
j = strlen(backends[i].name);
if (j == r-p &&
!memcmp(backends[i].name, p, j)) {
default_protocol = cfg.protocol = backends[i].protocol;
portnumber = backends[i].backend->default_port;
p = r+1;
break;
}
}
}
/* /*
* Three cases. Either (a) there's a nonzero * Three cases. Either (a) there's a nonzero
* length string followed by an @, in which * length string followed by an @, in which
@ -222,7 +248,7 @@ int main(int argc, char **argv) {
* string and it _doesn't_ exist in the * string and it _doesn't_ exist in the
* database. * database.
*/ */
char *r = strrchr(p, '@'); r = strrchr(p, '@');
if (r == p) p++, r = NULL; /* discount initial @ */ if (r == p) p++, r = NULL; /* discount initial @ */
if (r == NULL) { if (r == NULL) {
/* /*