===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cvs.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** src/usr.bin/cvs/cvs.c	2005/03/08 16:13:30	1.42
--- src/usr.bin/cvs/cvs.c	2005/03/24 01:03:41	1.43
***************
*** 1,4 ****
! /*	$OpenBSD: cvs.c,v 1.42 2005/03/08 16:13:30 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: cvs.c,v 1.43 2005/03/24 01:03:41 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 84,119 ****
   * returned is EX_USAGE, the command's usage string is printed to standard
   * error before returning.
   */
! static struct cvs_cmd {
! 	int     cmd_op;
! 	char    cmd_name[CVS_CMD_MAXNAMELEN];
! 	char    cmd_alias[CVS_CMD_MAXALIAS][CVS_CMD_MAXNAMELEN];
! 	int   (*cmd_hdlr)(int, char **);
! 	char   *cmd_synopsis;
! 	char   *cmd_opts;
! 	char    cmd_descr[CVS_CMD_MAXDESCRLEN];
! 	char   *cmd_defargs;
! } cvs_cdt[] = {
  	{
  		CVS_OP_ADD, "add",      { "ad",  "new" }, cvs_add,
  		"[-k opt] [-m msg] file ...",
  		"k:m:",
  		"Add a new file/directory to the repository",
! 		NULL,
  	},
  	{
  		CVS_OP_ADMIN, "admin",    { "adm", "rcs" }, cvs_admin,
  		"",
  		"",
  		"Administration front end for rcs",
! 		NULL,
  	},
  	{
  		CVS_OP_ANNOTATE, "annotate", { "ann"        }, cvs_annotate,
  		"[-flR] [-D date | -r rev] ...",
  		"D:flRr:",
  		"Show last revision where each line was modified",
! 		NULL,
  	},
  	{
  		CVS_OP_CHECKOUT, "checkout", { "co",  "get" }, cvs_checkout,
--- 84,110 ----
   * returned is EX_USAGE, the command's usage string is printed to standard
   * error before returning.
   */
! struct cvs_cmd cvs_cdt[] = {
  	{
  		CVS_OP_ADD, "add",      { "ad",  "new" }, cvs_add,
  		"[-k opt] [-m msg] file ...",
  		"k:m:",
  		"Add a new file/directory to the repository",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_ADMIN, "admin",    { "adm", "rcs" }, cvs_admin,
  		"",
  		"",
  		"Administration front end for rcs",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_ANNOTATE, "annotate", { "ann"        }, cvs_annotate,
  		"[-flR] [-D date | -r rev] ...",
  		"D:flRr:",
  		"Show last revision where each line was modified",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_CHECKOUT, "checkout", { "co",  "get" }, cvs_checkout,
***************
*** 121,169 ****
  		"[-t id] module ...",
  		"AcD:d:fj:k:lNnPRr:st:",
  		"Checkout sources for editing",
! 		NULL,
  	},
  	{
  		CVS_OP_COMMIT, "commit",   { "ci",  "com" }, cvs_commit,
  		"[-flR] [-F logfile | -m msg] [-r rev] ...",
  		"F:flm:Rr:",
  		"Check files into the repository",
! 		NULL,
  	},
  	{
  		CVS_OP_DIFF, "diff",     { "di",  "dif" }, cvs_diff,
  		"[-cilNpu] [-D date] [-r rev] ...",
  		"cD:ilNpr:u",
  		"Show differences between revisions",
! 		NULL,
  	},
  	{
  		CVS_OP_EDIT, "edit",     {              }, NULL,
  		"",
  		"",
  		"Get ready to edit a watched file",
! 		NULL,
  	},
  	{
  		CVS_OP_EDITORS, "editors",  {              }, NULL,
  		"",
  		"",
  		"See who is editing a watched file",
! 		NULL,
  	},
  	{
  		CVS_OP_EXPORT, "export",   { "ex",  "exp" }, NULL,
  		"",
  		"",
  		"Export sources from CVS, similar to checkout",
! 		NULL,
  	},
  	{
  		CVS_OP_HISTORY, "history",  { "hi",  "his" }, cvs_history,
  		"",
  		"",
  		"Show repository access history",
! 		NULL,
  	},
  	{
  		CVS_OP_IMPORT, "import",   { "im",  "imp" }, cvs_import,
--- 112,160 ----
  		"[-t id] module ...",
  		"AcD:d:fj:k:lNnPRr:st:",
  		"Checkout sources for editing",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_COMMIT, "commit",   { "ci",  "com" }, cvs_commit,
  		"[-flR] [-F logfile | -m msg] [-r rev] ...",
  		"F:flm:Rr:",
  		"Check files into the repository",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_DIFF, "diff",     { "di",  "dif" }, cvs_diff,
  		"[-cilNpu] [-D date] [-r rev] ...",
  		"cD:ilNpr:u",
  		"Show differences between revisions",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_EDIT, "edit",     {              }, NULL,
  		"",
  		"",
  		"Get ready to edit a watched file",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_EDITORS, "editors",  {              }, NULL,
  		"",
  		"",
  		"See who is editing a watched file",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_EXPORT, "export",   { "ex",  "exp" }, NULL,
  		"",
  		"",
  		"Export sources from CVS, similar to checkout",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_HISTORY, "history",  { "hi",  "his" }, cvs_history,
  		"",
  		"",
  		"Show repository access history",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_IMPORT, "import",   { "im",  "imp" }, cvs_import,
***************
*** 171,184 ****
  		"repository vendor-tag release-tags ...",
  		"b:dI:k:m:",
  		"Import sources into CVS, using vendor branches",
! 		NULL,
  	},
  	{
  		CVS_OP_INIT, "init",     {              }, cvs_init,
  		"",
  		"",
  		"Create a CVS repository if it doesn't exist",
! 		NULL,
  	},
  #if defined(HAVE_KERBEROS)
  	{
--- 162,175 ----
  		"repository vendor-tag release-tags ...",
  		"b:dI:k:m:",
  		"Import sources into CVS, using vendor branches",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_INIT, "init",     {              }, cvs_init,
  		"",
  		"",
  		"Create a CVS repository if it doesn't exist",
! 		NULL, NULL
  	},
  #if defined(HAVE_KERBEROS)
  	{
***************
*** 186,192 ****
  		"",
  		"",
  		"Start a Kerberos authentication CVS server",
! 		NULL,
  	},
  #endif
  	{
--- 177,183 ----
  		"",
  		"",
  		"Start a Kerberos authentication CVS server",
! 		NULL, NULL
  	},
  #endif
  	{
***************
*** 194,277 ****
  		"[-bhlNRt] [-d dates] [-r revisions] [-s states] [-w logins]",
  		"",
  		"Print out history information for files",
! 		NULL,
  	},
  	{
  		-1, "login",    {}, NULL,
  		"",
  		"",
  		"Prompt for password for authenticating server",
! 		NULL,
  	},
  	{
  		-1, "logout",   {}, NULL,
  		"",
  		"",
  		"Removes entry in .cvspass for remote repository",
! 		NULL,
  	},
  	{
  		CVS_OP_RDIFF, "rdiff",    {}, NULL,
  		"",
  		"",
  		"Create 'patch' format diffs between releases",
! 		NULL,
  	},
  	{
  		CVS_OP_RELEASE, "release",  {}, NULL,
  		"[-d]",
  		"d",
  		"Indicate that a Module is no longer in use",
! 		NULL,
  	},
  	{
  		CVS_OP_REMOVE, "remove",   { "rm", "delete" }, cvs_remove,
  		"[-flR] file ...",
  		"flR",
  		"Remove an entry from the repository",
! 		NULL,
  	},
  	{
  		CVS_OP_RLOG, "rlog",     {}, NULL,
  		"",
  		"",
  		"Print out history information for a module",
! 		NULL,
  	},
  	{
  		CVS_OP_RTAG, "rtag",     {}, NULL,
  		"",
  		"",
  		"Add a symbolic tag to a module",
! 		NULL,
  	},
  	{
  		CVS_OP_SERVER, "server",   {}, cvs_server,
  		"",
  		"",
  		"Server mode",
! 		NULL,
  	},
  	{
  		CVS_OP_STATUS, "status",   { "st", "stat" }, cvs_status,
  		"[-lRv]",
  		"lRv",
  		"Display status information on checked out files",
! 		NULL,
  	},
  	{
  		CVS_OP_TAG, "tag",      { "ta", "freeze" }, cvs_tag,
  		"[-bcdFflR] [-D date | -r rev] tagname",
  		"bcD:dFflRr:",
  		"Add a symbolic tag to checked out version of files",
! 		NULL,
  	},
  	{
  		CVS_OP_UNEDIT, "unedit",   {}, NULL,
  		"",
  		"",
  		"Undo an edit command",
! 		NULL,
  	},
  	{
  		CVS_OP_UPDATE, "update",   { "up", "upd" }, cvs_update,
--- 185,268 ----
  		"[-bhlNRt] [-d dates] [-r revisions] [-s states] [-w logins]",
  		"",
  		"Print out history information for files",
! 		NULL, NULL
  	},
  	{
  		-1, "login",    {}, NULL,
  		"",
  		"",
  		"Prompt for password for authenticating server",
! 		NULL, NULL
  	},
  	{
  		-1, "logout",   {}, NULL,
  		"",
  		"",
  		"Removes entry in .cvspass for remote repository",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_RDIFF, "rdiff",    {}, NULL,
  		"",
  		"",
  		"Create 'patch' format diffs between releases",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_RELEASE, "release",  {}, NULL,
  		"[-d]",
  		"d",
  		"Indicate that a Module is no longer in use",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_REMOVE, "remove",   { "rm", "delete" }, cvs_remove,
  		"[-flR] file ...",
  		"flR",
  		"Remove an entry from the repository",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_RLOG, "rlog",     {}, NULL,
  		"",
  		"",
  		"Print out history information for a module",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_RTAG, "rtag",     {}, NULL,
  		"",
  		"",
  		"Add a symbolic tag to a module",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_SERVER, "server",   {}, cvs_server,
  		"",
  		"",
  		"Server mode",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_STATUS, "status",   { "st", "stat" }, cvs_status,
  		"[-lRv]",
  		"lRv",
  		"Display status information on checked out files",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_TAG, "tag",      { "ta", "freeze" }, cvs_tag,
  		"[-bcdFflR] [-D date | -r rev] tagname",
  		"bcD:dFflRr:",
  		"Add a symbolic tag to checked out version of files",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_UNEDIT, "unedit",   {}, NULL,
  		"",
  		"",
  		"Undo an edit command",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_UPDATE, "update",   { "up", "upd" }, cvs_update,
***************
*** 279,305 ****
  		"[-t id] ...",
  		"",
  		"Bring work tree in sync with repository",
! 		NULL,
  	},
  	{
  		CVS_OP_VERSION, "version",  { "ve", "ver" }, cvs_version,
  		"", "",
  		"Show current CVS version(s)",
! 		NULL,
  	},
  	{
  		CVS_OP_WATCH, "watch",    {}, NULL,
  		"",
  		"",
  		"Set watches",
! 		NULL,
  	},
  	{
  		CVS_OP_WATCHERS, "watchers", {}, NULL,
  		"",
  		"",
  		"See who is watching a file",
! 		NULL,
  	},
  };
  
--- 270,296 ----
  		"[-t id] ...",
  		"",
  		"Bring work tree in sync with repository",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_VERSION, "version",  { "ve", "ver" }, cvs_version,
  		"", "",
  		"Show current CVS version(s)",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_WATCH, "watch",    {}, NULL,
  		"",
  		"",
  		"Set watches",
! 		NULL, NULL
  	},
  	{
  		CVS_OP_WATCHERS, "watchers", {}, NULL,
  		"",
  		"",
  		"See who is watching a file",
! 		NULL, NULL
  	},
  };