summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/rcs/ci/ci.c12
-rw-r--r--gnu/usr.bin/rcs/ident/ident.c24
-rw-r--r--gnu/usr.bin/rcs/merge/merge.c5
-rw-r--r--gnu/usr.bin/rcs/rcs/rcs.c16
-rw-r--r--gnu/usr.bin/rcs/rcsclean/rcsclean.c8
-rw-r--r--gnu/usr.bin/rcs/rcsdiff/rcsdiff.c11
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/rcsmerge.c16
-rw-r--r--gnu/usr.bin/rcs/rlog/rlog.c17
8 files changed, 82 insertions, 27 deletions
diff --git a/gnu/usr.bin/rcs/ci/ci.c b/gnu/usr.bin/rcs/ci/ci.c
index de203d0978d..4ad03a49b31 100644
--- a/gnu/usr.bin/rcs/ci/ci.c
+++ b/gnu/usr.bin/rcs/ci/ci.c
@@ -28,6 +28,10 @@ Report problems and direct all questions to:
/*
* $Log: ci.c,v $
+ * 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.
+ *
* Revision 1.2 1996/04/19 12:40:00 mickey
* -L<string> option added to support LOCALID behaviour.
* maybe set up in RCSINIT environment variable.
@@ -271,10 +275,10 @@ 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.2 1996/04/19 12:40:00 mickey Exp $")
+mainProg(ciId, "ci", "$Id: ci.c,v 1.3 1996/05/07 12:02:52 mickey Exp $")
{
static char const cmdusage[] =
- "\nci usage: ci -{fIklMqru}[rev] -d[date] -mmsg -{nN}name -sstate -ttext -T -Vn -wwho -xsuff -zzone file ...";
+ "\nci usage: ci -{fIklMqru}[rev] -d[date] -mmsg -{nN}name -sstate -ttext -T -Vn -wwho -xsuff -zzone -ZlocalId file ...";
static char const default_state[] = DEFAULTSTATE;
char altdate[datesize];
@@ -353,8 +357,8 @@ mainProg(ciId, "ci", "$Id: ci.c,v 1.2 1996/04/19 12:40:00 mickey Exp $")
keepflag=true;
goto revno;
- case 'L':
- setRCSlocalId(*argv+2);
+ case 'Z':
+ setRCSlocalId(a);
break;
case 'm':
diff --git a/gnu/usr.bin/rcs/ident/ident.c b/gnu/usr.bin/rcs/ident/ident.c
index 2265e0214a6..e9b45bee5d2 100644
--- a/gnu/usr.bin/rcs/ident/ident.c
+++ b/gnu/usr.bin/rcs/ident/ident.c
@@ -28,8 +28,12 @@ Report problems and direct all questions to:
/*
* $Log: ident.c,v $
- * Revision 1.1 1995/10/18 08:41:00 deraadt
- * Initial revision
+ * 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.
+ *
+ * Revision 1.1.1.1 1995/10/18 08:41:00 deraadt
+ * initial import of NetBSD tree
*
* Revision 1.3 1995/02/24 02:07:55 mycroft
* RCS 5.6.7.4
@@ -100,7 +104,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.1 1995/10/18 08:41:00 deraadt Exp $")
+mainProg(identId, "ident", "$Id: ident.c,v 1.2 1996/05/07 12:03:10 mickey Exp $")
/* Ident searches the named files for all occurrences
* of the pattern $keyword: text $.
*/
@@ -118,13 +122,18 @@ mainProg(identId, "ident", "$Id: ident.c,v 1.1 1995/10/18 08:41:00 deraadt 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);
default:
VOID fprintf(stderr,
- "ident: usage: ident -{qV} [file...]\n"
+ "ident: usage: ident -{qV} [-ZlocalId] [file...]\n"
);
exitmain(1);
break;
@@ -151,8 +160,13 @@ mainProg(identId, "ident", "$Id: ident.c,v 1.1 1995/10/18 08:41:00 deraadt Exp $
}
#if RCS_lint
- void identExit() { _exit(EXIT_FAILURE); }
+#define exiterr identExit
#endif
+ void
+exiterr()
+{
+ _exit(EXIT_FAILURE);
+}
static void
diff --git a/gnu/usr.bin/rcs/merge/merge.c b/gnu/usr.bin/rcs/merge/merge.c
index 652352b8b30..89f5b4d481d 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.1 1995/10/18 08:41:02 deraadt Exp $")
+mainProg(mergeId, "merge", "$Id: merge.c,v 1.2 1996/05/07 12:03:16 mickey Exp $")
{
register char const *a;
char const *arg[3], *label[3], *edarg = 0;
@@ -70,6 +70,9 @@ mainProg(mergeId, "merge", "$Id: merge.c,v 1.1 1995/10/18 08:41:02 deraadt 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 908056ba1a8..b17eaf6e96b 100644
--- a/gnu/usr.bin/rcs/rcs/rcs.c
+++ b/gnu/usr.bin/rcs/rcs/rcs.c
@@ -28,8 +28,12 @@ Report problems and direct all questions to:
/*
* $Log: rcs.c,v $
- * Revision 1.1 1995/10/18 08:41:03 deraadt
- * Initial revision
+ * 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.
+ *
+ * Revision 1.1.1.1 1995/10/18 08:41:03 deraadt
+ * initial import of NetBSD tree
*
* Revision 1.3 1995/02/24 02:25:24 mycroft
* RCS 5.6.7.4
@@ -270,10 +274,10 @@ static struct delrevpair delrev;
static struct hshentry *cuthead, *cuttail, *delstrt;
static struct hshentries *gendeltas;
-mainProg(rcsId, "rcs", "$Id: rcs.c,v 1.1 1995/10/18 08:41:03 deraadt Exp $")
+mainProg(rcsId, "rcs", "$Id: rcs.c,v 1.2 1996/05/07 12:03:21 mickey 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 file ...";
+ "\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 ...";
char *a, **newargv, *textfile;
char const *branchsym, *commsyml;
@@ -465,6 +469,10 @@ mainProg(rcsId, "rcs", "$Id: rcs.c,v 1.1 1995/10/18 08:41:03 deraadt 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 5071722633f..adf747d52ed 100644
--- a/gnu/usr.bin/rcs/rcsclean/rcsclean.c
+++ b/gnu/usr.bin/rcs/rcsclean/rcsclean.c
@@ -37,10 +37,10 @@ static void cleanup P((void));
static RILE *workptr;
static int exitstatus;
-mainProg(rcscleanId, "rcsclean", "$Id: rcsclean.c,v 1.1 1995/10/18 08:41:03 deraadt Exp $")
+mainProg(rcscleanId, "rcsclean", "$Id: rcsclean.c,v 1.2 1996/05/07 12:03:28 mickey Exp $")
{
static char const usage[] =
- "\nrcsclean: usage: rcsclean -ksubst -{nqru}[rev] -T -Vn -xsuff -zzone file ...";
+ "\nrcsclean: usage: rcsclean -ksubst -{nqru}[rev] -T -Vn -xsuff -zzone -ZlocalId file ...";
static struct buf revision;
@@ -122,6 +122,10 @@ mainProg(rcscleanId, "rcsclean", "$Id: rcsclean.c,v 1.1 1995/10/18 08:41:03 dera
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 095075a7916..e59fe9d664c 100644
--- a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
+++ b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
@@ -28,6 +28,10 @@ Report problems and direct all questions to:
/*
* $Log: rcsdiff.c,v $
+ * 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.
+ *
* Revision 1.2 1996/01/15 21:40:37 niklas
* Fix typo so two -L options can be fed to rcsdiff.
*
@@ -153,10 +157,10 @@ static int exitstatus;
static RILE *workptr;
static struct stat workstat;
-mainProg(rcsdiffId, "rcsdiff", "$Id: rcsdiff.c,v 1.2 1996/01/15 21:40:37 niklas Exp $")
+mainProg(rcsdiffId, "rcsdiff", "$Id: rcsdiff.c,v 1.3 1996/05/07 12:03:33 mickey Exp $")
{
static char const cmdusage[] =
- "\nrcsdiff usage: rcsdiff -ksubst -q -rrev1 [-rrev2] -Vn -xsuff -zzone [diff options] file ...";
+ "\nrcsdiff usage: rcsdiff -ksubst -q -rrev1 [-rrev2] -Vn -xsuff -zzone -ZlocalId [diff options] file ...";
int revnums; /* counter for revision numbers given */
char const *rev1, *rev2; /* revision numbers from command line */
@@ -260,6 +264,9 @@ mainProg(rcsdiffId, "rcsdiff", "$Id: rcsdiff.c,v 1.2 1996/01/15 21:40:37 niklas
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 0beb50c79af..2fe4a13f6f2 100644
--- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
+++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
@@ -28,8 +28,12 @@ Report problems and direct all questions to:
/*
* $Log: rcsmerge.c,v $
- * Revision 1.1 1995/10/18 08:41:04 deraadt
- * Initial revision
+ * 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.
+ *
+ * Revision 1.1.1.1 1995/10/18 08:41:04 deraadt
+ * initial import of NetBSD tree
*
* Revision 1.3 1995/02/24 02:25:40 mycroft
* RCS 5.6.7.4
@@ -116,10 +120,10 @@ Report problems and direct all questions to:
static char const co[] = CO;
-mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.1 1995/10/18 08:41:04 deraadt Exp $")
+mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.2 1996/05/07 12:03:37 mickey Exp $")
{
static char const cmdusage[] =
- "\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone file";
+ "\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone -ZlocalId file";
static char const quietarg[] = "-q";
register int i;
@@ -189,7 +193,9 @@ mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.1 1995/10/18 08:41:04 dera
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 f3497a8617c..b1ef2c1b2b8 100644
--- a/gnu/usr.bin/rcs/rlog/rlog.c
+++ b/gnu/usr.bin/rcs/rlog/rlog.c
@@ -28,8 +28,12 @@ Report problems and direct all questions to:
/*
* $Log: rlog.c,v $
- * Revision 1.1 1995/10/18 08:41:04 deraadt
- * Initial revision
+ * 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.
+ *
+ * Revision 1.1.1.1 1995/10/18 08:41:04 deraadt
+ * initial import of NetBSD tree
*
* Revision 1.3 1995/02/24 02:25:43 mycroft
* RCS 5.6.7.4
@@ -215,10 +219,10 @@ static struct lockers *lockerlist;
static struct stateattri *statelist;
-mainProg(rlogId, "rlog", "$Id: rlog.c,v 1.1 1995/10/18 08:41:04 deraadt Exp $")
+mainProg(rlogId, "rlog", "$Id: rlog.c,v 1.2 1996/05/07 12:03:44 mickey Exp $")
{
static char const cmdusage[] =
- "\nrlog usage: rlog -{bhLNRt} -ddates -l[lockers] -r[revs] -sstates -Vn -w[logins] -xsuff -zzone file ...";
+ "\nrlog usage: rlog -{bhLNRt} -ddates -l[lockers] -r[revs] -sstates -Vn -w[logins] -xsuff -zzone -ZlocalId file ...";
register FILE *out;
char *a, **newargv;
@@ -314,6 +318,11 @@ mainProg(rlogId, "rlog", "$Id: rlog.c,v 1.1 1995/10/18 08:41:04 deraadt Exp $")
setRCSversion(*argv);
break;
+ case 'Z':
+ /* add local Id keyword */
+ setRCSlocalId(a);
+ break;
+
default:
unknown:
error("unknown option: %s%s", *argv, cmdusage);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 11:56:03 +0000