===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/fetch.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -c -r1.150 -r1.151
*** src/usr.bin/ftp/fetch.c	2016/12/08 19:31:17	1.150
--- src/usr.bin/ftp/fetch.c	2016/12/08 19:59:51	1.151
***************
*** 1,4 ****
! /*	$OpenBSD: fetch.c,v 1.150 2016/12/08 19:31:17 millert Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: fetch.c,v 1.151 2016/12/08 19:59:51 millert Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
***************
*** 624,632 ****
  	fin = fdopen(s, "r+");
  #endif /* !SMALL */
  
- 	if (verbose)
- 		fprintf(ttyout, "Requesting %s", origline);
- 
  	/*
  	 * Construct and send the request. Proxy requests don't want leading /.
  	 */
--- 624,629 ----
***************
*** 636,643 ****
  
  	epath = url_encode(path);
  	if (proxyurl) {
! 		if (verbose)
! 			fprintf(ttyout, " (via %s)\n", proxyurl);
  		/*
  		 * Host: directive must use the destination host address for
  		 * the original URI (path).
--- 633,642 ----
  
  	epath = url_encode(path);
  	if (proxyurl) {
! 		if (verbose) {
! 			fprintf(ttyout, "Requesting %s (via %s)\n",
! 			    origline, proxyurl);
! 		}
  		/*
  		 * Host: directive must use the destination host address for
  		 * the original URI (path).
***************
*** 653,658 ****
--- 652,659 ----
  			    "Host: %s\r\n%s%s\r\n\r\n",
  			    epath, proxyhost, buf ? buf : "", httpuseragent);
  	} else {
+ 		if (verbose)
+ 			fprintf(ttyout, "Requesting %s\n", origline);
  #ifndef SMALL
  		if (resume) {
  			struct stat stbuf;
***************
*** 712,719 ****
  #endif /* !SMALL */
  		ftp_printf(fin, tls, "\r\n%s%s\r\n\r\n",
  		    buf ? buf : "", httpuseragent);
- 		if (verbose)
- 			fprintf(ttyout, "\n");
  	}
  	free(epath);
  
--- 713,718 ----