add remove support, hacked by xsa@ but lots of modifications

from me to actually make it work properly.

commiting since xsa@ is not around and i want to move forward.
ray@ agrees.

3 files changed, 191 insertions, 5 deletions

diff --git a/usr.bin/cvs/Makefile b/usr.bin/cvs/Makefile
index 9124c487a73..2bc56db4d13 100644
--- a/usr.bin/cvs/Makefile
+++ b/usr.bin/cvs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.25 2006/05/28 21:11:12 joris Exp $
+#	$OpenBSD: Makefile,v 1.26 2006/05/29 05:34:31 joris Exp $
 
 PROG=	opencvs
 MAN=   cvs.1 cvsignore.5 cvsrc.5 cvswrappers.5 cvsintro.7
@@ -6,8 +6,8 @@ CPPFLAGS+=-I${.CURDIR}
 
 SRCS=	cvs.c add.c commit.c config.c checkout.c buf.c cmd.c date.y diff.c \
 	diff3.c diff_internals.c entries.c fatal.c file.c getlog.c log.c \
-	repository.c rcs.c rcsnum.c rcstime.c root.c status.c worklist.c \
-	util.c update.c xmalloc.c
+	remove.c repository.c rcs.c rcsnum.c rcstime.c root.c status.c \
+	worklist.c util.c update.c xmalloc.c
 
 CFLAGS+=-Wall
 CFLAGS+=-Wstrict-prototypes -Wmissing-prototypes
