From 9ba3069a8b346efc7c1b1ea5908e6c5c8b01fec2 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 8 Mar 2004 23:12:02 +1100 Subject: - 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@ --- sftp-client.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'sftp-client.c') 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; -- cgit v1.2.3