 @@ -1,14 +1,14 @@
-/*	$NetBSD: rcsbase.h,v 1.12 2012/01/12 14:10:56 joerg Exp $	*/
+/*	$NetBSD: rcsbase.h,v 1.13 2012/03/08 21:32:28 christos Exp $	*/
 /* RCS common definitions and data structures */
 #define RCSBASE "Id: rcsbase.h,v 5.20 1995/06/16 06:19:24 eggert Exp"
 /* Copyright 1982, 1988, 1989 Walter Tichy
    Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
    Distributed under license by the Free Software Foundation, Inc.
 This file is part of RCS.
 RCS is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 @@ -23,26 +23,30 @@ GNU General Public License for more deta
 You should have received a copy of the GNU General Public License
 along with RCS; see the file COPYING.
 If not, write to the Free Software Foundation,
 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 Report problems and direct all questions to:
     rcs-bugs@cs.purdue.edu
 */
 /*
  * $Log: rcsbase.h,v $
  * Revision 1.13  2012/03/08 21:32:28  christos
  * Teach rcs about the new cvs "commitid" keyword, so that we don't bitch each
  * time we play with an RCS file maintained by CVS.
+ *
  * Revision 1.12  2012/01/12 14:10:56  joerg
  * Second try to sort out the dangling elses. Just use {} markers.
  * Produces identical on amd64.
+ *
  * Revision 1.11  2012/01/08 13:57:31  tron
  * Revert last change. The extra while loop intruced by the macro changes
  * causes an end-less loop in ci(1) which uses "break" inside one of the
  * macros.
+ *
  * "/etc/security" will now no longer fill up "/" (or "/var" depending on
  * file-system layout).
+ *
  * Revision 1.9  1998/09/14 18:36:07  tv
 @@ -373,26 +377,27 @@ struct buf {
 struct cbuf {
 	char const *string;
 	size_t size;
 };
 /* Hash table entry */
 struct hshentry {
 	char const	  * num;      /* pointer to revision number (ASCIZ) */
 	char const	  * date;     /* pointer to date of checkin	    */
 	char const	  * author;   /* login of person checking in	    */
 	char const	  * lockedby; /* who locks the revision		    */
 	char const	  * state;    /* state of revision (Exp by default) */
 	char const	  * name;     /* name (if any) by which retrieved   */
 	char const	  * commitid; /* unique commit identifier           */
 	struct cbuf	    log;      /* log message requested at checkin   */
         struct branchhead * branches; /* list of first revisions on branches*/
 	struct cbuf	    ig;	      /* ignored phrases in admin part	    */
 	struct cbuf	    igtext;   /* ignored phrases in deltatext part  */
         struct hshentry   * next;     /* next revision on same branch       */
 	struct hshentry   * nexthsh;  /* next revision with same hash value */
 	long		    insertlns;/* lines inserted (computed by rlog)  */
 	long		    deletelns;/* lines deleted  (computed by rlog)  */
 	char		    selector; /* true if selected, false if deleted */
 };
 /* list of hash entries */
 struct hshentries {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rcssyn.c,v 1.4 1996/10/15 07:00:26 veego Exp $	*/
+/*	$NetBSD: rcssyn.c,v 1.5 2012/03/08 21:32:28 christos Exp $	*/
 /* RCS file syntactic analysis */
 /******************************************************************************
  *                       Syntax Analysis.
  *                       Keyword table
  *                       Testprogram: define SYNTEST
  *                       Compatibility with Release 2: define COMPAT2=1
  ******************************************************************************
  */
 /* Copyright 1982, 1988, 1989 Walter Tichy
    Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
 @@ -29,26 +29,30 @@ GNU General Public License for more deta
 You should have received a copy of the GNU General Public License
 along with RCS; see the file COPYING.
 If not, write to the Free Software Foundation,
 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 Report problems and direct all questions to:
     rcs-bugs@cs.purdue.edu
 */
 /*
  * $Log: rcssyn.c,v $
  * Revision 1.5  2012/03/08 21:32:28  christos
  * Teach rcs about the new cvs "commitid" keyword, so that we don't bitch each
  * time we play with an RCS file maintained by CVS.
+ *
  * Revision 1.4  1996/10/15 07:00:26  veego
  * Merge rcs 5.7.
+ *
  * Revision 5.15  1995/06/16 06:19:24  eggert
  * Update FSF address.
+ *
  * Revision 5.14  1995/06/01 16:23:43  eggert
  * (expand_names): Add "b" for -kb.
  * (getdelta): Don't strip leading "19" from MKS RCS dates; see cmpdate.
+ *
  * Revision 5.13  1994/03/20 04:52:58  eggert
  * Remove lint.
+ *
 @@ -166,26 +170,27 @@ static int getdelta P((void));
 static int strn2expmode P((char const*,size_t));
 static struct hshentry *getdnum P((void));
 static void badDiffOutput P((char const*)) exiting;
 static void diffLineNumberTooLarge P((char const*)) exiting;
 static void getsemi P((char const*));
 /* keyword table */
 char const
 	Kaccess[]   = "access",
 	Kauthor[]   = "author",
 	Kbranch[]   = "branch",
 	Kcomment[]  = "comment",
 	Kcommitid[] = "commitid",
 	Kdate[]     = "date",
 	Kdesc[]     = "desc",
 	Kexpand[]   = "expand",
 	Khead[]     = "head",
 	Klocks[]    = "locks",
 	Klog[]      = "log",
 	Knext[]     = "next",
 	Kstate[]    = "state",
 	Kstrict[]   = "strict",
 	Ksymbols[]  = "symbols",
 	Ktext[]     = "text";
 static char const
 @@ -425,26 +430,37 @@ getdelta()
 	LastBranch = &Delta->branches;
 	while ((num = getdnum())) {
 		NewBranch = ftalloc(struct branchhead);
                 NewBranch->hsh = num;
 		*LastBranch = NewBranch;
 		LastBranch = &NewBranch->nextbranch;
+        }
 	*LastBranch = 0;
 	getsemi(K_branches);
 	getkey(Knext);
 	Delta->next = num = getdnum();
 	getsemi(Knext);
 	if (getkeyopt(Kcommitid)) {
 	    if (nexttok == ID) {
 		Delta->commitid = NextString;
 		nextlex();
 	    } else {
 		fatserror("missing %s", Kcommitid);
 		Delta->commitid = NULL;
+	    }
 	    getsemi(Kcommitid);
 	} else
 	    Delta->commitid = NULL;
 	Delta->lockedby = 0;
 	Delta->log.string = 0;
 	Delta->selector = true;
 	Delta->ig = getphrases(Kdesc);
         TotalDeltas++;
         return (true);
+}
 	void
 gettree()
 /* Function: Reads in the delta tree with getdelta(), then
  * updates the lockedby fields.

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: rlog.1,v 1.5 2002/02/08 01:26:52 ross Exp $
+.\"	$NetBSD: rlog.1,v 1.6 2012/03/08 21:32:28 christos Exp $
 .\"
 .de Id
 .ds Rv \\$3
 .ds Dt \\$4
 ..
 .\" Id: rlog.1,v 5.9 1995/06/16 06:19:24 eggert Exp
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
 .if n .ds - \%--
 .if t .ds - \(em
 .TH RLOG 1 \*(Dt GNU
 .SH NAME
 @@ -38,26 +38,28 @@ prints revision number, author, date/tim
 lines added/deleted (with respect to the previous revision),
 locker of the revision (if any), and log message.
 All times are displayed in Coordinated Universal Time (\*u) by default;
 this can be overridden with
 .BR \-z .
 Without options,
 .B rlog
 prints complete information.
 The options below restrict this output.
 .nr n \w'\f3\-V\fP\f2n\fP'+2n-1/1n
 .ds n \nn
 .if \n(.g .if r an-tag-sep .ds n \w'\f3\-V\fP\f2n\fP'u+\n[an-tag-sep]u
 .TP \*n
 .B \-c
 Print the commitid if available.
 .B \-L
 Ignore \*r files that have no locks set.
 This is convenient in combination with
 .BR \-h ,
 .BR \-l ,
 and
 .BR \-R .
 .TP
 .B \-R
 Print only the name of the \*r file.
 This is convenient for translating a
 working pathname into an \*r pathname.
 .TP

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rlog.c,v 1.6 2012/01/06 15:16:03 joerg Exp $	*/
+/*	$NetBSD: rlog.c,v 1.7 2012/03/08 21:32:28 christos Exp $	*/
 /* Print log messages and other information about RCS files.  */
 /* Copyright 1982, 1988, 1989 Walter Tichy
    Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
    Distributed under license by the Free Software Foundation, Inc.
 This file is part of RCS.
 RCS is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 @@ -21,26 +21,30 @@ GNU General Public License for more deta
 You should have received a copy of the GNU General Public License
 along with RCS; see the file COPYING.
 If not, write to the Free Software Foundation,
 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 Report problems and direct all questions to:
     rcs-bugs@cs.purdue.edu
 */
 /*
  * $Log: rlog.c,v $
  * Revision 1.7  2012/03/08 21:32:28  christos
  * Teach rcs about the new cvs "commitid" keyword, so that we don't bitch each
  * time we play with an RCS file maintained by CVS.
+ *
  * Revision 1.6  2012/01/06 15:16:03  joerg
  * Don't use dangling elses.
+ *
  * Revision 1.5  2011/05/15 14:33:12  christos
  * register c -> int c
+ *
  * Revision 1.4  1996/10/15 07:00:50  veego
  * Merge rcs 5.7.
+ *
  * Revision 5.18  1995/06/16 06:19:24  eggert
  * Update FSF address.
+ *
  * Revision 5.17  1995/06/01 16:23:43  eggert
 @@ -213,63 +217,67 @@ static void getscript P((struct hshentry
 static void getstate P((char*));
 static void putabranch P((struct hshentry const*));
 static void putadelta P((struct hshentry const*,struct hshentry const*,int));
 static void putforest P((struct branchhead const*));
 static void putree P((struct hshentry const*));
 static void putrunk P((void));
 static void recentdate P((struct hshentry const*,struct Datepairs*));
 static void trunclocks P((void));
 static char const *insDelFormat;
 static int branchflag;	/*set on -b */
 static int exitstatus;
 static int lockflag;
 static int commitid;
 static struct Datepairs *datelist, *duelst;
 static struct Revpairs *revlist, *Revlst;
 static struct authors *authorlist;
 static struct rcslockers *lockerlist;
 static struct stateattri *statelist;
 mainProg(rlogId, "rlog", "Id: rlog.c,v 5.18 1995/06/16 06:19:24 eggert Exp")
