projects
/
u
/
mdw
/
putty
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6ed3635
)
Joris van Rantwijk's fix for pscp -P
author
simon
<simon@cda61777-01e9-0310-a592-d414129be87e>
Fri, 28 Jan 2000 20:20:58 +0000
(20:20 +0000)
committer
simon
<simon@cda61777-01e9-0310-a592-d414129be87e>
Fri, 28 Jan 2000 20:20:58 +0000
(20:20 +0000)
git-svn-id: svn://svn.tartarus.org/sgt/putty@375
cda61777
-01e9-0310-a592-
d414129be87e
scp.c
patch
|
blob
|
blame
|
history
diff --git
a/scp.c
b/scp.c
index
ac232fa
..
3ea2c35
100644
(file)
--- a/
scp.c
+++ b/
scp.c
@@
-120,14
+120,10
@@
static void do_cmd(char *host, char *user, char *cmd)
cfg.port = 22;
}
- if (portnumber)
- cfg.port = portnumber;
-
/* Set username */
if (user != NULL && user[0] != '\0') {
strncpy(cfg.username, user, sizeof(cfg.username)-1);
cfg.username[sizeof(cfg.username)-1] = '\0';
- cfg.port = 22;
} else if (cfg.username[0] == '\0') {
bump("Empty user name");
}
@@
-135,6
+131,9
@@
static void do_cmd(char *host, char *user, char *cmd)
if (cfg.protocol != PROT_SSH)
cfg.port = 22;
+ if (portnumber)
+ cfg.port = portnumber;
+
err = ssh_init(cfg.host, cfg.port, cmd, &realhost);
if (err != NULL)
bump("ssh_init: %s", err);