summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@cvs.openbsd.org>2007-11-11 10:01:42 +0000
committerTobias Stoeckmann <tobias@cvs.openbsd.org>2007-11-11 10:01:42 +0000
commita90103bd2a81497075686647954e267e30ce4282 (patch)
tree016423e8cdf15c577638bcecde1e5986556528b7
parent529798f31b2b7dccb5b8955d05093124e8e43d2a (diff)
Added CVS keyword "Locker". Although it is a dummy function, it's already
enough for OpenBSD's src/.
-rw-r--r--usr.bin/cvs/rcs.c7
-rw-r--r--usr.bin/cvs/rcs.h3
2 files changed, 8 insertions, 2 deletions
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c
index 97e239131f7..47d5f59f632 100644
--- a/usr.bin/cvs/rcs.c
+++ b/usr.bin/cvs/rcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcs.c,v 1.228 2007/11/11 09:49:47 tobias Exp $ */
+/* $OpenBSD: rcs.c,v 1.229 2007/11/11 10:01:41 tobias Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -174,6 +174,7 @@ struct rcs_kw rcs_expkw[] = {
{ "Date", RCS_KW_DATE },
{ "Header", RCS_KW_HEADER },
{ "Id", RCS_KW_ID },
+ { "Locker", RCS_KW_LOCKER },
{ "Log", RCS_KW_LOG },
{ "Name", RCS_KW_NAME },
{ "RCSfile", RCS_KW_RCSFILE },
@@ -3265,6 +3266,10 @@ rcs_kwexp_line(char *rcsfile, struct rcs_delta *rdp, struct cvs_line *line,
if (kwtype & RCS_KW_NAME)
if (strlcat(expbuf, " ", sizeof(expbuf)) >= sizeof(expbuf))
fatal("rcs_kwexp_line: string truncated");
+
+ if (kwtype & RCS_KW_LOCKER)
+ if (strlcat(expbuf, " ", sizeof(expbuf)) >= sizeof(expbuf))
+ fatal("rcs_kwexp_line: string truncated");
}
/* end the expansion */
diff --git a/usr.bin/cvs/rcs.h b/usr.bin/cvs/rcs.h
index 16ea366dc36..032ffb4544a 100644
--- a/usr.bin/cvs/rcs.h
+++ b/usr.bin/cvs/rcs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcs.h,v 1.80 2007/10/09 12:59:53 tobias Exp $ */
+/* $OpenBSD: rcs.h,v 1.81 2007/11/11 10:01:41 tobias Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -69,6 +69,7 @@
#define RCS_KW_STATE 0x0800
#define RCS_KW_FULLPATH 0x0010
#define RCS_KW_MDOCDATE 0x0020
+#define RCS_KW_LOCKER 0x0040
#define RCS_KW_ID \
(RCS_KW_RCSFILE | RCS_KW_REVISION | RCS_KW_DATE \