diff options
author | Philip Guenther <guenther@cvs.openbsd.org> | 2013-01-18 11:21:10 +0000 |
---|---|---|
committer | Philip Guenther <guenther@cvs.openbsd.org> | 2013-01-18 11:21:10 +0000 |
commit | 2aeb858a1bf98201df0dd043bd798fe81aa418b5 (patch) | |
tree | 846958e4833bba76a248a631cb6adae1ede97441 /usr.bin | |
parent | 41bb3bc01a2aeb1c9667d8602f4d58768e1bb077 (diff) |
Document $OpenBSD$ and teach ci's -k option to parse it too
ok deraadt@
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/rcs/ci.c | 6 | ||||
-rw-r--r-- | usr.bin/rcs/rcs.1 | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c index 8ed89ddc73b..1c3c5b6e32f 100644 --- a/usr.bin/rcs/ci.c +++ b/usr.bin/rcs/ci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ci.c,v 1.213 2011/07/14 16:31:34 sobrado Exp $ */ +/* $OpenBSD: ci.c,v 1.214 2013/01/18 11:21:09 guenther Exp $ */ /* * Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org> * All rights reserved. @@ -42,6 +42,7 @@ #define DATE_MTIME -2 #define KW_ID "Id" +#define KW_OPENBSD "OpenBSD" #define KW_AUTHOR "Author" #define KW_DATE "Date" #define KW_STATE "State" @@ -934,7 +935,8 @@ checkin_keywordtype(char *keystring) p = keystring; p++; - if (strncmp(p, KW_ID, strlen(KW_ID)) == 0) + if (strncmp(p, KW_ID, strlen(KW_ID)) == 0 || + strncmp(p, KW_OPENBSD, strlen(KW_OPENBSD)) == 0) return (KW_TYPE_ID); else if (strncmp(p, KW_AUTHOR, strlen(KW_AUTHOR)) == 0) return (KW_TYPE_AUTHOR); diff --git a/usr.bin/rcs/rcs.1 b/usr.bin/rcs/rcs.1 index a7dd5ccb704..83f5d11eeb8 100644 --- a/usr.bin/rcs/rcs.1 +++ b/usr.bin/rcs/rcs.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcs.1,v 1.57 2011/11/17 18:54:21 jmc Exp $ +.\" $OpenBSD: rcs.1,v 1.58 2013/01/18 11:21:09 guenther Exp $ .\" .\" Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> @@ -24,7 +24,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: November 17 2011 $ +.Dd $Mdocdate: January 18 2013 $ .Dt RCS 1 .Os .Sh NAME @@ -277,7 +277,7 @@ The date and hour (UTC) the revision was checked in. .It $\&Header$ Standard header containing the full pathname of the RCS file, the revision number, the date (UTC), the author and the state. -.It $\&Id$ +.It $\&Id$ and $\&OpenBSD$ The same content as $\&Header$ but without the path of the RCS file. .It $\&Log$ |