===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/util.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/ftp/util.c	1998/09/22 04:42:49	1.21
--- src/usr.bin/ftp/util.c	1999/12/08 12:57:06	1.22
***************
*** 1,4 ****
! /*	$OpenBSD: util.c,v 1.21 1998/09/22 04:42:49 deraadt Exp $	*/
  /*	$NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: util.c,v 1.22 1999/12/08 12:57:06 itojun Exp $	*/
  /*	$NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $	*/
  
  /*
***************
*** 35,41 ****
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: util.c,v 1.21 1998/09/22 04:42:49 deraadt Exp $";
  #endif /* not lint */
  
  /*
--- 35,41 ----
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: util.c,v 1.22 1999/12/08 12:57:06 itojun Exp $";
  #endif /* not lint */
  
  /*
***************
*** 75,81 ****
  	char *argv[];
  {
  	char *host;
! 	in_port_t port;
  
  	if (connected) {
  		fprintf(ttyout, "Already connected to %s, use close first.\n",
--- 75,81 ----
  	char *argv[];
  {
  	char *host;
! 	char *port;
  
  	if (connected) {
  		fprintf(ttyout, "Already connected to %s, use close first.\n",
***************
*** 94,99 ****
--- 94,100 ----
  		port = gateport;
  	else
  		port = ftpport;
+ #if 0
  	if (argc > 2) {
  		char *ep;
  		long nport;
***************
*** 109,114 ****
--- 110,119 ----
  		}
  		port = htons((in_port_t)nport);
  	}
+ #else
+ 	if (argc > 2)
+ 		port = argv[2];
+ #endif
  
  	if (gatemode) {
  		if (gateserver == NULL || *gateserver == '\0')