add rcs_kflag_usage() to display the various keyword expansion modes

supported by the -k argument

2 files changed, 15 insertions, 2 deletions

diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c
index 6512bf28b2d..0b88e25ca60 100644
--- a/usr.bin/cvs/rcs.c
+++ b/usr.bin/cvs/rcs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcs.c,v 1.20 2005/01/12 19:23:27 jfb Exp $	*/
+/*	$OpenBSD: rcs.c,v 1.21 2005/01/13 20:50:57 jfb Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -750,6 +750,18 @@ rcs_kflag_get(const char *flags)
 	return (fl);
 }
 
+void
+rcs_kflag_usage(void)
+{
+	fprintf(stderr, "Valid expansion modes include:\n"
+	    "\t-kkv\t\tGenerate keywords using the default form.\n"
+	    "\t-kkvl\t\tLike -kkv, except locker's name inserted.\n"
+	    "\t-kk\t\tGenerate only keyword names in keyword strings.\n"
+	    "\t-kv\t\tGenerate only keyword values in keyword strings.\n"
+	    "\t-ko\t\tGenerate the old keyword string "
+	    "(no changes from checked in file).\n"
+	    "\t-kb\t\tGenerate binary file unmodified (merges not allowed).\n");
+}
 
 /*
  * rcs_parse()
diff --git a/usr.bin/cvs/rcs.h b/usr.bin/cvs/rcs.h
index 71ce078af8b..3a4f8064fd5 100644
--- a/usr.bin/cvs/rcs.h
+++ b/usr.bin/cvs/rcs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcs.h,v 1.6 2005/01/12 19:23:27 jfb Exp $	*/
+/*	$OpenBSD: rcs.h,v 1.7 2005/01/13 20:50:57 jfb Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -152,6 +152,7 @@ BUF*      rcs_gethead      (RCSFILE *);
 RCSNUM*   rcs_getrevbydate (RCSFILE *, struct tm *);
 
 int       rcs_kflag_get    (const char *);
+void      rcs_kflag_usage  (void);
 
 BUF*      rcs_patch     (const char *, const char *);
 size_t    rcs_stresc    (int, const char *, char *, size_t *);