===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/main.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -c -r1.60 -r1.61
*** src/usr.bin/ftp/main.c	2006/04/25 05:45:20	1.60
--- src/usr.bin/ftp/main.c	2006/05/16 16:20:42	1.61
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.60 2006/04/25 05:45:20 tedu Exp $	*/
  /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.61 2006/05/16 16:20:42 deraadt Exp $	*/
  /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
  
  /*
***************
*** 66,72 ****
  #endif /* not lint */
  
  #if !defined(lint) && !defined(SMALL)
! static const char rcsid[] = "$OpenBSD: main.c,v 1.60 2006/04/25 05:45:20 tedu Exp $";
  #endif /* not lint and not SMALL */
  
  /*
--- 66,72 ----
  #endif /* not lint */
  
  #if !defined(lint) && !defined(SMALL)
! static const char rcsid[] = "$OpenBSD: main.c,v 1.61 2006/05/16 16:20:42 deraadt Exp $";
  #endif /* not lint and not SMALL */
  
  /*
***************
*** 100,105 ****
--- 100,108 ----
  
  	ftpport = "ftp";
  	httpport = "http";
+ #ifndef SMALL
+ 	httpsport = "https";
+ #endif
  	gateport = getenv("FTPSERVERPORT");
  	if (gateport == NULL || *gateport == '\0')
  		gateport = "ftpgate";
***************
*** 730,736 ****
--- 733,746 ----
  	    "usage: %s [-46AadEegimnptVv] [-P port] [-r seconds] [host [port]]\n"
  	    "       %s [-o output] ftp://[user:password@]host[:port]/file[/]\n"
  	    "       %s [-o output] http://host[:port]/file\n"
+ #ifndef SMALL
+ 	    "       %s [-o output] https://host[:port]/file\n"
+ #endif
  	    "       %s [-o output] host:[/path/]file[/]\n",
+ #ifndef SMALL
+ 	    __progname, __progname, __progname, __progname, __progname);
+ #else
  	    __progname, __progname, __progname, __progname);
+ #endif
  	exit(1);
  }