diff options
| -rw-r--r-- | usr.bin/cvs/cvs.c | 6 | ||||
| -rw-r--r-- | usr.bin/cvs/cvs.h | 3 | ||||
| -rw-r--r-- | usr.bin/cvs/cvs/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/remove.c | 144 |
4 files changed, 151 insertions, 6 deletions
diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c index 18124e3ceb4..92d813a0837 100644 --- a/usr.bin/cvs/cvs.c +++ b/usr.bin/cvs/cvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.c,v 1.25 2004/12/15 16:28:14 xsa Exp $ */ +/* $OpenBSD: cvs.c,v 1.26 2004/12/21 18:15:55 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -221,8 +221,8 @@ static struct cvs_cmd { NULL, }, { - CVS_OP_REMOVE, "remove", {}, NULL, - "", + CVS_OP_REMOVE, "remove", { "rm", "delete" }, cvs_remove, + "[-flR] files ...", "", "Remove an entry from the repository", NULL, diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h index a23d9ce6761..984c7c9d221 100644 --- a/usr.bin/cvs/cvs.h +++ b/usr.bin/cvs/cvs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.h,v 1.39 2004/12/14 19:11:54 jfb Exp $ */ +/* $OpenBSD: cvs.h,v 1.40 2004/12/21 18:15:55 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -249,6 +249,7 @@ int cvs_getlog (int, char **); int cvs_history (int, char **); int cvs_import (int, char **); int cvs_init (int, char **); +int cvs_remove (int, char **); int cvs_server (int, char **); int cvs_status (int, char **); int cvs_tag (int, char **); diff --git a/usr.bin/cvs/cvs/Makefile b/usr.bin/cvs/cvs/Makefile index 7e84a06cf48..65771a132a5 100644 --- a/usr.bin/cvs/cvs/Makefile +++ b/usr.bin/cvs/cvs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.13 2004/12/14 19:11:54 jfb Exp $ +# $Id: Makefile,v 1.14 2004/12/21 18:15:55 xsa Exp $ .PATH: ${.CURDIR}/.. @@ -7,7 +7,7 @@ MAN=cvs.1 cvsrc.5 SRCS= cvs.c add.c annotate.c buf.c checkout.c commit.c diff.c entries.c \ file.c getlog.c history.c hist.c init.c log.c logmsg.c proto.c \ - rcs.c rcsnum.c req.c resp.c root.c server.c sock.c status.c \ + rcs.c rcsnum.c remove.c req.c resp.c root.c server.c sock.c status.c \ tag.c update.c util.c version.c BINDIR=/usr/bin diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c new file mode 100644 index 00000000000..d13c81a00e6 --- /dev/null +++ b/usr.bin/cvs/remove.c @@ -0,0 +1,144 @@ +/* $OpenBSD: remove.c,v 1.1 2004/12/21 18:15:55 xsa Exp $ */ +/* + * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> + * Copyright (c) 2004 Xavier Santolaria <xsa@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. + */ + +#include <sys/types.h> + +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sysexits.h> +#include <unistd.h> + +#include "cvs.h" +#include "log.h" +#include "proto.h" + + +extern char *__progname; + + +int cvs_remove_file (CVSFILE *, void *); + + +/* + * cvs_remove() + * + * Handler for the `cvs remove' command. + * Returns 0 on success, or one of the known system exit codes on failure. + */ +int +cvs_remove(int argc, char **argv) +{ + int i, ch; + struct cvsroot *root; + + while ((ch = getopt(argc, argv, "flR")) != -1) { + switch (ch) { + case 'f': + break; + case 'l': + break; + case 'R': + break; + default: + return (EX_USAGE); + } + } + + argc -= optind; + argv += optind; + + if (argc == 0) + return (EX_USAGE); + + cvs_files = cvs_file_getspec(argv, argc, 0); + if (cvs_files == NULL) + return (EX_DATAERR); + + root = CVS_DIR_ROOT(cvs_files); + if (root == NULL) { + cvs_log(LP_ERR, + "No CVSROOT specified! Please use the `-d' option"); + cvs_log(LP_ERR, + "or set the CVSROOT environment variable."); + return (EX_USAGE); + } + + if ((root->cr_method != CVS_METHOD_LOCAL) && (cvs_connect(root) < 0)) + return (EX_PROTOCOL); + + cvs_file_examine(cvs_files, cvs_remove_file, NULL); + + if (root->cr_method != CVS_METHOD_LOCAL) { + if (cvs_senddir(root, cvs_files) < 0) + return (EX_PROTOCOL); + + for (i = 0; i < argc; i++) + if (cvs_sendarg(root, argv[i], 0) < 0) + return (EX_PROTOCOL); + + if (cvs_sendreq(root, CVS_REQ_REMOVE, NULL) < 0) + return (EX_PROTOCOL); + } + + return (0); +} + + +int +cvs_remove_file(CVSFILE *cf, void *arg) +{ + int ret; + struct cvsroot *root; + + ret = 0; + root = CVS_DIR_ROOT(cf); + + if (cf->cf_type == DT_DIR) { + if (root->cr_method != CVS_METHOD_LOCAL) { + if (cf->cf_cvstat == CVS_FST_UNKNOWN) + ret = cvs_sendreq(root, CVS_REQ_QUESTIONABLE, + CVS_FILE_NAME(cf)); + else + ret = cvs_senddir(root, cf); + } + + return (ret); + } + + if (root->cr_method != CVS_METHOD_LOCAL) { + ret = cvs_sendreq(root, CVS_REQ_REMOVE, CVS_FILE_NAME(cf)); + } else { + cvs_log(LP_INFO, "scheduling file `%s' for removal", + CVS_FILE_NAME(cf)); + cvs_log(LP_INFO, "use `%s commit' to remove this file permanently", + __progname); + } + + return (ret); +} |