summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cvs/add.c5
-rw-r--r--usr.bin/cvs/checkout.c7
-rw-r--r--usr.bin/cvs/commit.c5
-rw-r--r--usr.bin/cvs/config.c3
-rw-r--r--usr.bin/cvs/diff.c5
-rw-r--r--usr.bin/cvs/getlog.c5
-rw-r--r--usr.bin/cvs/import.c5
-rw-r--r--usr.bin/cvs/init.c5
-rw-r--r--usr.bin/cvs/proto.h158
-rw-r--r--usr.bin/cvs/remove.c5
-rw-r--r--usr.bin/cvs/root.c7
-rw-r--r--usr.bin/cvs/status.c5
-rw-r--r--usr.bin/cvs/tag.c5
-rw-r--r--usr.bin/cvs/update.c5
14 files changed, 25 insertions, 200 deletions
diff --git a/usr.bin/cvs/add.c b/usr.bin/cvs/add.c
index 1197d5f1922..eb8755d8f58 100644
--- a/usr.bin/cvs/add.c
+++ b/usr.bin/cvs/add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: add.c,v 1.56 2006/06/14 15:14:47 xsa Exp $ */
+/* $OpenBSD: add.c,v 1.57 2006/06/16 14:07:42 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -21,7 +21,6 @@
#include "cvs.h"
#include "diff.h"
#include "log.h"
-#include "proto.h"
extern char *__progname;
@@ -35,7 +34,7 @@ static void add_entry(struct cvs_file *);
char *logmsg;
struct cvs_cmd cvs_cmd_add = {
- CVS_OP_ADD, CVS_REQ_ADD, "add",
+ CVS_OP_ADD, 0, "add",
{ "ad", "new" },
"Add a new file or directory to the repository",
"[-m message] ...",
diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c
index a6ff611b5ea..e54bc3282f1 100644
--- a/usr.bin/cvs/checkout.c
+++ b/usr.bin/cvs/checkout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: checkout.c,v 1.62 2006/06/14 20:28:53 joris Exp $ */
+/* $OpenBSD: checkout.c,v 1.63 2006/06/16 14:07:42 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -20,7 +20,6 @@
#include "cvs.h"
#include "log.h"
#include "diff.h"
-#include "proto.h"
int cvs_checkout(int, char **);
int cvs_export(int, char **);
@@ -31,7 +30,7 @@ extern int prune_dirs;
extern int build_dirs;
struct cvs_cmd cvs_cmd_checkout = {
- CVS_OP_CHECKOUT, CVS_REQ_CO, "checkout",
+ CVS_OP_CHECKOUT, 0, "checkout",
{ "co", "get" },
"Checkout a working copy of a repository",
"[-AcflNnPpRs] [-D date | -r tag] [-d dir] [-j rev] [-k mode] "
@@ -42,7 +41,7 @@ struct cvs_cmd cvs_cmd_checkout = {
};
struct cvs_cmd cvs_cmd_export = {
- CVS_OP_EXPORT, CVS_REQ_EXPORT, "export",
+ CVS_OP_EXPORT, 0, "export",
{ "exp", "ex" },
"Export sources from CVS, similar to checkout",
"[-flNnR] [-d dir] [-k mode] -D date | -r rev module ...",
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c
index d2021d87b9f..0c32ef3fd0a 100644
--- a/usr.bin/cvs/commit.c
+++ b/usr.bin/cvs/commit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: commit.c,v 1.73 2006/06/14 14:10:50 joris Exp $ */
+/* $OpenBSD: commit.c,v 1.74 2006/06/16 14:07:42 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
* Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -21,7 +21,6 @@
#include "cvs.h"
#include "diff.h"
#include "log.h"
-#include "proto.h"
int cvs_commit(int, char **);
void cvs_commit_local(struct cvs_file *);
@@ -35,7 +34,7 @@ int conflicts_found;
char *logmsg;
struct cvs_cmd cvs_cmd_commit = {
- CVS_OP_COMMIT, CVS_REQ_CI, "commit",
+ CVS_OP_COMMIT, 0, "commit",
{ "ci", "com" },
"Check files into the repository",
"[-flR] [-F logfile | -m msg] [-r rev] ...",
diff --git a/usr.bin/cvs/config.c b/usr.bin/cvs/config.c
index f9f7c678a78..a8ea5756a9b 100644
--- a/usr.bin/cvs/config.c
+++ b/usr.bin/cvs/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.3 2006/05/28 15:45:31 joris Exp $ */
+/* $OpenBSD: config.c,v 1.4 2006/06/16 14:07:42 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -21,7 +21,6 @@
#include "config.h"
#include "diff.h"
#include "log.h"
-#include "proto.h"
void
cvs_parse_configfile(void)
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index 9f039c332f6..4aca768f907 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.103 2006/06/14 20:28:53 joris Exp $ */
+/* $OpenBSD: diff.c,v 1.104 2006/06/16 14:07:42 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -20,7 +20,6 @@
#include "cvs.h"
#include "diff.h"
#include "log.h"
-#include "proto.h"
int cvs_diff(int, char **);
void cvs_diff_local(struct cvs_file *);
@@ -30,7 +29,7 @@ static char *rev1 = NULL;
static char *rev2 = NULL;
struct cvs_cmd cvs_cmd_diff = {
- CVS_OP_DIFF, CVS_REQ_DIFF, "diff",
+ CVS_OP_DIFF, 0, "diff",
{ "di", "dif" },
"Show differences between revisions",
"[-cilNnpu] [[-D date] [-r rev] [-D date2 | -r rev2]] "
diff --git a/usr.bin/cvs/getlog.c b/usr.bin/cvs/getlog.c
index 65e36f4fb72..14b916e13af 100644
--- a/usr.bin/cvs/getlog.c
+++ b/usr.bin/cvs/getlog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getlog.c,v 1.62 2006/06/02 19:10:24 david Exp $ */
+/* $OpenBSD: getlog.c,v 1.63 2006/06/16 14:07:42 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -20,7 +20,6 @@
#include "cvs.h"
#include "diff.h"
#include "log.h"
-#include "proto.h"
#define LOG_REVSEP \
"----------------------------"
@@ -34,7 +33,7 @@ void cvs_log_local(struct cvs_file *);
char *logrev = NULL;
struct cvs_cmd cvs_cmd_log = {
- CVS_OP_LOG, CVS_REQ_LOG, "log",
+ CVS_OP_LOG, 0, "log",
{ "lo" },
"Print out history information for files",
"[-bhlNRt] [-d dates] [-r revisions] [-s states] [-w logins]",
diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c
index 87e139dd899..10e58f72828 100644
--- a/usr.bin/cvs/import.c
+++ b/usr.bin/cvs/import.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: import.c,v 1.51 2006/06/16 14:02:37 xsa Exp $ */
+/* $OpenBSD: import.c,v 1.52 2006/06/16 14:07:42 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -20,7 +20,6 @@
#include "cvs.h"
#include "diff.h"
#include "log.h"
-#include "proto.h"
int cvs_import(int, char **);
void cvs_import_local(struct cvs_file *);
@@ -43,7 +42,7 @@ char *import_repository = NULL;
int import_conflicts = 0;
struct cvs_cmd cvs_cmd_import = {
- CVS_OP_IMPORT, CVS_REQ_IMPORT, "import",
+ CVS_OP_IMPORT, 0, "import",
{ "im", "imp" },
"Import sources into CVS, using vendor branches",
"[-d] [-b branch] [-m message] repository vendor-tag release-tags",
diff --git a/usr.bin/cvs/init.c b/usr.bin/cvs/init.c
index 370e6b1a0fe..c6e7504f6bc 100644
--- a/usr.bin/cvs/init.c
+++ b/usr.bin/cvs/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.24 2006/06/13 06:52:11 joris Exp $ */
+/* $OpenBSD: init.c,v 1.25 2006/06/16 14:07:42 joris Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -30,7 +30,6 @@
#include "cvs.h"
#include "init.h"
#include "log.h"
-#include "proto.h"
int cvs_init(int, char **);
void cvs_init_local(void);
@@ -67,7 +66,7 @@ static const char *cvsroot_dirs[2] = {
#define INIT_NDIRS (sizeof(cvsroot_dirs)/sizeof(cvsroot_dirs[0]))
struct cvs_cmd cvs_cmd_init = {
- CVS_OP_INIT, CVS_REQ_INIT, "init",
+ CVS_OP_INIT, 0, "init",
{ },
"Create a CVS repository if it doesn't exist",
"",
diff --git a/usr.bin/cvs/proto.h b/usr.bin/cvs/proto.h
deleted file mode 100644
index a0ca441009c..00000000000
--- a/usr.bin/cvs/proto.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* $OpenBSD: proto.h,v 1.13 2006/05/27 03:30:31 joris Exp $ */
-/*
- * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PROTO_H
-#define PROTO_H
-
-#include "buf.h"
-
-#define CVS_PROTO_MAXARG 256
-#define CVS_REQ_TIMEOUT 300
-
-/* client/server protocol requests */
-#define CVS_REQ_NONE 0
-#define CVS_REQ_ROOT 1
-#define CVS_REQ_VALIDREQ 2
-#define CVS_REQ_VALIDRESP 3
-#define CVS_REQ_DIRECTORY 4
-#define CVS_REQ_MAXDOTDOT 5
-#define CVS_REQ_STATICDIR 6
-#define CVS_REQ_STICKY 7
-#define CVS_REQ_ENTRY 8
-#define CVS_REQ_ENTRYEXTRA 9
-#define CVS_REQ_CHECKINTIME 10
-#define CVS_REQ_MODIFIED 11
-#define CVS_REQ_ISMODIFIED 12
-#define CVS_REQ_UNCHANGED 13
-#define CVS_REQ_USEUNCHANGED 14
-#define CVS_REQ_NOTIFY 15
-#define CVS_REQ_NOTIFYUSER 16
-#define CVS_REQ_QUESTIONABLE 17
-#define CVS_REQ_CASE 18
-#define CVS_REQ_UTF8 19
-#define CVS_REQ_ARGUMENT 20
-#define CVS_REQ_ARGUMENTX 21
-#define CVS_REQ_GLOBALOPT 22
-#define CVS_REQ_GZIPSTREAM 23
-#define CVS_REQ_KERBENCRYPT 24
-#define CVS_REQ_GSSENCRYPT 25
-#define CVS_REQ_PROTOENCRYPT 26
-#define CVS_REQ_GSSAUTH 27
-#define CVS_REQ_PROTOAUTH 28
-#define CVS_REQ_READCVSRC2 29
-#define CVS_REQ_READWRAP 30
-#define CVS_REQ_ERRIFREADER 31
-#define CVS_REQ_VALIDRCSOPT 32
-#define CVS_REQ_READIGNORE 33
-#define CVS_REQ_SET 34
-#define CVS_REQ_XPANDMOD 35
-#define CVS_REQ_CI 36
-#define CVS_REQ_CHOWN 37
-#define CVS_REQ_SETOWN 38
-#define CVS_REQ_SETPERM 39
-#define CVS_REQ_CHACL 40
-#define CVS_REQ_LISTPERM 41
-#define CVS_REQ_LISTACL 42
-#define CVS_REQ_SETPASS 43
-#define CVS_REQ_PASSWD 44
-#define CVS_REQ_DIFF 45
-#define CVS_REQ_STATUS 46
-#define CVS_REQ_LS 47
-#define CVS_REQ_TAG 48
-#define CVS_REQ_IMPORT 49
-#define CVS_REQ_ADMIN 50
-#define CVS_REQ_HISTORY 51
-#define CVS_REQ_WATCHERS 52
-#define CVS_REQ_EDITORS 53
-#define CVS_REQ_ANNOTATE 54
-#define CVS_REQ_LOG 55
-#define CVS_REQ_CO 56
-#define CVS_REQ_EXPORT 57
-#define CVS_REQ_RANNOTATE 58
-#define CVS_REQ_INIT 59
-#define CVS_REQ_UPDATE 60
-#define CVS_REQ_ADD 62
-#define CVS_REQ_REMOVE 63
-#define CVS_REQ_NOOP 64
-#define CVS_REQ_RTAG 65
-#define CVS_REQ_RELEASE 66
-#define CVS_REQ_RLOG 67
-#define CVS_REQ_RDIFF 68
-#define CVS_REQ_VERSION 69
-#define CVS_REQ_WATCH_ON 70
-#define CVS_REQ_WATCH_OFF 71
-#define CVS_REQ_WATCH_ADD 72
-#define CVS_REQ_WATCH_REMOVE 73
-#define CVS_REQ_MAX 73
-
-/* responses */
-#define CVS_RESP_NONE 0
-#define CVS_RESP_OK 1
-#define CVS_RESP_ERROR 2
-#define CVS_RESP_VALIDREQ 3
-#define CVS_RESP_CHECKEDIN 4
-#define CVS_RESP_NEWENTRY 5
-#define CVS_RESP_CKSUM 6
-#define CVS_RESP_COPYFILE 7
-#define CVS_RESP_UPDATED 8
-#define CVS_RESP_CREATED 9
-#define CVS_RESP_UPDEXIST 10
-#define CVS_RESP_MERGED 11
-#define CVS_RESP_PATCHED 12
-#define CVS_RESP_RCSDIFF 13
-#define CVS_RESP_MODE 14
-#define CVS_RESP_MODTIME 15
-#define CVS_RESP_REMOVED 16
-#define CVS_RESP_RMENTRY 17
-#define CVS_RESP_SETSTATDIR 18
-#define CVS_RESP_CLRSTATDIR 19
-#define CVS_RESP_SETSTICKY 20
-#define CVS_RESP_CLRSTICKY 21
-#define CVS_RESP_TEMPLATE 22
-#define CVS_RESP_SETCIPROG 23
-#define CVS_RESP_SETUPDPROG 24
-#define CVS_RESP_NOTIFIED 25
-#define CVS_RESP_MODXPAND 26
-#define CVS_RESP_WRAPRCSOPT 27
-#define CVS_RESP_M 28
-#define CVS_RESP_MBINARY 29
-#define CVS_RESP_E 30
-#define CVS_RESP_F 31
-#define CVS_RESP_MT 32
-#define CVS_RESP_MAX 32
-
-struct cvs_req {
- int req_id;
- char req_str[32];
- u_int req_flags;
-};
-
-struct cvs_resp {
- u_int resp_id;
- char resp_str[32];
-};
-
-#endif /* PROTO_H */
diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c
index 5d8e88a7071..7ad7712b256 100644
--- a/usr.bin/cvs/remove.c
+++ b/usr.bin/cvs/remove.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: remove.c,v 1.52 2006/05/31 07:12:32 joris Exp $ */
+/* $OpenBSD: remove.c,v 1.53 2006/06/16 14:07:42 joris Exp $ */
/*
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
*
@@ -19,7 +19,6 @@
#include "cvs.h"
#include "log.h"
-#include "proto.h"
extern char *__progname;
@@ -31,7 +30,7 @@ static int removed = 0;
static int existing = 0;
struct cvs_cmd cvs_cmd_remove = {
- CVS_OP_REMOVE, CVS_REQ_REMOVE, "remove",
+ CVS_OP_REMOVE, 0, "remove",
{ "rm", "delete" },
"Remove an entry from the repository",
"[-flR] [file ...]",
diff --git a/usr.bin/cvs/root.c b/usr.bin/cvs/root.c
index 5cabe728e06..3bf43b2264f 100644
--- a/usr.bin/cvs/root.c
+++ b/usr.bin/cvs/root.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: root.c,v 1.32 2006/05/27 03:30:31 joris Exp $ */
+/* $OpenBSD: root.c,v 1.33 2006/06/16 14:07:42 joris Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -28,7 +28,6 @@
#include "cvs.h"
#include "log.h"
-#include "proto.h"
extern char *cvs_rootstr;
@@ -93,10 +92,6 @@ cvsroot_parse(const char *str)
root->cr_method = CVS_METHOD_NONE;
CVS_RSTVR(root);
- /* enable the most basic commands at least */
- CVS_SETVR(root, CVS_REQ_VALIDREQ);
- CVS_SETVR(root, CVS_REQ_VALIDRESP);
-
root->cr_str = xstrdup(str);
root->cr_buf = xstrdup(str);
diff --git a/usr.bin/cvs/status.c b/usr.bin/cvs/status.c
index 9519f776c88..bf8a6e7cc23 100644
--- a/usr.bin/cvs/status.c
+++ b/usr.bin/cvs/status.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.64 2006/06/07 15:21:47 xsa Exp $ */
+/* $OpenBSD: status.c,v 1.65 2006/06/16 14:07:42 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -20,7 +20,6 @@
#include "cvs.h"
#include "log.h"
-#include "proto.h"
int cvs_status(int, char **);
void cvs_status_local(struct cvs_file *);
@@ -28,7 +27,7 @@ void cvs_status_local(struct cvs_file *);
static int show_sym = 0;
struct cvs_cmd cvs_cmd_status = {
- CVS_OP_STATUS, CVS_REQ_STATUS, "status",
+ CVS_OP_STATUS, 0, "status",
{ "st", "stat" },
"Display status information on checked out files",
"[-lRv]",
diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c
index 832bffdcf8a..d4305e58577 100644
--- a/usr.bin/cvs/tag.c
+++ b/usr.bin/cvs/tag.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tag.c,v 1.46 2006/06/09 14:57:13 xsa Exp $ */
+/* $OpenBSD: tag.c,v 1.47 2006/06/16 14:07:42 joris Exp $ */
/*
* Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
*
@@ -19,7 +19,6 @@
#include "cvs.h"
#include "log.h"
-#include "proto.h"
int cvs_tag(int, char **);
void cvs_tag_local(struct cvs_file *);
@@ -35,7 +34,7 @@ static char *tag_name = NULL;
static char *tag_oldname = NULL;
struct cvs_cmd cvs_cmd_tag = {
- CVS_OP_TAG, CVS_REQ_TAG, "tag",
+ CVS_OP_TAG, 0, "tag",
{ "ta", "freeze" },
"Add a symbolic tag to checked out version of files",
"[-bcdFflR] [-D date | -r rev] tag [file ...]",
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c
index 168f10dc20e..2d1ae75b0b3 100644
--- a/usr.bin/cvs/update.c
+++ b/usr.bin/cvs/update.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: update.c,v 1.73 2006/06/14 15:17:54 joris Exp $ */
+/* $OpenBSD: update.c,v 1.74 2006/06/16 14:07:42 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -20,7 +20,6 @@
#include "cvs.h"
#include "log.h"
#include "diff.h"
-#include "proto.h"
int cvs_update(int, char **);
int prune_dirs = 0;
@@ -31,7 +30,7 @@ static char *tag = NULL;
static void update_clear_conflict(struct cvs_file *);
struct cvs_cmd cvs_cmd_update = {
- CVS_OP_UPDATE, CVS_REQ_UPDATE, "update",
+ CVS_OP_UPDATE, 0, "update",
{ "up", "upd" },
"Bring work tree in sync with repository",
"[-ACdflPpR] [-D date | -r rev] [-I ign] [-j rev] [-k mode] "
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 21:45:05 +0000