1 files changed, 33 insertions, 22 deletions

diff --git a/scp.c b/scp.c
index 51bc2b734..4a7f73ab3 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.184 2015/11/27 00:49:31 deraadt Exp $ */
+/* $OpenBSD: scp.c,v 1.186 2016/05/25 23:48:45 schwarze Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -96,6 +96,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <locale.h>
 #include <pwd.h>
 #include <signal.h>
 #include <stdarg.h>
@@ -114,6 +115,7 @@
 #include "log.h"
 #include "misc.h"
 #include "progressmeter.h"
+#include "utf8.h"
 
 extern char *__progname;
 
@@ -192,13 +194,13 @@ do_local_cmd(arglist *a)
                 fprintf(stderr, "Executing:");
                 for (i = 0; i < a->num; i++) {
                         if (i == 0)
-                                fprintf(stderr, " %s", a->list[i]);
+                                fmprintf(stderr, " %s", a->list[i]);
                         else
                                 /*
                                  * TODO: misbehaves if a->list[i] contains a
                                  * single quote
                                  */
-                                fprintf(stderr, " '%s'", a->list[i]);
+                                fmprintf(stderr, " '%s'", a->list[i]);
                 }
                 fprintf(stderr, "\n");
         }
@@ -240,7 +242,7 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout)
         int pin[2], pout[2], reserved[2];
 
         if (verbose_mode)
-                fprintf(stderr,
+                fmprintf(stderr,
                     "Executing: program %s host %s, user %s, command %s\n",
                     ssh_program, host,
                     remuser ? remuser : "(unspecified)", cmd);
@@ -315,7 +317,7 @@ do_cmd2(char *host, char *remuser, char *cmd, int fdin, int fdout)
         int status;
 
         if (verbose_mode)
-                fprintf(stderr,
+                fmprintf(stderr,
                     "Executing: 2nd program %s host %s, user %s, command %s\n",
                     ssh_program, host,
                     remuser ? remuser : "(unspecified)", cmd);
@@ -386,6 +388,8 @@ main(int argc, char **argv)
         /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
         sanitise_stdfd();
 
+        setlocale(LC_CTYPE, "");
+
         /* Copy argv, because we modify it */
         newargv = xcalloc(MAX(argc + 1, 1), sizeof(*newargv));
         for (n = 0; n < argc; n++)
@@ -818,9 +822,8 @@ syserr:			run_err("%s: %s", name, strerror(errno));
                 snprintf(buf, sizeof buf, "C%04o %lld %s\n",
                     (u_int) (stb.st_mode & FILEMODEMASK),
                     (long long)stb.st_size, last);
-                if (verbose_mode) {
-                        fprintf(stderr, "Sending file modes: %s", buf);
-                }
+                if (verbose_mode)
+                        fmprintf(stderr, "Sending file modes: %s", buf);
                 (void) atomicio(vwrite, remout, buf, strlen(buf));
                 if (response() < 0)
                         goto next;
@@ -856,8 +859,6 @@ next:			if (fd != -1) {
                                 haderr = errno;
                 }
                 unset_nonblock(remout);
-                if (showprogress)
-                        stop_progress_meter();
 
                 if (fd != -1) {
                         if (close(fd) < 0 && !haderr)
@@ -869,6 +870,8 @@ next:			if (fd != -1) {
                 else
                         run_err("%s: %s", name, strerror(haderr));
                 (void) response();
+                if (showprogress)
+                        stop_progress_meter();
         }
 }
 
@@ -897,7 +900,7 @@ rsource(char *name, struct stat *statp)
         (void) snprintf(path, sizeof path, "D%04o %d %.1024s\n",
             (u_int) (statp->st_mode & FILEMODEMASK), 0, last);
         if (verbose_mode)
-                fprintf(stderr, "Entering directory: %s", path);
+                fmprintf(stderr, "Entering directory: %s", path);
         (void) atomicio(vwrite, remout, path, strlen(path));
         if (response() < 0) {
                 closedir(dirp);
@@ -937,7 +940,7 @@ sink(int argc, char **argv)
         off_t size, statbytes;
         unsigned long long ull;
         int setimes, targisdir, wrerrno = 0;
-        char ch, *cp, *np, *targ, *why, *vect[1], buf[2048];
+        char ch, *cp, *np, *targ, *why, *vect[1], buf[2048], visbuf[2048];
         struct timeval tv[2];
 
 #define atime   tv[0]
@@ -972,12 +975,15 @@ sink(int argc, char **argv)
                 } while (cp < &buf[sizeof(buf) - 1] && ch != '\n');
                 *cp = 0;
                 if (verbose_mode)
-                        fprintf(stderr, "Sink: %s", buf);
+                        fmprintf(stderr, "Sink: %s", buf);
 
                 if (buf[0] == '\01' || buf[0] == '\02') {
-                        if (iamremote == 0)
+                        if (iamremote == 0) {
+                                (void) snmprintf(visbuf, sizeof(visbuf),
+                                    NULL, "%s", buf + 1);
                                 (void) atomicio(vwrite, STDERR_FILENO,
-                                    buf + 1, strlen(buf + 1));
+                                    visbuf, strlen(visbuf));
+                        }
                         if (buf[0] == '\02')
                                 exit(1);
                         ++errs;
@@ -1153,8 +1159,6 @@ bad:			run_err("%s: %s", np, strerror(errno));
                         }
                 }
                 unset_nonblock(remin);
-                if (showprogress)
-                        stop_progress_meter();
                 if (count != 0 && wrerr == NO &&
                     atomicio(vwrite, ofd, bp->buf, count) != count) {
                         wrerr = YES;
@@ -1193,6 +1197,8 @@ bad:			run_err("%s: %s", np, strerror(errno));
                         wrerrno = errno;
                 }
                 (void) response();
+                if (showprogress)
+                        stop_progress_meter();
                 if (setimes && wrerr == NO) {
                         setimes = 0;
                         if (utimes(np, tv) < 0) {
@@ -1220,7 +1226,7 @@ screwup:
 int
 response(void)
 {
-        char ch, *cp, resp, rbuf[2048];
+        char ch, *cp, resp, rbuf[2048], visbuf[2048];
 
         if (atomicio(read, remin, &resp, sizeof(resp)) != sizeof(resp))
                 lostconn(0);
@@ -1240,8 +1246,13 @@ response(void)
                         *cp++ = ch;
                 } while (cp < &rbuf[sizeof(rbuf) - 1] && ch != '\n');
 
-                if (!iamremote)
-                        (void) atomicio(vwrite, STDERR_FILENO, rbuf, cp - rbuf);
+                if (!iamremote) {
+                        cp[-1] = '\0';
+                        (void) snmprintf(visbuf, sizeof(visbuf),
+                            NULL, "%s\n", rbuf);
+                        (void) atomicio(vwrite, STDERR_FILENO,
+                            visbuf, strlen(visbuf));
+                }
                 ++errs;
                 if (resp == 1)
                         return (-1);
@@ -1279,7 +1290,7 @@ run_err(const char *fmt,...)
 
         if (!iamremote) {
                 va_start(ap, fmt);
-                vfprintf(stderr, fmt, ap);
+                vfmprintf(stderr, fmt, ap);
                 va_end(ap);
                 fprintf(stderr, "\n");
         }
@@ -1325,7 +1336,7 @@ okname(char *cp0)
         } while (*++cp);
         return (1);
 
-bad:    fprintf(stderr, "%s: invalid user name\n", cp0);
+bad:    fmprintf(stderr, "%s: invalid user name\n", cp0);
         return (0);
 }