From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Fri, 11 Jul 2008 19:24:56 +0000 (+0000)
Subject: Replicate r8110 from PSFTP to PSCP, and various other minor patchery from
X-Git-Tag: 0.61~238
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a071dfdcd2713f4e6569486e2da790fd21a0408d;p=PuTTY.git

Replicate r8110 from PSFTP to PSCP, and various other minor patchery from
Roger Picton.

[originally from svn r8117]
[r8110 == e01df1da9f41aa7554e99708c117241c59fcef3d]
---

diff --git a/pscp.c b/pscp.c
index 1809c6f7..3ef1b33d 100644
--- a/pscp.c
+++ b/pscp.c
@@ -252,8 +252,14 @@ static int ssh_scp_recv(unsigned char *buf, int len)
 static void ssh_scp_init(void)
 {
     while (!back->sendok(backhandle)) {
-	if (ssh_sftp_loop_iteration() < 0)
+        if (back->exitcode(backhandle) >= 0) {
+            errs++;
+            return;
+        }
+	if (ssh_sftp_loop_iteration() < 0) {
+            errs++;
 	    return;		       /* doom */
+        }
     }
 
     /* Work out which backend we ended up using. */
@@ -467,7 +473,7 @@ static void do_cmd(char *host, char *user, char *cmd)
     back->provide_logctx(backhandle, logctx);
     console_provide_logctx(logctx);
     ssh_scp_init();
-    if (verbose && realhost != NULL)
+    if (verbose && realhost != NULL && errs == 0)
 	tell_user(stderr, "Connected to %s\n", realhost);
     sfree(realhost);
 }