From 45c84ad555d53829965c91a04b870bf8a28c6d38 Mon Sep 17 00:00:00 2001
From: Xavier Santolaria <xsa@cvs.openbsd.org>
Date: Wed, 23 Nov 2005 13:59:08 +0000
Subject: cannot combine -kv and -l;

---
 usr.bin/rcs/co.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'usr.bin')

diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c
index 394737761fc..5d24a45bc0f 100644
--- a/usr.bin/rcs/co.c
+++ b/usr.bin/rcs/co.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: co.c,v 1.34 2005/11/23 09:39:20 xsa Exp $	*/
+/*	$OpenBSD: co.c,v 1.35 2005/11/23 13:59:07 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -136,6 +136,11 @@ checkout_main(int argc, char **argv)
 			printf("%s  -->  %s\n", fpath,
 			    (pipeout == 1) ? "standard output" : argv[i]);
 
+		if ((flags & CO_LOCK) && (kflag & RCS_KWEXP_VAL)) {
+			cvs_log(LP_ERR, "%s: cannot combine -kv and -l", fpath);
+			continue;
+		}
+
 		if ((file = rcs_open(fpath, RCS_RDWR)) == NULL)
 			continue;
 
-- 
cgit v1.2.3