===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/cmdtab.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/ftp/cmdtab.c	1997/03/14 04:32:12	1.7
--- src/usr.bin/ftp/cmdtab.c	1997/03/21 20:59:27	1.8
***************
*** 1,5 ****
! /*	$OpenBSD: cmdtab.c,v 1.7 1997/03/14 04:32:12 millert Exp $	*/
! /*	$NetBSD: cmdtab.c,v 1.13 1997/03/13 06:23:12 lukem Exp $	*/
  
  /*
   * Copyright (c) 1985, 1989, 1993, 1994
--- 1,5 ----
! /*	$OpenBSD: cmdtab.c,v 1.8 1997/03/21 20:59:27 millert Exp $	*/
! /*	$NetBSD: cmdtab.c,v 1.14 1997/03/14 01:39:34 christos Exp $	*/
  
  /*
   * Copyright (c) 1985, 1989, 1993, 1994
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)cmdtab.c	8.4 (Berkeley) 10/9/94";
  #else
! static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.7 1997/03/14 04:32:12 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)cmdtab.c	8.4 (Berkeley) 10/9/94";
  #else
! static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.8 1997/03/21 20:59:27 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 65,73 ****
  char	dirhelp[] =	"list contents of remote directory";
  char	disconhelp[] =	"terminate ftp session";
  char	domachelp[] =	"execute macro";
! #ifndef SMALLFTP
  char	edithelp[] =	"toggle command line editing";
! #endif /* !SMALLFTP */
  char	formhelp[] =	"set file transfer format";
  char	globhelp[] =	"toggle metacharacter expansion of local file names";
  char	hashhelp[] =	"toggle printing `#' marks; specify number to set size";
--- 65,73 ----
  char	dirhelp[] =	"list contents of remote directory";
  char	disconhelp[] =	"terminate ftp session";
  char	domachelp[] =	"execute macro";
! #ifndef SMALL
  char	edithelp[] =	"toggle command line editing";
! #endif /* !SMALL */
  char	formhelp[] =	"set file transfer format";
  char	globhelp[] =	"toggle metacharacter expansion of local file names";
  char	hashhelp[] =	"toggle printing `#' marks; specify number to set size";
***************
*** 126,138 ****
  char	userhelp[] =	"send new user information";
  char	verbosehelp[] =	"toggle verbose mode";
  
! #ifdef SMALLFTP
  #define CMPL(x)
  #define CMPL0
! #else  /* !SMALLFTP */
  #define CMPL(x)	__STRING(x), 
  #define CMPL0	"",
! #endif /* !SMALLFTP */
  
  struct cmd cmdtab[] = {
  	{ "!",		shellhelp,	0, 0, 0, CMPL0		shell },
--- 126,138 ----
  char	userhelp[] =	"send new user information";
  char	verbosehelp[] =	"toggle verbose mode";
  
! #ifdef SMALL
  #define CMPL(x)
  #define CMPL0
! #else  /* !SMALL */
  #define CMPL(x)	__STRING(x), 
  #define CMPL0	"",
! #endif /* !SMALL */
  
  struct cmd cmdtab[] = {
  	{ "!",		shellhelp,	0, 0, 0, CMPL0		shell },
***************
*** 153,161 ****
  	{ "delete",	deletehelp,	0, 1, 1, CMPL(r)	delete },
  	{ "dir",	dirhelp,	1, 1, 1, CMPL(rl)	ls },
  	{ "disconnect",	disconhelp,	0, 1, 1, CMPL0		disconnect },
! #ifndef SMALLFTP
  	{ "edit",	edithelp,	0, 0, 0, CMPL0		setedit },
! #endif /* !SMALLFTP */
  	{ "exit",	quithelp,	0, 0, 0, CMPL0		quit },
  	{ "form",	formhelp,	0, 1, 1, CMPL0		setform },
  	{ "ftp",	connecthelp,	0, 0, 1, CMPL0		setpeer },
--- 153,161 ----
  	{ "delete",	deletehelp,	0, 1, 1, CMPL(r)	delete },
  	{ "dir",	dirhelp,	1, 1, 1, CMPL(rl)	ls },
  	{ "disconnect",	disconhelp,	0, 1, 1, CMPL0		disconnect },
! #ifndef SMALL
  	{ "edit",	edithelp,	0, 0, 0, CMPL0		setedit },
! #endif /* !SMALL */
  	{ "exit",	quithelp,	0, 0, 0, CMPL0		quit },
  	{ "form",	formhelp,	0, 1, 1, CMPL0		setform },
  	{ "ftp",	connecthelp,	0, 0, 1, CMPL0		setpeer },