nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-19 03:58:05 -05:00
Code Issues Projects Releases Wiki Activity

Joris van Rantwijk's fix for pscp -P

Browse Source 
[originally from svn r375]
This commit is contained in:
Simon Tatham 2000-01-28 20:20:58 +00:00
parent 6e7131412e
commit c793ad69f7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scp.c
View File

@ -120,14 +120,10 @@ static void do_cmd(char *host, char *user, char *cmd)
cfg.port = 22; cfg.port = 22;
} }
if (portnumber)
cfg.port = portnumber;
/* Set username */ /* Set username */
if (user != NULL && user[0] != '\0') { if (user != NULL && user[0] != '\0') {
strncpy(cfg.username, user, sizeof(cfg.username)-1); strncpy(cfg.username, user, sizeof(cfg.username)-1);
cfg.username[sizeof(cfg.username)-1] = '\0'; cfg.username[sizeof(cfg.username)-1] = '\0';
cfg.port = 22;
} else if (cfg.username[0] == '\0') { } else if (cfg.username[0] == '\0') {
bump("Empty user name"); bump("Empty user name");
} }
@ -135,6 +131,9 @@ static void do_cmd(char *host, char *user, char *cmd)
if (cfg.protocol != PROT_SSH) if (cfg.protocol != PROT_SSH)
cfg.port = 22; cfg.port = 22;
if (portnumber)
cfg.port = portnumber;
err = ssh_init(cfg.host, cfg.port, cmd, &realhost); err = ssh_init(cfg.host, cfg.port, cmd, &realhost);
if (err != NULL) if (err != NULL)
bump("ssh_init: %s", err); bump("ssh_init: %s", err);