summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxsa <xsa@openbsd.org>2005-04-21 20:56:12 +0000
committerxsa <xsa@openbsd.org>2005-04-21 20:56:12 +0000
commit4b798515f69f6174f27f4abafd18d18596846f1a (patch)
tree1419ba9054a97aed7f979fb06e2ae31bdb780d31
parentcorrect strlcpy abuse, and always check for NULL return from find_buffer (diff)
downloadwireguard-openbsd-4b798515f69f6174f27f4abafd18d18596846f1a.tar.xz
wireguard-openbsd-4b798515f69f6174f27f4abafd18d18596846f1a.zip
let the `cvs remove' command work with no file(s) specified as args;
joris ok
-rw-r--r--usr.bin/cvs/cvs.c4
-rw-r--r--usr.bin/cvs/remove.c5
2 files changed, 3 insertions, 6 deletions
diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c
index f1e9ef95f45..bc83c2e2384 100644
--- a/usr.bin/cvs/cvs.c
+++ b/usr.bin/cvs/cvs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cvs.c,v 1.56 2005/04/21 04:37:11 jfb Exp $ */
+/* $OpenBSD: cvs.c,v 1.57 2005/04/21 20:56:12 xsa Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -217,7 +217,7 @@ struct cvs_cmd cvs_cdt[] = {
},
{
CVS_OP_REMOVE, "remove", { "rm", "delete" }, &cvs_remove,
- "[-flR] file ...",
+ "[-flR] [file ...]",
"flR",
"Remove an entry from the repository",
NULL
diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c
index 54b04e2c7af..760996c1341 100644
--- a/usr.bin/cvs/remove.c
+++ b/usr.bin/cvs/remove.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: remove.c,v 1.11 2005/04/21 19:06:06 xsa Exp $ */
+/* $OpenBSD: remove.c,v 1.12 2005/04/21 20:56:12 xsa Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* Copyright (c) 2004 Xavier Santolaria <xsa@openbsd.org>
@@ -81,9 +81,6 @@ cvs_remove_options(char *opt, int argc, char **argv, int *arg)
argc -= optind;
argv += optind;
- if (argc == 0)
- return (CVS_EX_USAGE);
-
*arg = optind;
return (0);
}