diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-01-28 20:31:08 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-01-28 20:31:08 +0000 |
| commit | bf7135c7ea4db345cb2522857eb152e8ab13c639 (patch) | |
| tree | 5ad7d2fdf7e2fe4a6817a4bee5a19030a725bd5f | |
| parent | 70ece8be1d4df61fee1848497ed18b744905a684 (diff) | |
Properly handle -R -- although it is default, it may be overwritten mit -l
in front of it.
OK joris@, xsa@
> Diff from Igor Zinovik
| -rw-r--r-- | usr.bin/cvs/annotate.c | 3 | ||||
| -rw-r--r-- | usr.bin/cvs/checkout.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/commit.c | 3 | ||||
| -rw-r--r-- | usr.bin/cvs/diff.c | 7 | ||||
| -rw-r--r-- | usr.bin/cvs/edit.c | 5 | ||||
| -rw-r--r-- | usr.bin/cvs/remove.c | 3 | ||||
| -rw-r--r-- | usr.bin/cvs/status.c | 3 | ||||
| -rw-r--r-- | usr.bin/cvs/tag.c | 3 | ||||
| -rw-r--r-- | usr.bin/cvs/update.c | 3 | ||||
| -rw-r--r-- | usr.bin/cvs/watch.c | 4 |
10 files changed, 27 insertions, 11 deletions
diff --git a/usr.bin/cvs/annotate.c b/usr.bin/cvs/annotate.c index 46782571018..1df9b47fdf1 100644 --- a/usr.bin/cvs/annotate.c +++ b/usr.bin/cvs/annotate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: annotate.c,v 1.43 2007/10/09 12:59:53 tobias Exp $ */ +/* $OpenBSD: annotate.c,v 1.44 2008/01/28 20:31:07 tobias Exp $ */ /* * Copyright (c) 2007 Tobias Stoeckmann <tobias@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -63,6 +63,7 @@ cvs_annotate(int argc, char **argv) flags &= ~CR_RECURSE_DIRS; break; case 'R': + flags |= CR_RECURSE_DIRS; break; case 'r': cvs_specified_tag = optarg; diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c index 0923c45620e..29f2be74a91 100644 --- a/usr.bin/cvs/checkout.c +++ b/usr.bin/cvs/checkout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: checkout.c,v 1.109 2008/01/23 09:34:08 tobias Exp $ */ +/* $OpenBSD: checkout.c,v 1.110 2008/01/28 20:31:07 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -82,6 +82,7 @@ cvs_checkout(int argc, char **argv) cvs_noexec = 1; break; case 'R': + flags |= CR_RECURSE_DIRS; break; case 'r': cvs_specified_tag = optarg; @@ -115,6 +116,7 @@ cvs_export(int argc, char **argv) flags &= ~CR_RECURSE_DIRS; break; case 'R': + flags |= CR_RECURSE_DIRS; break; case 'r': cvs_specified_tag = optarg; diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 98a71b2e4cc..994221f564d 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.119 2008/01/13 11:15:19 tobias Exp $ */ +/* $OpenBSD: commit.c,v 1.120 2008/01/28 20:31:07 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -75,6 +75,7 @@ cvs_commit(int argc, char **argv) logmsg = xstrdup(optarg); break; case 'R': + flags |= CR_RECURSE_DIRS; break; case 'r': break; diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index b5740e73d0b..00392a367d3 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.121 2007/09/22 16:01:22 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.122 2008/01/28 20:31:07 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -35,7 +35,7 @@ struct cvs_cmd cvs_cmd_diff = { CVS_OP_DIFF, 0, "diff", { "di", "dif" }, "Show differences between revisions", - "[-cilNnpu] [[-D date] [-r rev] [-D date2 | -r rev2]] " + "[-cilNnpRu] [[-D date] [-r rev] [-D date2 | -r rev2]] " "[-k mode] [file ...]", "cD:iklNnpr:Ru", NULL, @@ -74,6 +74,9 @@ cvs_diff(int argc, char **argv) strlcat(diffargs, " -p", sizeof(diffargs)); diff_pflag = 1; break; + case 'R': + flags |= CR_RECURSE_DIRS; + break; case 'r': if (rev1 == NULL) { rev1 = optarg; diff --git a/usr.bin/cvs/edit.c b/usr.bin/cvs/edit.c index 2a95b57703a..2eff2d8af25 100644 --- a/usr.bin/cvs/edit.c +++ b/usr.bin/cvs/edit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: edit.c,v 1.40 2008/01/10 10:08:22 tobias Exp $ */ +/* $OpenBSD: edit.c,v 1.41 2008/01/28 20:31:07 tobias Exp $ */ /* * Copyright (c) 2006, 2007 Xavier Santolaria <xsa@openbsd.org> * @@ -100,6 +100,7 @@ cvs_edit(int argc, char **argv) flags &= ~CR_RECURSE_DIRS; break; case 'R': + flags |= CR_RECURSE_DIRS; break; default: fatal("%s", cvs_cmd_edit.cmd_synopsis); @@ -157,6 +158,7 @@ cvs_editors(int argc, char **argv) flags &= ~CR_RECURSE_DIRS; break; case 'R': + flags |= CR_RECURSE_DIRS; break; default: fatal("%s", cvs_cmd_editors.cmd_synopsis); @@ -211,6 +213,7 @@ cvs_unedit(int argc, char **argv) flags &= ~CR_RECURSE_DIRS; break; case 'R': + flags |= CR_RECURSE_DIRS; break; default: fatal("%s", cvs_cmd_unedit.cmd_synopsis); diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c index 6a0f5625bb3..eb2fa0e3e66 100644 --- a/usr.bin/cvs/remove.c +++ b/usr.bin/cvs/remove.c @@ -1,4 +1,4 @@ -/* $OpenBSD: remove.c,v 1.67 2008/01/10 10:08:22 tobias Exp $ */ +/* $OpenBSD: remove.c,v 1.68 2008/01/28 20:31:07 tobias Exp $ */ /* * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> * @@ -59,6 +59,7 @@ cvs_remove(int argc, char **argv) flags &= ~CR_RECURSE_DIRS; break; case 'R': + flags |= CR_RECURSE_DIRS; break; default: fatal("%s", cvs_cmd_remove.cmd_synopsis); diff --git a/usr.bin/cvs/status.c b/usr.bin/cvs/status.c index 82faa18cdde..843c9cb1578 100644 --- a/usr.bin/cvs/status.c +++ b/usr.bin/cvs/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.78 2008/01/10 09:37:26 tobias Exp $ */ +/* $OpenBSD: status.c,v 1.79 2008/01/28 20:31:07 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> @@ -69,6 +69,7 @@ cvs_status(int argc, char **argv) flags &= ~CR_RECURSE_DIRS; break; case 'R': + flags |= CR_RECURSE_DIRS; break; case 'v': show_sym = 1; diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c index 048a88cd009..1628e026418 100644 --- a/usr.bin/cvs/tag.c +++ b/usr.bin/cvs/tag.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tag.c,v 1.61 2008/01/10 11:25:27 tobias Exp $ */ +/* $OpenBSD: tag.c,v 1.62 2008/01/28 20:31:07 tobias Exp $ */ /* * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> * @@ -88,6 +88,7 @@ cvs_tag(int argc, char **argv) flags &= ~CR_RECURSE_DIRS; break; case 'R': + flags |= CR_RECURSE_DIRS; break; case 'r': tag_oldname = optarg; diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index 7c58b93ac60..f510e58d61d 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.114 2008/01/21 16:36:46 tobias Exp $ */ +/* $OpenBSD: update.c,v 1.115 2008/01/28 20:31:07 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -89,6 +89,7 @@ cvs_update(int argc, char **argv) case 'q': break; case 'R': + flags |= CR_RECURSE_DIRS; break; case 'r': cvs_specified_tag = optarg; diff --git a/usr.bin/cvs/watch.c b/usr.bin/cvs/watch.c index 4caa79f9b42..0abc46bd83d 100644 --- a/usr.bin/cvs/watch.c +++ b/usr.bin/cvs/watch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: watch.c,v 1.18 2008/01/12 22:39:32 tobias Exp $ */ +/* $OpenBSD: watch.c,v 1.19 2008/01/28 20:31:07 tobias Exp $ */ /* * Copyright (c) 2005-2007 Xavier Santolaria <xsa@openbsd.org> * @@ -104,6 +104,7 @@ cvs_watch(int argc, char **argv) flags &= ~CR_RECURSE_DIRS; break; case 'R': + flags |= CR_RECURSE_DIRS; break; default: fatal("%s", cvs_cmd_watch.cmd_synopsis); @@ -179,6 +180,7 @@ cvs_watchers(int argc, char **argv) flags &= ~CR_RECURSE_DIRS; break; case 'R': + flags |= CR_RECURSE_DIRS; break; default: fatal("%s", cvs_cmd_watchers.cmd_synopsis); |