When giving authorisation errors from the proxy code in x11fwd.c,

[u/mdw/putty] / pscp.c

diff --git a/pscp.c b/pscp.c
index 1809c6f..ab3077b 100644 (file)
--- a/pscp.c
+++ b/pscp.c
@@ -50,6 +50,8 @@ static void source(char *src);
 static void rsource(char *src);
 static void sink(char *targ, char *src);
 
+const char *const appname = "PSCP";
+
 /*
  * The maximum amount of queued data we accept before we stop and
  * wait for the server to process some.
@@ -252,8 +254,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 +475,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);
 }
@@ -2085,7 +2093,7 @@ static void get_dir_list(int argc, char *argv[])
     host = src;
     src = colon(src);
     if (src == NULL)
-       bump("Local to local copy not supported");
+       bump("Local file listing not supported");
     *src++ = '\0';
     if (*src == '\0')
        src = ".";