1 files changed, 61 insertions, 40 deletions

diff --git a/scp.c b/scp.c
index 6901e0c94..b4492a062 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.207 2020/01/23 07:10:22 dtucker Exp $ */
+/* $OpenBSD: scp.c,v 1.210 2020/05/06 20:57:38 djm Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -348,6 +348,7 @@ do_cmd2(char *host, char *remuser, int port, char *cmd, int fdin, int fdout)
                         addargs(&args, "-l");
                         addargs(&args, "%s", remuser);
                 }
+                addargs(&args, "-oBatchMode=yes");
                 addargs(&args, "--");
                 addargs(&args, "%s", host);
                 addargs(&args, "%s", cmd);
@@ -373,6 +374,7 @@ BUF *allocbuf(BUF *, int, int);
 void lostconn(int);
 int okname(char *);
 void run_err(const char *,...);
+int note_err(const char *,...);
 void verifydir(char *);
 
 struct passwd *pwd;
@@ -1230,9 +1232,6 @@ sink(int argc, char **argv, const char *src)
 {
         static BUF buffer;
         struct stat stb;
-        enum {
-                YES, NO, DISPLAYED
-        } wrerr;
         BUF *bp;
         off_t i;
         size_t j, count;
@@ -1240,7 +1239,7 @@ sink(int argc, char **argv, const char *src)
         mode_t mode, omode, mask;
         off_t size, statbytes;
         unsigned long long ull;
-        int setimes, targisdir, wrerrno = 0;
+        int setimes, targisdir, wrerr;
         char ch, *cp, *np, *targ, *why, *vect[1], buf[2048], visbuf[2048];
         char **patterns = NULL;
         size_t n, npatterns = 0;
@@ -1428,9 +1427,7 @@ sink(int argc, char **argv, const char *src)
                         sink(1, vect, src);
                         if (setimes) {
                                 setimes = 0;
-                                if (utimes(vect[0], tv) == -1)
-                                        run_err("%s: set times: %s",
-                                            vect[0], strerror(errno));
+                                (void) utimes(vect[0], tv);
                         }
                         if (mod_flag)
                                 (void) chmod(vect[0], mode);
@@ -1449,8 +1446,13 @@ bad:			run_err("%s: %s", np, strerror(errno));
                         continue;
                 }
                 cp = bp->buf;
-                wrerr = NO;
+                wrerr = 0;
 
+                /*
+                 * NB. do not use run_err() unless immediately followed by
+                 * exit() below as it may send a spurious reply that might
+                 * desyncronise us from the peer. Use note_err() instead.
+                 */
                 statbytes = 0;
                 if (showprogress)
                         start_progress_meter(curfile, size, &statbytes);
@@ -1475,11 +1477,12 @@ bad:			run_err("%s: %s", np, strerror(errno));
 
                         if (count == bp->cnt) {
                                 /* Keep reading so we stay sync'd up. */
-                                if (wrerr == NO) {
+                                if (!wrerr) {
                                         if (atomicio(vwrite, ofd, bp->buf,
                                             count) != count) {
-                                                wrerr = YES;
-                                                wrerrno = errno;
+                                                note_err("%s: %s", np,
+                                                    strerror(errno));
+                                                wrerr = 1;
                                         }
                                 }
                                 count = 0;
@@ -1487,16 +1490,14 @@ bad:			run_err("%s: %s", np, strerror(errno));
                         }
                 }
                 unset_nonblock(remin);
-                if (count != 0 && wrerr == NO &&
+                if (count != 0 && !wrerr &&
                     atomicio(vwrite, ofd, bp->buf, count) != count) {
-                        wrerr = YES;
-                        wrerrno = errno;
-                }
-                if (wrerr == NO && (!exists || S_ISREG(stb.st_mode)) &&
-                    ftruncate(ofd, size) != 0) {
-                        run_err("%s: truncate: %s", np, strerror(errno));
-                        wrerr = DISPLAYED;
+                        note_err("%s: %s", np, strerror(errno));
+                        wrerr = 1;
                 }
+                if (!wrerr && (!exists || S_ISREG(stb.st_mode)) &&
+                    ftruncate(ofd, size) != 0)
+                        note_err("%s: truncate: %s", np, strerror(errno));
                 if (pflag) {
                         if (exists || omode != mode)
 #ifdef HAVE_FCHMOD
@@ -1504,9 +1505,8 @@ bad:			run_err("%s: %s", np, strerror(errno));
 #else /* HAVE_FCHMOD */
                                 if (chmod(np, omode)) {
 #endif /* HAVE_FCHMOD */
-                                        run_err("%s: set mode: %s",
+                                        note_err("%s: set mode: %s",
                                             np, strerror(errno));
-                                        wrerr = DISPLAYED;
                                 }
                 } else {
                         if (!exists && omode != mode)
@@ -1515,36 +1515,25 @@ bad:			run_err("%s: %s", np, strerror(errno));
 #else /* HAVE_FCHMOD */
                                 if (chmod(np, omode & ~mask)) {
 #endif /* HAVE_FCHMOD */
-                                        run_err("%s: set mode: %s",
+                                        note_err("%s: set mode: %s",
                                             np, strerror(errno));
-                                        wrerr = DISPLAYED;
                                 }
                 }
-                if (close(ofd) == -1) {
-                        wrerr = YES;
-                        wrerrno = errno;
-                }
+                if (close(ofd) == -1)
+                        note_err(np, "%s: close: %s", np, strerror(errno));
                 (void) response();
                 if (showprogress)
                         stop_progress_meter();
-                if (setimes && wrerr == NO) {
+                if (setimes && !wrerr) {
                         setimes = 0;
                         if (utimes(np, tv) == -1) {
-                                run_err("%s: set times: %s",
+                                note_err("%s: set times: %s",
                                     np, strerror(errno));
-                                wrerr = DISPLAYED;
                         }
                 }
-                switch (wrerr) {
-                case YES:
-                        run_err("%s: %s", np, strerror(wrerrno));
-                        break;
-                case NO:
+                /* If no error was noted then signal success for this file */
+                if (note_err(NULL) == 0)
                         (void) atomicio(vwrite, remout, "", 1);
-                        break;
-                case DISPLAYED:
-                        break;
-                }
         }
 done:
         for (n = 0; n < npatterns; n++)
@@ -1632,6 +1621,38 @@ run_err(const char *fmt,...)
         }
 }
 
+/*
+ * Notes a sink error for sending at the end of a file transfer. Returns 0 if
+ * no error has been noted or -1 otherwise. Use note_err(NULL) to flush
+ * any active error at the end of the transfer.
+ */
+int
+note_err(const char *fmt, ...)
+{
+        static char *emsg;
+        va_list ap;
+
+        /* Replay any previously-noted error */
+        if (fmt == NULL) {
+                if (emsg == NULL)
+                        return 0;
+                run_err("%s", emsg);
+                free(emsg);
+                emsg = NULL;
+                return -1;
+        }
+
+        errs++;
+        /* Prefer first-noted error */
+        if (emsg != NULL)
+                return -1;
+
+        va_start(ap, fmt);
+        vasnmprintf(&emsg, INT_MAX, NULL, fmt, ap);
+        va_end(ap);
+        return -1;
+}
+
 void
 verifydir(char *cp)
 {