diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2007-11-11 10:14:34 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2007-11-11 10:14:34 +0000 |
| commit | 355e2bb01e0a46dc0baf155d4e1025c02c9c9042 (patch) | |
| tree | 346e17a4a8a9f11fead0f12f5c2aeab93bb630cb /usr.bin | |
| parent | e9ea2dfdbba510e77c186ea236508c0aef0be4e2 (diff) | |
Do not (re)expand CVS keywords if it is requested to keep old keywords.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/rcs.c | 5 |
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; |