===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/ftp.c,v
retrieving revision 1.41.2.1
retrieving revision 1.42
diff -c -r1.41.2.1 -r1.42
*** src/usr.bin/ftp/ftp.c	2002/05/16 21:44:27	1.41.2.1
--- src/usr.bin/ftp/ftp.c	2002/02/16 21:27:46	1.42
***************
*** 1,4 ****
! /*	$OpenBSD: ftp.c,v 1.41.2.1 2002/05/16 21:44:27 miod Exp $	*/
  /*	$NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: ftp.c,v 1.42 2002/02/16 21:27:46 millert Exp $	*/
  /*	$NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $	*/
  
  /*
***************
*** 67,73 ****
  #if 0
  static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
  #else
! static char rcsid[] = "$OpenBSD: ftp.c,v 1.41.2.1 2002/05/16 21:44:27 miod Exp $";
  #endif
  #endif /* not lint */
  
--- 67,73 ----
  #if 0
  static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
  #else
! static char rcsid[] = "$OpenBSD: ftp.c,v 1.42 2002/02/16 21:27:46 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 422,431 ****
  			if (dig > 4 && pflag == 1 && isdigit(c))
  				pflag = 2;
  			if (pflag == 2) {
! 				if (c != '\r' && c != ')') {
! 					if (pt < &pasv[sizeof(pasv) - 1])
! 						*pt++ = c;
! 				} else {
  					*pt = '\0';
  					pflag = 3;
  				}
--- 422,430 ----
  			if (dig > 4 && pflag == 1 && isdigit(c))
  				pflag = 2;
  			if (pflag == 2) {
! 				if (c != '\r' && c != ')')
! 					*pt++ = c;
! 				else {
  					*pt = '\0';
  					pflag = 3;
  				}
***************
*** 507,513 ****
  	struct stat st;
  	int c, d;
  	FILE * volatile fin, * volatile dout;
! 	int (* volatile closefunc) __P((FILE *));
  	volatile sig_t oldinti, oldintr, oldintp;
  	volatile off_t hashbytes;
  	char * volatile lmode;
--- 506,512 ----
  	struct stat st;
  	int c, d;
  	FILE * volatile fin, * volatile dout;
! 	int (* volatile closefunc)(FILE *);
  	volatile sig_t oldinti, oldintr, oldintp;
  	volatile off_t hashbytes;
  	char * volatile lmode;
***************
*** 800,806 ****
  	int printnames, ignorespecial;
  {
  	FILE * volatile fout, * volatile din;
! 	int (* volatile closefunc) __P((FILE *));
  	volatile sig_t oldinti, oldintr, oldintp;
  	int c, d;
  	volatile int is_retr, tcrflag, bare_lfs;
--- 799,805 ----
  	int printnames, ignorespecial;
  {
  	FILE * volatile fout, * volatile din;
! 	int (* volatile closefunc)(FILE *);
  	volatile sig_t oldinti, oldintr, oldintp;
  	int c, d;
  	volatile int is_retr, tcrflag, bare_lfs;