===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/main.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -c -r1.48 -r1.49
*** src/usr.bin/ftp/main.c	2001/06/23 22:48:45	1.48
--- src/usr.bin/ftp/main.c	2002/05/30 06:51:46	1.49
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.48 2001/06/23 22:48:45 millert Exp $	*/
  /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.49 2002/05/30 06:51:46 deraadt Exp $	*/
  /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
  
  /*
***************
*** 73,79 ****
  #if 0
  static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 10/9/94";
  #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.48 2001/06/23 22:48:45 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 73,79 ----
  #if 0
  static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 10/9/94";
  #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.49 2002/05/30 06:51:46 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 95,100 ****
--- 95,102 ----
  
  #include "ftp_var.h"
  
+ int family = PF_UNSPEC;
+ 
  int
  main(argc, argv)
  	volatile int argc;
***************
*** 180,187 ****
  	if (isatty(fileno(ttyout)) && !dumb_terminal && foregroundproc())
  		progress = 1;		/* progress bar on if tty is usable */
  
! 	while ((ch = getopt(argc, argv, "Aadegimno:pP:r:tvV")) != -1) {
  		switch (ch) {
  		case 'A':
  			activefallback = 0;
  			passivemode = 0;
--- 182,195 ----
  	if (isatty(fileno(ttyout)) && !dumb_terminal && foregroundproc())
  		progress = 1;		/* progress bar on if tty is usable */
  
! 	while ((ch = getopt(argc, argv, "46Aadegimno:pP:r:tvV")) != -1) {
  		switch (ch) {
+ 		case '4':
+ 			family = PF_INET;
+ 			break;
+ 		case '6':
+ 			family = PF_INET6;
+ 			break;
  		case 'A':
  			activefallback = 0;
  			passivemode = 0;