summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/cvs/client.c6
-rw-r--r--usr.bin/cvs/remote.h3
-rw-r--r--usr.bin/cvs/server.c7
3 files changed, 11 insertions, 5 deletions
diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c
index b5d9f24f3e0..caef1ea3038 100644
--- a/usr.bin/cvs/client.c
+++ b/usr.bin/cvs/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.23 2006/11/14 09:47:52 xsa Exp $ */
+/* $OpenBSD: client.c,v 1.24 2006/11/14 09:59:54 xsa Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -27,7 +27,6 @@ struct cvs_req cvs_requests[] = {
{ "Root", 1, cvs_server_root, REQ_NEEDED },
{ "Valid-responses", 1, cvs_server_validresp, REQ_NEEDED },
{ "valid-requests", 1, cvs_server_validreq, REQ_NEEDED },
- { "Global_option", 0, cvs_server_globalopt, REQ_NEEDED },
{ "Directory", 0, cvs_server_directory, REQ_NEEDED },
{ "Entry", 0, cvs_server_entry, REQ_NEEDED },
{ "Modified", 0, cvs_server_modified, REQ_NEEDED },
@@ -35,6 +34,8 @@ struct cvs_req cvs_requests[] = {
{ "Unchanged", 0, cvs_server_unchanged, REQ_NEEDED },
{ "Questionable", 0, cvs_server_questionable, REQ_NEEDED },
{ "Argument", 0, cvs_server_argument, REQ_NEEDED },
+ { "Argumentx", 0, cvs_server_argumentx, REQ_NEEDED },
+ { "Global_option", 0, cvs_server_globalopt, REQ_NEEDED },
/*
* used to tell the server what is going on in our
@@ -50,7 +51,6 @@ struct cvs_req cvs_requests[] = {
{ "Is-modified", 0, NULL, 0 },
{ "Notify", 0, NULL, 0 },
{ "Case", 0, NULL, 0 },
- { "Argumentx", 0, NULL, 0 },
{ "Gzip-stream", 0, NULL, 0 },
{ "Kerberos-encrypt", 0, NULL, 0 },
{ "Gssapi-encrypt", 0, NULL, 0 },
diff --git a/usr.bin/cvs/remote.h b/usr.bin/cvs/remote.h
index 1c9ed773246..aaa1fb89e1d 100644
--- a/usr.bin/cvs/remote.h
+++ b/usr.bin/cvs/remote.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: remote.h,v 1.6 2006/11/14 09:47:52 xsa Exp $ */
+/* $OpenBSD: remote.h,v 1.7 2006/11/14 09:59:54 xsa Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -70,6 +70,7 @@ void cvs_server_useunchanged(char *);
void cvs_server_unchanged(char *);
void cvs_server_questionable(char *);
void cvs_server_argument(char *);
+void cvs_server_argumentx(char *);
void cvs_server_add(char *);
void cvs_server_admin(char *);
diff --git a/usr.bin/cvs/server.c b/usr.bin/cvs/server.c
index c0b108a0739..c7dababc9cc 100644
--- a/usr.bin/cvs/server.c
+++ b/usr.bin/cvs/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.36 2006/11/14 09:47:52 xsa Exp $ */
+/* $OpenBSD: server.c,v 1.37 2006/11/14 09:59:54 xsa Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -378,6 +378,11 @@ cvs_server_argument(char *data)
}
void
+cvs_server_argumentx(char *data)
+{
+}
+
+void
cvs_server_add(char *data)
{
if (chdir(server_currentdir) == -1)