on second thought, trash -Z option. LOCALID now comes from $RCSLOCALID

9 files changed, 32 insertions, 45 deletions

diff --git a/gnu/usr.bin/rcs/ci/ci.c b/gnu/usr.bin/rcs/ci/ci.c
index 4ad03a49b31..e1dc5411304 100644
--- a/gnu/usr.bin/rcs/ci/ci.c
+++ b/gnu/usr.bin/rcs/ci/ci.c
@@ -28,6 +28,9 @@ Report problems and direct all questions to:
 
 /*
  * $Log: ci.c,v $
+ * Revision 1.4  1996/05/31 13:11:05  deraadt
+ * on second thought, trash -Z option. LOCALID now comes from $RCSLOCALID
+ *
  * Revision 1.3  1996/05/07 12:02:52  mickey
  * change -L option name to -Z, note that in
  * co(1) manual, add -Z where were missed.
@@ -275,7 +278,7 @@ static struct hshentry newdelta;	/* new delta to be inserted	*/
 static struct stat workstat;
 static struct Symrev *assoclst, **nextassoc;
 
-mainProg(ciId, "ci", "$Id: ci.c,v 1.3 1996/05/07 12:02:52 mickey Exp $")
+mainProg(ciId, "ci", "$Id: ci.c,v 1.4 1996/05/31 13:11:05 deraadt Exp $")
 {
 	static char const cmdusage[] =
 		"\nci usage: ci -{fIklMqru}[rev] -d[date] -mmsg -{nN}name -sstate -ttext -T -Vn -wwho -xsuff -zzone -ZlocalId file ...";
@@ -357,10 +360,6 @@ mainProg(ciId, "ci", "$Id: ci.c,v 1.3 1996/05/07 12:02:52 mickey Exp $")
                         keepflag=true;
                         goto revno;
 
-		case 'Z':
-			setRCSlocalId(a);
-			break;
-
                 case 'm':
 			if (msg.size) redefined('m');
 			msg = cleanlogmsg(a, strlen(a));
diff --git a/gnu/usr.bin/rcs/co/co.c b/gnu/usr.bin/rcs/co/co.c
index 62a74e47fb9..ba524d6fc1e 100644
--- a/gnu/usr.bin/rcs/co/co.c
+++ b/gnu/usr.bin/rcs/co/co.c
@@ -28,6 +28,9 @@ Report problems and direct all questions to:
 
 /*
  * $Log: co.c,v $
+ * Revision 1.6  1996/05/31 13:11:06  deraadt
+ * on second thought, trash -Z option. LOCALID now comes from $RCSLOCALID
+ *
  * Revision 1.5  1996/05/12 03:26:55  mickey
  * fix usage string.
  *
@@ -35,7 +38,7 @@ Report problems and direct all questions to:
  * Z not L
  *
  * Revision 1.3  1996/05/07 09:52:38  mickey
- * fix comments s/$Id: co.c,v 1.5 1996/05/12 03:26:55 mickey Exp $/Id/, and usage string.
+ * fix comments s/$Id: co.c,v 1.6 1996/05/31 13:11:06 deraadt Exp $/Id/, and usage string.
  *
  * Revision 1.2  1996/04/19 12:40:04  mickey
  * -L<string> option added to support LOCALID behaviour.
@@ -204,7 +207,7 @@ static struct hshentries *gendeltas;	/* deltas to be generated	*/
 static struct hshentry *targetdelta;	/* final delta to be generated	*/
 static struct stat workstat;
 
-mainProg(coId, "co", "$Id: co.c,v 1.5 1996/05/12 03:26:55 mickey Exp $")
+mainProg(coId, "co", "$Id: co.c,v 1.6 1996/05/31 13:11:06 deraadt Exp $")
 {
 	static char const cmdusage[] =
 		"\nco usage: co -{fIlMpqru}[rev] -ddate -jjoins -ksubst -sstate -T -w[who] -Vn -xsuff -zzone -ZlocalId file ...";
@@ -323,10 +326,6 @@ mainProg(coId, "co", "$Id: co.c,v 1.5 1996/05/12 03:26:55 mickey Exp $")
 			zone_set(a);
 			break;
 
-		case 'Z':    /*  add local 'Id' keyword string */
-			setRCSlocalId(*argv+2);
-			break;
-
 		case 'k':    /*  set keyword expand mode  */
 			expandarg = *argv;
 			if (0 <= expmode) redefined('k');
diff --git a/gnu/usr.bin/rcs/ident/ident.c b/gnu/usr.bin/rcs/ident/ident.c
index e9b45bee5d2..d34a1667a83 100644
--- a/gnu/usr.bin/rcs/ident/ident.c
+++ b/gnu/usr.bin/rcs/ident/ident.c
@@ -28,6 +28,9 @@ Report problems and direct all questions to:
 
 /*
  * $Log: ident.c,v $
+ * Revision 1.3  1996/05/31 13:11:07  deraadt
+ * on second thought, trash -Z option. LOCALID now comes from $RCSLOCALID
+ *
  * Revision 1.2  1996/05/07 12:03:10  mickey
  * change -L option name to -Z, note that in
  * co(1) manual, add -Z where were missed.
@@ -104,7 +107,7 @@ Report problems and direct all questions to:
 static int match P((FILE*));
 static void scanfile P((FILE*,char const*,int));
 
-mainProg(identId, "ident", "$Id: ident.c,v 1.2 1996/05/07 12:03:10 mickey Exp $")
+mainProg(identId, "ident", "$Id: ident.c,v 1.3 1996/05/31 13:11:07 deraadt Exp $")
 /*  Ident searches the named files for all occurrences
  *  of the pattern $keyword: text $.
  */
@@ -122,11 +125,6 @@ mainProg(identId, "ident", "$Id: ident.c,v 1.2 1996/05/07 12:03:10 mickey Exp $"
 		    quiet = 1;
 		    break;
 
-		case 'Z':
-		    setRCSlocalId(a+1);
-		    a += strlen(a) - 1;
-		    break;
-
 		case 'V':
 		    VOID printf("RCS version %s\n", RCS_version_string);
 		    exitmain(0);
diff --git a/gnu/usr.bin/rcs/merge/merge.c b/gnu/usr.bin/rcs/merge/merge.c
index 89f5b4d481d..cd29762ab4f 100644
--- a/gnu/usr.bin/rcs/merge/merge.c
+++ b/gnu/usr.bin/rcs/merge/merge.c
@@ -40,7 +40,7 @@ badoption(a)
 }
 
 
-mainProg(mergeId, "merge", "$Id: merge.c,v 1.2 1996/05/07 12:03:16 mickey Exp $")
+mainProg(mergeId, "merge", "$Id: merge.c,v 1.3 1996/05/31 13:11:07 deraadt Exp $")
 {
 	register char const *a;
 	char const *arg[3], *label[3], *edarg = 0;
@@ -70,9 +70,6 @@ mainProg(mergeId, "merge", "$Id: merge.c,v 1.2 1996/05/07 12:03:16 mickey Exp $"
 				--argc;
 				break;
 
-			case 'Z':
-				break;
-
 			case 'V':
 				printf("RCS version %s\n", RCS_version_string);
 				exitmain(0);
diff --git a/gnu/usr.bin/rcs/rcs/rcs.c b/gnu/usr.bin/rcs/rcs/rcs.c
index b17eaf6e96b..d73386a8f7e 100644
--- a/gnu/usr.bin/rcs/rcs/rcs.c
+++ b/gnu/usr.bin/rcs/rcs/rcs.c
@@ -28,6 +28,9 @@ Report problems and direct all questions to:
 
 /*
  * $Log: rcs.c,v $
+ * Revision 1.3  1996/05/31 13:11:08  deraadt
+ * on second thought, trash -Z option. LOCALID now comes from $RCSLOCALID
+ *
  * Revision 1.2  1996/05/07 12:03:21  mickey
  * change -L option name to -Z, note that in
  * co(1) manual, add -Z where were missed.
@@ -274,7 +277,7 @@ static struct delrevpair delrev;
 static struct hshentry *cuthead, *cuttail, *delstrt;
 static struct hshentries *gendeltas;
 
-mainProg(rcsId, "rcs", "$Id: rcs.c,v 1.2 1996/05/07 12:03:21 mickey Exp $")
+mainProg(rcsId, "rcs", "$Id: rcs.c,v 1.3 1996/05/31 13:11:08 deraadt Exp $")
 {
 	static char const cmdusage[] =
 		"\nrcs usage: rcs -{ae}logins -Afile -{blu}[rev] -cstring -{iILqTU} -ksubst -mrev:msg -{nN}name[:[rev]] -orange -sstate[:rev] -t[text] -Vn -xsuff -zzone -ZlocalId file ...";
@@ -469,10 +472,6 @@ mainProg(rcsId, "rcs", "$Id: rcs.c,v 1.2 1996/05/07 12:03:21 mickey Exp $")
 			zone_set(a);
 			break;
 
-		case 'Z':
-			setRCSlocalId(a);
-			break;
-
 		case 'k':    /*  set keyword expand mode  */
 			if (0 <= expmode) redefined('k');
 			if (0 <= (expmode = str2expmode(a)))
diff --git a/gnu/usr.bin/rcs/rcsclean/rcsclean.c b/gnu/usr.bin/rcs/rcsclean/rcsclean.c
index adf747d52ed..64e2bdc0d4e 100644
--- a/gnu/usr.bin/rcs/rcsclean/rcsclean.c
+++ b/gnu/usr.bin/rcs/rcsclean/rcsclean.c
@@ -37,7 +37,7 @@ static void cleanup P((void));
 static RILE *workptr;
 static int exitstatus;
 
-mainProg(rcscleanId, "rcsclean", "$Id: rcsclean.c,v 1.2 1996/05/07 12:03:28 mickey Exp $")
+mainProg(rcscleanId, "rcsclean", "$Id: rcsclean.c,v 1.3 1996/05/31 13:11:09 deraadt Exp $")
 {
 	static char const usage[] =
 		"\nrcsclean: usage: rcsclean -ksubst -{nqru}[rev] -T -Vn -xsuff -zzone -ZlocalId file ...";
@@ -122,10 +122,6 @@ mainProg(rcscleanId, "rcsclean", "$Id: rcsclean.c,v 1.2 1996/05/07 12:03:28 mick
 				zone_set(a);
 				break;
 
-			case 'Z':
-				setRCSlocalId(a);
-				break;
-
 			default:
 			unknown:
 				error("unknown option: %s%s", *argv, usage);
diff --git a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
index e59fe9d664c..8fc6e8008ff 100644
--- a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
+++ b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
@@ -28,6 +28,9 @@ Report problems and direct all questions to:
 
 /*
  * $Log: rcsdiff.c,v $
+ * Revision 1.4  1996/05/31 13:11:10  deraadt
+ * on second thought, trash -Z option. LOCALID now comes from $RCSLOCALID
+ *
  * Revision 1.3  1996/05/07 12:03:33  mickey
  * change -L option name to -Z, note that in
  * co(1) manual, add -Z where were missed.
@@ -157,7 +160,7 @@ static int exitstatus;
 static RILE *workptr;
 static struct stat workstat;
 
-mainProg(rcsdiffId, "rcsdiff", "$Id: rcsdiff.c,v 1.3 1996/05/07 12:03:33 mickey Exp $")
+mainProg(rcsdiffId, "rcsdiff", "$Id: rcsdiff.c,v 1.4 1996/05/31 13:11:10 deraadt Exp $")
 {
     static char const cmdusage[] =
 	    "\nrcsdiff usage: rcsdiff -ksubst -q -rrev1 [-rrev2] -Vn -xsuff -zzone -ZlocalId [diff options] file ...";
@@ -264,9 +267,6 @@ mainProg(rcsdiffId, "rcsdiff", "$Id: rcsdiff.c,v 1.3 1996/05/07 12:03:33 mickey
 		    versionarg = *argv;
 		    setRCSversion(versionarg);
 		    goto option_handled;
-	    case 'Z':
-		    setRCSlocalId(*argv + 2);
-		    goto option_handled;
 	    case 'k':
 		    expandarg = *argv;
 		    if (0 <= str2expmode(expandarg+2))
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
index 2fe4a13f6f2..25dae1472b2 100644
--- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
+++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
@@ -28,6 +28,9 @@ Report problems and direct all questions to:
 
 /*
  * $Log: rcsmerge.c,v $
+ * Revision 1.3  1996/05/31 13:11:11  deraadt
+ * on second thought, trash -Z option. LOCALID now comes from $RCSLOCALID
+ *
  * Revision 1.2  1996/05/07 12:03:37  mickey
  * change -L option name to -Z, note that in
  * co(1) manual, add -Z where were missed.
@@ -120,7 +123,7 @@ Report problems and direct all questions to:
 
 static char const co[] = CO;
 
-mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.2 1996/05/07 12:03:37 mickey Exp $")
+mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.3 1996/05/31 13:11:11 deraadt Exp $")
 {
 	static char const cmdusage[] =
 		"\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone -ZlocalId file";
@@ -193,9 +196,7 @@ mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.2 1996/05/07 12:03:37 mick
 			versionarg = *argv;
 			setRCSversion(versionarg);
 			break;
-		case 'Z':
-			setRCSlocalId(a);
-			break;
+
 		case 'k':
 			expandarg = *argv;
 			if (0 <= str2expmode(expandarg+2))
diff --git a/gnu/usr.bin/rcs/rlog/rlog.c b/gnu/usr.bin/rcs/rlog/rlog.c
index b1ef2c1b2b8..4546c7de04d 100644
--- a/gnu/usr.bin/rcs/rlog/rlog.c
+++ b/gnu/usr.bin/rcs/rlog/rlog.c
@@ -28,6 +28,9 @@ Report problems and direct all questions to:
 
 /*
  * $Log: rlog.c,v $
+ * Revision 1.3  1996/05/31 13:11:11  deraadt
+ * on second thought, trash -Z option. LOCALID now comes from $RCSLOCALID
+ *
  * Revision 1.2  1996/05/07 12:03:44  mickey
  * change -L option name to -Z, note that in
  * co(1) manual, add -Z where were missed.
@@ -219,7 +222,7 @@ static struct lockers *lockerlist;
 static struct stateattri *statelist;
 
 
-mainProg(rlogId, "rlog", "$Id: rlog.c,v 1.2 1996/05/07 12:03:44 mickey Exp $")
+mainProg(rlogId, "rlog", "$Id: rlog.c,v 1.3 1996/05/31 13:11:11 deraadt Exp $")
 {
 	static char const cmdusage[] =
 		"\nrlog usage: rlog -{bhLNRt} -ddates -l[lockers] -r[revs] -sstates -Vn -w[logins] -xsuff -zzone -ZlocalId file ...";
@@ -318,11 +321,6 @@ mainProg(rlogId, "rlog", "$Id: rlog.c,v 1.2 1996/05/07 12:03:44 mickey Exp $")
 			setRCSversion(*argv);
 			break;
 
-		case 'Z':
-			/* add local Id keyword */
-			setRCSlocalId(a);
-			break;
-
                 default:
 		unknown:
 			error("unknown option: %s%s", *argv, cmdusage);