add missing command IDs

reviewed by xsa@ and Joris Vink

2 files changed, 39 insertions, 27 deletions

diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c
index 2b17f56d9ca..607c24eb0c6 100644
--- a/usr.bin/cvs/cvs.c
+++ b/usr.bin/cvs/cvs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cvs.c,v 1.35 2005/01/14 18:02:04 jfb Exp $	*/
+/*	$OpenBSD: cvs.c,v 1.36 2005/01/24 16:12:56 jfb Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -102,7 +102,7 @@ static struct cvs_cmd {
 		NULL,
 	},
 	{
-		-1, "admin",    { "adm", "rcs" }, NULL,
+		CVS_OP_ADMIN, "admin",    { "adm", "rcs" }, NULL,
 		"",
 		"",
 		"Administration front end for rcs",
@@ -137,21 +137,21 @@ static struct cvs_cmd {
 		NULL,
 	},
 	{
-		-1, "edit",     {              }, NULL,
+		CVS_OP_EDIT, "edit",     {              }, NULL,
 		"",
 		"",
 		"Get ready to edit a watched file",
 		NULL,
 	},
 	{
-		-1, "editors",  {              }, NULL,
+		CVS_OP_EDITORS, "editors",  {              }, NULL,
 		"",
 		"",
 		"See who is editing a watched file",
 		NULL,
 	},
 	{
-		-1, "export",   { "ex",  "exp" }, NULL,
+		CVS_OP_EXPORT, "export",   { "ex",  "exp" }, NULL,
 		"",
 		"",
 		"Export sources from CVS, similar to checkout",
@@ -210,14 +210,14 @@ static struct cvs_cmd {
 		NULL,
 	},
 	{
-		-1, "rdiff",    {}, NULL,
+		CVS_OP_RDIFF, "rdiff",    {}, NULL,
 		"",
 		"",
 		"Create 'patch' format diffs between releases",
 		NULL,
 	},
 	{
-		-1, "release",  {}, NULL,
+		CVS_OP_RELEASE, "release",  {}, NULL,
 		"",
 		"",
 		"Indicate that a Module is no longer in use",
@@ -231,14 +231,14 @@ static struct cvs_cmd {
 		NULL,
 	},
 	{
-		-1, "rlog",     {}, NULL,
+		CVS_OP_RLOG, "rlog",     {}, NULL,
 		"",
 		"",
 		"Print out history information for a module",
 		NULL,
 	},
 	{
-		-1, "rtag",     {}, NULL,
+		CVS_OP_RTAG, "rtag",     {}, NULL,
 		"",
 		"",
 		"Add a symbolic tag to a module",
@@ -266,7 +266,7 @@ static struct cvs_cmd {
 		NULL,
 	},
 	{
-		-1, "unedit",   {}, NULL,
+		CVS_OP_UNEDIT, "unedit",   {}, NULL,
 		"",
 		"",
 		"Undo an edit command",
@@ -286,14 +286,14 @@ static struct cvs_cmd {
 		NULL,
 	},
 	{
-		-1, "watch",    {}, NULL,
+		CVS_OP_WATCH, "watch",    {}, NULL,
 		"",
 		"",
 		"Set watches",
 		NULL,
 	},
 	{
-		-1, "watchers", {}, NULL,
+		CVS_OP_WATCHERS, "watchers", {}, NULL,
 		"",
 		"",
 		"See who is watching a file",
diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h
index 97b8be02549..6824a4f74e8 100644
--- a/usr.bin/cvs/cvs.h
+++ b/usr.bin/cvs/cvs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cvs.h,v 1.42 2005/01/13 17:53:34 jfb Exp $	*/
+/*	$OpenBSD: cvs.h,v 1.43 2005/01/24 16:12:56 jfb Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -49,20 +49,32 @@
 /* operations */
 #define CVS_OP_UNKNOWN      0
 #define CVS_OP_ADD          1
-#define CVS_OP_ANNOTATE     2
-#define CVS_OP_CHECKOUT     3
-#define CVS_OP_COMMIT       4
-#define CVS_OP_DIFF         5
-#define CVS_OP_HISTORY      6
-#define CVS_OP_IMPORT       7
-#define CVS_OP_INIT         8
-#define CVS_OP_LOG          9
-#define CVS_OP_REMOVE      10
-#define CVS_OP_SERVER      11
-#define CVS_OP_STATUS      12
-#define CVS_OP_TAG         13
-#define CVS_OP_UPDATE      14
-#define CVS_OP_VERSION     15
+#define CVS_OP_ADMIN        2
+#define CVS_OP_ANNOTATE     3
+#define CVS_OP_CHECKOUT     4
+#define CVS_OP_COMMIT       5
+#define CVS_OP_DIFF         6
+#define CVS_OP_EDIT         7
+#define CVS_OP_EDITORS      8
+#define CVS_OP_EXPORT       9
+#define CVS_OP_HISTORY     10 
+#define CVS_OP_IMPORT      11
+#define CVS_OP_INIT        12
+#define CVS_OP_LOG         13
+#define CVS_OP_RANNOTATE   14
+#define CVS_OP_RDIFF       15
+#define CVS_OP_RELEASE     16
+#define CVS_OP_REMOVE      17
+#define CVS_OP_RLOG        18
+#define CVS_OP_RTAG        19
+#define CVS_OP_SERVER      20
+#define CVS_OP_STATUS      21
+#define CVS_OP_TAG         22
+#define CVS_OP_UNEDIT      23
+#define CVS_OP_UPDATE      24
+#define CVS_OP_VERSION     25
+#define CVS_OP_WATCH       26
+#define CVS_OP_WATCHERS    27
 
 #define CVS_OP_ANY         64     /* all operations */