===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/ftp.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -c -r1.80 -r1.81
*** src/usr.bin/ftp/ftp.c	2010/07/02 22:01:10	1.80
--- src/usr.bin/ftp/ftp.c	2010/09/03 03:49:37	1.81
***************
*** 1,4 ****
! /*	$OpenBSD: ftp.c,v 1.80 2010/07/02 22:01:10 deraadt Exp $	*/
  /*	$NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: ftp.c,v 1.81 2010/09/03 03:49:37 lum Exp $	*/
  /*	$NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $	*/
  
  /*
***************
*** 1995,2000 ****
--- 1995,2001 ----
  abort_remote(FILE *din)
  {
  	char buf[BUFSIZ];
+ 	nfds_t nfds;
  	int nfnd;
  	struct pollfd pfd[2];
  	sig_t oldintr;
***************
*** 2020,2032 ****
  	(void)fflush(cout);
  	pfd[0].fd = fileno(cin);
  	pfd[0].events = POLLIN;
! 	nfnd = 1;
  	if (din) {
  		pfd[1].fd = fileno(din);
  		pfd[1].events = POLLIN;
! 		nfnd++;
  	}
! 	if ((nfnd = poll(pfd, nfnd, 10 * 1000)) <= 0) {
  		if (nfnd < 0)
  			warn("abort");
  		if (ptabflg)
--- 2021,2033 ----
  	(void)fflush(cout);
  	pfd[0].fd = fileno(cin);
  	pfd[0].events = POLLIN;
! 	nfds = 1;
  	if (din) {
  		pfd[1].fd = fileno(din);
  		pfd[1].events = POLLIN;
! 		nfds++;
  	}
! 	if ((nfnd = poll(pfd, nfds, 10 * 1000)) <= 0) {
  		if (nfnd < 0)
  			warn("abort");
  		if (ptabflg)