===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/ftp.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/ftp/ftp.c	1997/04/23 20:33:13	1.18
--- src/usr.bin/ftp/ftp.c	1997/06/17 20:40:40	1.19
***************
*** 1,4 ****
! /*	$OpenBSD: ftp.c,v 1.18 1997/04/23 20:33:13 deraadt Exp $	*/
  /*	$NetBSD: ftp.c,v 1.25 1997/04/14 09:09:22 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: ftp.c,v 1.19 1997/06/17 20:40:40 kstailey Exp $	*/
  /*	$NetBSD: ftp.c,v 1.25 1997/04/14 09:09:22 lukem 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.18 1997/04/23 20:33:13 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.19 1997/06/17 20:40:40 kstailey Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 1410,1416 ****
  		if (command("%s %s", cmd2, local) != PRELIM) {
  			pswitch(0);
  			if (cpend)
! 				abort_remote((FILE *) NULL);
  		}
  		pswitch(1);
  		if (ptabflg)
--- 1410,1416 ----
  		if (command("%s %s", cmd2, local) != PRELIM) {
  			pswitch(0);
  			if (cpend)
! 				abort_remote(NULL);
  		}
  		pswitch(1);
  		if (ptabflg)
***************
*** 1419,1431 ****
  		return;
  	}
  	if (cpend)
! 		abort_remote((FILE *) NULL);
  	pswitch(!proxy);
  	if (!cpend && !secndflag) {  /* only if cmd = "RETR" (proxy=1) */
  		if (command("%s %s", cmd2, local) != PRELIM) {
  			pswitch(0);
  			if (cpend)
! 				abort_remote((FILE *) NULL);
  			pswitch(1);
  			if (ptabflg)
  				code = -1;
--- 1419,1431 ----
  		return;
  	}
  	if (cpend)
! 		abort_remote(NULL);
  	pswitch(!proxy);
  	if (!cpend && !secndflag) {  /* only if cmd = "RETR" (proxy=1) */
  		if (command("%s %s", cmd2, local) != PRELIM) {
  			pswitch(0);
  			if (cpend)
! 				abort_remote(NULL);
  			pswitch(1);
  			if (ptabflg)
  				code = -1;
***************
*** 1434,1440 ****
  		}
  	}
  	if (cpend)
! 		abort_remote((FILE *) NULL);
  	pswitch(!proxy);
  	if (cpend) {
  		FD_ZERO(&mask);
--- 1434,1440 ----
  		}
  	}
  	if (cpend)
! 		abort_remote(NULL);
  	pswitch(!proxy);
  	if (cpend) {
  		FD_ZERO(&mask);