summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobias <tobias@openbsd.org>2007-11-11 10:14:33 +0000
committertobias <tobias@openbsd.org>2007-11-11 10:14:33 +0000
commit84355cd765575cf26c2955255e79b384fc4c8d7f (patch)
tree53d6f6b89106207f060c116b6b03f3f6df992ed9
parentCVS/Entries needs at least one line specifying a 'D'irectory. If the (diff)
downloadwireguard-openbsd-84355cd765575cf26c2955255e79b384fc4c8d7f.tar.xz
wireguard-openbsd-84355cd765575cf26c2955255e79b384fc4c8d7f.zip
Do not (re)expand CVS keywords if it is requested to keep old keywords.
-rw-r--r--usr.bin/cvs/rcs.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c
index 47d5f59f632..acb0a5110d9 100644
--- a/usr.bin/cvs/rcs.c
+++ b/usr.bin/cvs/rcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcs.c,v 1.229 2007/11/11 10:01:41 tobias Exp $ */
+/* $OpenBSD: rcs.c,v 1.230 2007/11/11 10:14:33 tobias Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -3094,6 +3094,9 @@ rcs_kwexp_line(char *rcsfile, struct rcs_delta *rdp, struct cvs_line *line,
kwtype = 0;
kwstr = NULL;
+ if (mode & RCS_KWEXP_OLD)
+ return;
+
len = line->l_len;
if (len == 0)
return;