From beb4aab8dd61673ccfeb1c5a34388697c885b9f0 Mon Sep 17 00:00:00 2001
From: Joris Vink <joris@cvs.openbsd.org>
Date: Fri, 22 Apr 2005 03:38:57 +0000
Subject: missing '-R' (force recursion) option for diff.

noticed by brad@
---
 usr.bin/cvs/cvs.c  | 4 ++--
 usr.bin/cvs/diff.c | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'usr.bin/cvs')

diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c
index bc83c2e2384..e4ba5e73894 100644
--- a/usr.bin/cvs/cvs.c
+++ b/usr.bin/cvs/cvs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cvs.c,v 1.57 2005/04/21 20:56:12 xsa Exp $	*/
+/*	$OpenBSD: cvs.c,v 1.58 2005/04/22 03:38:56 joris Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -124,7 +124,7 @@ struct cvs_cmd cvs_cdt[] = {
 	{
 		CVS_OP_DIFF, "diff",     { "di",  "dif" }, &cvs_diff,
 		"[-cilNpu] [-D date] [-r rev] ...",
-		"cD:ilNpr:u",
+		"cD:ilNpr:Ru",
 		"Show differences between revisions",
 		NULL
 	},
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index 862d0f99f7b..046e93d08a6 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.c,v 1.31 2005/04/18 21:02:49 jfb Exp $	*/
+/*	$OpenBSD: diff.c,v 1.32 2005/04/22 03:38:56 joris Exp $	*/
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
  * All rights reserved.
@@ -409,6 +409,9 @@ cvs_diff_options(char *opt, int argc, char **argv, int *arg)
 				return (CVS_EX_USAGE);
 			}
 			break;
+		case 'R':
+			cvs_diff.file_flags |= CF_RECURSE;
+			break;
 		case 'u':
 			strlcat(diffargs, " -u", sizeof(diffargs));
 			format = D_UNIFIED;
-- 
cgit v1.2.3