BUG: SFTP (openssh-3.8p1) upload doubles "Uploading..." comment

[Damien Miller]

On Fri, 27 Feb 2004, Job 317 wrote:

> Sorry, wasn't sure how to describe this well in the Subject line...
> 
> I am using OpenSSH-3.8p1 from a RedHat 7.3 to OpenSSH-3.8p1 on a RedHat
> 9.0 box. While SFTP-ing using the 'put *' command in SFTP, I get
> duplicate verbosity (?) in the terminal for each file uploaded...

You have found a bug, thanks. 

Here is a patch:

Index: sftp-client.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sftp-client.c,v
retrieving revision 1.46
diff -u -r1.46 sftp-client.c
--- sftp-client.c	17 Feb 2004 05:39:51 -0000	1.46
+++ sftp-client.c	3 Mar 2004 03:05:36 -0000
@@ -805,13 +805,8 @@
 	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;
@@ -1032,8 +1027,6 @@
 	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;