New upstream release (7.3p1).

1 files changed, 7 insertions, 7 deletions

diff --git a/sftp-client.c b/sftp-client.c
index d49bfaaba..0ca44a4d6 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.121 2016/02/11 02:21:34 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.124 2016/05/25 23:48:45 schwarze Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -53,6 +53,7 @@
 #include "atomicio.h"
 #include "progressmeter.h"
 #include "misc.h"
+#include "utf8.h"
 
 #include "sftp.h"
 #include "sftp-common.h"
@@ -515,8 +516,7 @@ do_lsreaddir(struct sftp_conn *conn, const char *path, int print_flag,
         struct sshbuf *msg;
         u_int count, id, i, expected_id, ents = 0;
         size_t handle_len;
-        u_char type;
-        char *handle;
+        u_char type, *handle;
         int status = SSH2_FX_FAILURE;
         int r;
 
@@ -611,7 +611,7 @@ do_lsreaddir(struct sftp_conn *conn, const char *path, int print_flag,
                         }
 
                         if (print_flag)
-                                printf("%s\n", longname);
+                                mprintf("%s\n", longname);
 
                         /*
                          * Directory entries should never contain '/'
@@ -1461,7 +1461,7 @@ download_dir_internal(struct sftp_conn *conn, const char *src, const char *dst,
                 return -1;
         }
         if (print_flag)
-                printf("Retrieving %s\n", src);
+                mprintf("Retrieving %s\n", src);
 
         if (dirattrib->flags & SSH2_FILEXFER_ATTR_PERMISSIONS)
                 mode = dirattrib->perm & 01777;
@@ -1601,7 +1601,7 @@ do_upload(struct sftp_conn *conn, const char *local_path,
         if (resume) {
                 /* Get remote file size if it exists */
                 if ((c = do_stat(conn, remote_path, 0)) == NULL) {
-                        close(local_fd);                
+                        close(local_fd);
                         return -1;
                 }
 
@@ -1794,7 +1794,7 @@ upload_dir_internal(struct sftp_conn *conn, const char *src, const char *dst,
                 return -1;
         }
         if (print_flag)
-                printf("Entering %s\n", src);
+                mprintf("Entering %s\n", src);
 
         attrib_clear(&a);
         stat_to_attrib(&sb, &a);