===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/fetch.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -c -r1.83 -r1.84
*** src/usr.bin/ftp/fetch.c	2008/10/16 23:15:53	1.83
--- src/usr.bin/ftp/fetch.c	2009/04/26 21:26:03	1.84
***************
*** 1,4 ****
! /*	$OpenBSD: fetch.c,v 1.83 2008/10/16 23:15:53 martynas Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: fetch.c,v 1.84 2009/04/26 21:26:03 martynas Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
***************
*** 31,37 ****
   */
  
  #if !defined(lint) && !defined(SMALL)
! static const char rcsid[] = "$OpenBSD: fetch.c,v 1.83 2008/10/16 23:15:53 martynas Exp $";
  #endif /* not lint and not SMALL */
  
  /*
--- 31,37 ----
   */
  
  #if !defined(lint) && !defined(SMALL)
! static const char rcsid[] = "$OpenBSD: fetch.c,v 1.84 2009/04/26 21:26:03 martynas Exp $";
  #endif /* not lint and not SMALL */
  
  /*
***************
*** 304,310 ****
  
  		bytes = 0;
  		hashbytes = mark;
! 		progressmeter(-1);
  
  		if ((buf = malloc(4096)) == NULL)
  			errx(1, "Can't allocate memory for transfer buffer");
--- 304,310 ----
  
  		bytes = 0;
  		hashbytes = mark;
! 		progressmeter(-1, path);
  
  		if ((buf = malloc(4096)) == NULL)
  			errx(1, "Can't allocate memory for transfer buffer");
***************
*** 339,345 ****
  			warn("Reading from file");
  			goto cleanup_url_get;
  		}
! 		progressmeter(1);
  		if (verbose)
  			fputs("Successfully retrieved file.\n", ttyout);
  		(void)signal(SIGINT, oldintr);
--- 339,345 ----
  			warn("Reading from file");
  			goto cleanup_url_get;
  		}
! 		progressmeter(1, NULL);
  		if (verbose)
  			fputs("Successfully retrieved file.\n", ttyout);
  		(void)signal(SIGINT, oldintr);
***************
*** 690,696 ****
  
  	bytes = 0;
  	hashbytes = mark;
! 	progressmeter(-1);
  
  	free(buf);
  
--- 690,696 ----
  
  	bytes = 0;
  	hashbytes = mark;
! 	progressmeter(-1, path);
  
  	free(buf);
  
***************
*** 728,734 ****
  		warn("Reading from socket");
  		goto cleanup_url_get;
  	}
! 	progressmeter(1);
  	if (
  #ifndef SMALL
  		!resume &&
--- 728,734 ----
  		warn("Reading from socket");
  		goto cleanup_url_get;
  	}
! 	progressmeter(1, NULL);
  	if (
  #ifndef SMALL
  		!resume &&