From ed89e8a5144545e78b782a98e5c93d8c99baa901 Mon Sep 17 00:00:00 2001
From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Fri, 28 Jan 2000 20:20:58 +0000
Subject: [PATCH] Joris van Rantwijk's fix for pscp -P

git-svn-id: svn://svn.tartarus.org/sgt/putty@375 cda61777-01e9-0310-a592-d414129be87e
---
 scp.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scp.c b/scp.c
index ac232fa5..3ea2c353 100644
--- 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);
-- 
2.11.0