===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/ftp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/ftp/ftp.c	1996/08/02 05:56:23	1.5
--- src/usr.bin/ftp/ftp.c	1996/10/31 14:36:56	1.6
***************
*** 1,4 ****
! /*      $OpenBSD: ftp.c,v 1.5 1996/08/02 05:56:23 deraadt Exp $      */
  /*      $NetBSD: ftp.c,v 1.13 1995/09/16 22:32:59 pk Exp $      */
  
  /*
--- 1,4 ----
! /*      $OpenBSD: ftp.c,v 1.6 1996/10/31 14:36:56 mickey Exp $      */
  /*      $NetBSD: ftp.c,v 1.13 1995/09/16 22:32:59 pk Exp $      */
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
  #else
! static char rcsid[] = "$OpenBSD: ftp.c,v 1.5 1996/08/02 05:56:23 deraadt Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
  #else
! static char rcsid[] = "$OpenBSD: ftp.c,v 1.6 1996/10/31 14:36:56 mickey Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 372,379 ****
  				code = 421;
  				return (4);
  			}
! 			if (c != '\r' && (verbose > 0 ||
! 			    (verbose > -1 && n == '5' && dig > 4))) {
  				if (proxflag &&
  				   (dig == 1 || dig == 5 && verbose == 0))
  					printf("%s:",hostname);
--- 372,382 ----
  				code = 421;
  				return (4);
  			}
! 			if (n == 0)
! 				n = c;
! 			if (c != '\r' && (n < '5' || !retry_connect) &&
! 			    (verbose > 0 ||
! 			      (verbose > -1 && n == '5' && dig > 4))) {
  				if (proxflag &&
  				   (dig == 1 || dig == 5 && verbose == 0))
  					printf("%s:",hostname);
***************
*** 398,409 ****
  					code = 0;
  				continuation++;
  			}
- 			if (n == 0)
- 				n = c;
  			if (cp < &reply_string[sizeof(reply_string) - 1])
  				*cp++ = c;
  		}
! 		if (verbose > 0 || verbose > -1 && n == '5') {
  			(void) putchar(c);
  			(void) fflush (stdout);
  		}
--- 401,411 ----
  					code = 0;
  				continuation++;
  			}
  			if (cp < &reply_string[sizeof(reply_string) - 1])
  				*cp++ = c;
  		}
! 		if ((verbose > 0 || (verbose > -1 && n == '5')) &&
! 		    (n < '5' || !retry_connect)) {
  			(void) putchar(c);
  			(void) fflush (stdout);
  		}