diff --git a/usr.bin/cvs/cmd.c b/usr.bin/cvs/cmd.c
index d9dbfb7fe3c..cc88f530bd2 100644
--- a/usr.bin/cvs/cmd.c
+++ b/usr.bin/cvs/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.46 2006/05/28 21:11:12 joris Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.47 2006/05/29 05:34:31 joris Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -38,6 +38,7 @@ struct cvs_cmd *cvs_cdt[] = {
 	&cvs_cmd_diff,
 	&cvs_cmd_log,
 	&cvs_cmd_update,
+	&cvs_cmd_remove,
 	&cvs_cmd_status,
 #if 0
 	&cvs_cmd_admin,
@@ -55,7 +56,6 @@ struct cvs_cmd *cvs_cdt[] = {
 #endif
 	&cvs_cmd_rdiff,
 	&cvs_cmd_release,
-	&cvs_cmd_remove,
 	&cvs_cmd_rlog,
 	&cvs_cmd_rtag,
 	&cvs_cmd_server,
diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c
new file mode 100644
index 00000000000..0ba5954cb77
--- /dev/null
+++ b/usr.bin/cvs/remove.c
@@ -0,0 +1,186 @@
+/*	$OpenBSD: remove.c,v 1.46 2006/05/29 05:34:31 joris Exp $	*/
+/*
+ * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "includes.h"
+
+#include "cvs.h"
+#include "log.h"
+#include "proto.h"
+
+extern char *__progname;
+
+int		cvs_remove(int, char **);
+void		cvs_remove_local(struct cvs_file *);
+
+static int	force_remove = 0;
+static int	removed = 0;
+static int	existing = 0;
+
+struct cvs_cmd cvs_cmd_remove = {
+	CVS_OP_REMOVE, CVS_REQ_REMOVE, "remove",
+	{ "rm", "delete" },
+	"Remove an entry from the repository",
+	"[-flR] [file ...]",
+	"flR",
+	NULL,
+	cvs_remove
+};
+
+int
+cvs_remove(int argc, char **argv)
+{
+	int ch;
+	char *arg = ".";
+	struct cvs_recursion cr;
+
+	while ((ch = getopt(argc, argv, cvs_cmd_commit.cmd_opts)) != -1) {
+		switch (ch) {
+		case 'f':
+			force_remove = 1;
+			break;
+		case 'l':
+			break;
+		case 'R':
+			break;
+		default:
+			fatal("%s", cvs_cmd_commit.cmd_synopsis);
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	cr.enterdir = NULL;
+	cr.leavedir = NULL;
+	cr.local = cvs_remove_local;
+	cr.remote = NULL;
+
+	if (argc > 0)
+		cvs_file_run(argc, argv, &cr);
+	else
+		cvs_file_run(1, &arg, &cr);
+
+	return (0);
+}
+
+void
+cvs_remove_local(struct cvs_file *cf)
+{
+	int l;
+	CVSENTRIES *entlist;
+	char *entry, buf[MAXPATHLEN], tbuf[32], rbuf[16];
+
+	cvs_log(LP_TRACE, "cvs_remove_local(%s)", cf->file_path);
+
+	if (cf->file_type == CVS_DIR) {
+		if (verbosity > 1)
+			cvs_log(LP_NOTICE, "Removing %s", cf->file_path);
+		return;
+	}
+
+	cvs_file_classify(cf, 0);
+
+	if (force_remove == 1) {
+		if (unlink(cf->file_path) == -1)
+			fatal("cvs_remove_local: %s", strerror(errno));
+		(void)close(cf->fd);
+		cf->fd = -1;
+	}
+
+	if (cf->fd != -1) {
+		if (verbosity > 1)
+			cvs_log(LP_ERR, "file `%s' still in working directory",
+			    cf->file_name);
+		existing++;
+	} else {
+		switch(cf->file_status) {
+		case FILE_UNKNOWN:
+			if (verbosity > 1) {
+				cvs_log(LP_ERR, "nothing known about `%s'",
+				    cf->file_name);
+			}
+			return;
+		case FILE_ADDED:
+			entlist = cvs_ent_open(cf->file_wd);
+			cvs_ent_remove(entlist, cf->file_name);
+			cvs_ent_close(entlist, ENT_SYNC);
+
+			l = snprintf(buf, sizeof(buf), "%s/%s/%s%s",
+			    cf->file_path, CVS_PATH_CVSDIR, cf->file_name,
+			    CVS_DESCR_FILE_EXT);
+			if (l == -1 || l >= (int)sizeof(buf))
+				fatal("cvs_remove_local: overflow");
+
+			(void)unlink(buf);
+
+			if (verbosity > 1) {
+				cvs_log(LP_NOTICE, "removed `%s'",
+				    cf->file_name);
+			}
+			return;
+		case FILE_REMOVED:
+			if (verbosity > 1 ) {
+				cvs_log(LP_ERR,
+				    "file `%s' already scheduled for removal",
+				    cf->file_name);
+			}
+			return;
+		default:
+			rcsnum_tostr(cf->file_ent->ce_rev, rbuf,
+			     sizeof(rbuf));
+
+			ctime_r(&cf->file_ent->ce_mtime, tbuf);
+			if (tbuf[strlen(tbuf) - 1] == '\n')
+				tbuf[strlen(tbuf) - 1] = '\0';
+
+			entry = xmalloc(CVS_ENT_MAXLINELEN);
+			l = snprintf(entry, CVS_ENT_MAXLINELEN,
+			     "/%s/-%s/%s//", cf->file_name, rbuf, tbuf);
+			if (l == -1 || l >= CVS_ENT_MAXLINELEN)
+				fatal("cvs_remove_local: overflow");
+
+			entlist = cvs_ent_open(cf->file_wd);
+			cvs_ent_add(entlist, entry);
+			cvs_ent_close(entlist, ENT_SYNC);
+
+			xfree(entry);
+
+			if (verbosity > 1) {
+				cvs_log(LP_NOTICE,
+				    "scheduling file `%s' for removal",
+				    cf->file_name);
+			}
+
+			cf->file_status = FILE_REMOVED;
+			removed++;
+			break;
+		}
+	}
+
+	if (cf->file_status == FILE_REMOVED) {
+		if (verbosity > 0)
+			cvs_log(LP_NOTICE, "use '%s commit' to remove %s "
+			    "permanently", __progname,
+			    (removed == 1) ? "this file" : "these files");
+	} else {
+		if (cf->fd != -1) {
+			cvs_log(LP_ERR, existing == 1 ?
+			    "%d file exists; remove it first" :
+			    "%d files exist; remove them first", existing);
+		}
+	}
+}