===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/main.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -c -r1.86 -r1.87
*** src/usr.bin/ftp/main.c	2013/12/24 13:00:59	1.86
--- src/usr.bin/ftp/main.c	2014/01/23 00:39:15	1.87
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.86 2013/12/24 13:00:59 jca Exp $	*/
  /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.87 2014/01/23 00:39:15 deraadt Exp $	*/
  /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
  
  /*
***************
*** 200,206 ****
  #endif /* !SMALL */
  
  	while ((ch = getopt(argc, argv,
! 		    "46AaCc:dEegik:mno:pP:r:S:s:tvV")) != -1) {
  		switch (ch) {
  		case '4':
  			family = PF_INET;
--- 200,206 ----
  #endif /* !SMALL */
  
  	while ((ch = getopt(argc, argv,
! 		    "46AaCc:dD:Eegik:mno:pP:r:S:s:tvV")) != -1) {
  		switch (ch) {
  		case '4':
  			family = PF_INET;
***************
*** 229,234 ****
--- 229,237 ----
  #endif /* !SMALL */
  			break;
  
+ 		case 'D':
+ 			action = optarg;
+ 			break;
  		case 'd':
  #ifndef SMALL
  			options |= SO_DEBUG;
***************
*** 830,838 ****
  {
  	(void)fprintf(stderr, "usage: %s "
  #ifndef SMALL
! 	    "[-46AadEegimnptVv] [-k seconds] [-P port] "
! 	    "[-r seconds] [-s srcaddr]\n"
! 	    "           [host [port]]\n"
  	    "       %s [-C] "
  #endif /* !SMALL */
  	    "[-o output] "
--- 833,841 ----
  {
  	(void)fprintf(stderr, "usage: %s "
  #ifndef SMALL
! 	    "[-46AadEegimnptVv] [-D title] [-k seconds] [-P port] "
! 	    "[-r seconds]\n"
! 	    "           [-s srcaddr] [host [port]]\n"
  	    "       %s [-C] "
  #endif /* !SMALL */
  	    "[-o output] "