===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/fetch.c,v
retrieving revision 1.178
retrieving revision 1.179
diff -c -r1.178 -r1.179
*** src/usr.bin/ftp/fetch.c	2019/11/14 23:48:37	1.178
--- src/usr.bin/ftp/fetch.c	2019/11/18 04:37:35	1.179
***************
*** 1,4 ****
! /*	$OpenBSD: fetch.c,v 1.178 2019/11/14 23:48:37 jca Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: fetch.c,v 1.179 2019/11/18 04:37:35 deraadt Exp $	*/
  /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
  
  /*-
***************
*** 357,363 ****
  			 * filling with stars
  			 */
  			for (host = 1 + strchr(proxyurl + 5, ':');  *host != '@';
! 			     host++)
  				*host = '*';
  
  			host = path + 1;
--- 357,363 ----
  			 * filling with stars
  			 */
  			for (host = 1 + strchr(proxyurl + 5, ':');  *host != '@';
! 			    host++)
  				*host = '*';
  
  			host = path + 1;
***************
*** 441,448 ****
  					warn("Writing %s", savefile);
  					signal(SIGINFO, oldinti);
  					goto cleanup_url_get;
! 				}
! 				else if (i == 0)
  					break;
  			}
  			if (hash && !progress) {
--- 441,447 ----
  					warn("Writing %s", savefile);
  					signal(SIGINFO, oldinti);
  					goto cleanup_url_get;
! 				} else if (i == 0)
  					break;
  			}
  			if (hash && !progress) {
***************
*** 1036,1043 ****
  					warn("Writing %s", savefile);
  					signal(SIGINFO, oldinti);
  					goto cleanup_url_get;
! 				}
! 				else if (i == 0)
  					break;
  			}
  			if (hash && !progress) {
--- 1035,1041 ----
  					warn("Writing %s", savefile);
  					signal(SIGINFO, oldinti);
  					goto cleanup_url_get;
! 				} else if (i == 0)
  					break;
  			}
  			if (hash && !progress) {
***************
*** 1140,1146 ****
  				break;
  			bytes += rlen;
  			for (cp = buf, wlen = rlen; wlen > 0;
! 			     wlen -= written, cp += written) {
  				if ((written = write(out, cp, wlen)) == -1) {
  					warn("Writing output file");
  					return -1;
--- 1138,1144 ----
  				break;
  			bytes += rlen;
  			for (cp = buf, wlen = rlen; wlen > 0;
! 			    wlen -= written, cp += written) {
  				if ((written = write(out, cp, wlen)) == -1) {
  					warn("Writing output file");
  					return -1;
***************
*** 1666,1672 ****
  	} else
  		hosttail = host;
  
! 	port = strrchr(hosttail, ':');               /* find portnum */
  	if (port != NULL)
  		*port++ = '\0';
  	if (!port)
--- 1664,1670 ----
  	} else
  		hosttail = host;
  
! 	port = strrchr(hosttail, ':');		/* find portnum */
  	if (port != NULL)
  		*port++ = '\0';
  	if (!port)