2 files changed, 8 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 56fb2fd44..c2c0c508a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@
    - markus@cvs.openbsd.org 2004/03/03 06:47:52
      [sshd.c]
      change proctiltle after accept(2); ok henning, deraadt, djm
+   - djm@cvs.openbsd.org 2004/03/03 09:30:42
+     [sftp-client.c]
+     Don't print duplicate messages when progressmeter is off
+     Spotted by job317 AT mailvault.com; ok markus@
 
 20040307
  - (tim) [regress/login-timeout.sh] fix building outside of source tree.
@@ -873,4 +877,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3280 2004/03/08 12:11:25 djm Exp $
+$Id: ChangeLog,v 1.3281 2004/03/08 12:12:02 djm Exp $
diff --git a/sftp-client.c b/sftp-client.c
index 81c5dd497..781d9827a 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -20,7 +20,7 @@
 /* XXX: copy between two remote sites */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.46 2004/02/17 05:39:51 djm Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.47 2004/03/03 09:30:42 djm Exp $");
 
 #include "openbsd-compat/sys-queue.h"
 
@@ -805,13 +805,8 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
         max_req = 1;
         progress_counter = 0;
 
-        if (showprogress) {
-                if (size)
-                        start_progress_meter(remote_path, size,
-                            &progress_counter);
-                else
-                        printf("Fetching %s to %s\n", remote_path, local_path);
-        }
+        if (showprogress && size != 0)
+                start_progress_meter(remote_path, size, &progress_counter);
 
         while (num_req > 0 || max_req > 0) {
                 char *data;
@@ -1036,8 +1031,6 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
         offset = 0;
         if (showprogress)
                 start_progress_meter(local_path, sb.st_size, &offset);
-        else
-                printf("Uploading %s to %s\n", local_path, remote_path);
 
         for (;;) {
                 int len;