summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2006-05-29 05:52:43 +0000
committerJoris Vink <joris@cvs.openbsd.org>2006-05-29 05:52:43 +0000
commita1d29f582ac962b0cf0bddbf1c4cdc93620f9d08 (patch)
tree748f46175ec2912fabe86814ebecf040241a0128
parent1a4d6f924d0470deba3e37a4686b1c0a67ec66db (diff)
remove likes some CR_RECURSE_DIRS luvin' too.
-rw-r--r--usr.bin/cvs/remove.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c
index 0ba5954cb77..a0490e5ca2c 100644
--- a/usr.bin/cvs/remove.c
+++ b/usr.bin/cvs/remove.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: remove.c,v 1.46 2006/05/29 05:34:31 joris Exp $ */
+/* $OpenBSD: remove.c,v 1.47 2006/05/29 05:52:42 joris Exp $ */
/*
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
*
@@ -44,15 +44,18 @@ int
cvs_remove(int argc, char **argv)
{
int ch;
+ int flags;
char *arg = ".";
struct cvs_recursion cr;
+ flags = CR_RECURSE_DIRS;
while ((ch = getopt(argc, argv, cvs_cmd_commit.cmd_opts)) != -1) {
switch (ch) {
case 'f':
force_remove = 1;
break;
case 'l':
+ flags &= ~CR_RECURSE_DIRS;
break;
case 'R':
break;
@@ -68,6 +71,7 @@ cvs_remove(int argc, char **argv)
cr.leavedir = NULL;
cr.local = cvs_remove_local;
cr.remote = NULL;
+ cr.flags = flags;
if (argc > 0)
cvs_file_run(argc, argv, &cr);