+{
 	static char const cmdusage[] =
-		"\nrlog usage: rlog -{bhLNRt} -ddates -l[lockers] -r[revs] -sstates -Vn -w[logins] -xsuff -zzone file ...";
+		"\nrlog usage: rlog -{cbhLNRt} -ddates -l[lockers] -r[revs] -sstates -Vn -w[logins] -xsuff -zzone file ...";
 	register FILE *out;
 	char *a, **newargv;
 	struct Datepairs *currdate;
 	char const *accessListString, *accessFormat;
 	char const *headFormat, *symbolFormat;
 	struct access const *curaccess;
 	struct assoc const *curassoc;
 	struct hshentry const *delta;
 	struct rcslock const *currlock;
 	int descflag, selectflag;
 	int onlylockflag;  /* print only files with locks */
 	int onlyRCSflag;  /* print only RCS pathname */
 	int pre5;
 	int shownames;
 	int revno;
         descflag = selectflag = shownames = true;
 	onlylockflag = onlyRCSflag = false;
 	out = stdout;
 	suffixes = X_DEFAULT;
 	argc = getRCSINIT(argc, argv, &newargv);
 	argv = newargv;
 	while (a = *++argv,  0<--argc && *a++=='-') {
 		switch (*a++) {
 		case 'c':
 			commitid = true;
 			break;
 		case 'L':
 			onlylockflag = true;
 			break;
 		case 'N':
 			shownames = false;
 			break;
 		case 'R':
 			onlyRCSflag =true;
 			break;
 @@ -583,26 +591,28 @@ putadelta(node,editscript,trunk)
 	out = stdout;
 	aprintf(out,
 		"----------------------------\nrevision %s%s",
 		node->num,  pre5 ? "        " : ""
 	);
         if ( node->lockedby )
 	    aprintf(out, pre5+"\tlocked by: %s;", node->lockedby);
 	aprintf(out, "\ndate: %s;  author: %s;  state: %s;",
 		date2str(node->date, datebuf),
 		node->author, node->state
 	);
 	if (commitid && node->commitid)
 	    aprintf(out, "  commitid: %s;", node->commitid);
         if ( editscript ) {
            if(trunk)
 	      aprintf(out, insDelFormat,
                              editscript->deletelns, editscript->insertlns);
            else
 	      aprintf(out, insDelFormat,
                              editscript->insertlns, editscript->deletelns);
+        }
         newbranch = node->branches;
         if ( newbranch ) {
 	   bufautobegin(&branchnum);