>Number:         452
>Category:       bin
>Synopsis:       Make rcs local Id keyword support more flexible
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnats-admin (Utility Bug People)
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Sep  1 16:05:04 1994
>Originator:     Ty Sarna
>Organization:
Ty Sarna                Endicor Technologies, Inc.
tsarna@endicor.com      P.O. Box 29000 #355
(210) 650-4988          San Antonio, TX 78229

>Release:        
>Environment:
System: NetBSD rous.endicor.com 1.0_BETA NetBSD 1.0_BETA (ROUS) #119: Wed Aug 17 12:31:36 CDT 1994 root@rous.endicor.com:/usr/src/sys/arch/amiga/compile/ROUS amiga


>Description:

It's nice to have a local equivalent for the $Id$ keyword (like
$NetBSD$, $XConsortium$, etc), to prevent conflicts with other users of
RCS/CVS (ttrashing each other's version identifications). NetBSD rcs has
this feature already, enabled by -DNETBSD_DEVELOPMENT. The patches below
make this more flexible so the rest of us can easily have a local Id too.
With these changes, you can simply replace -DNETBSD_DEVELOPMENT with
-DLOCALID=\"NetBSD\" in your makefile, we can use -DLOCALID=\"Endicor\",
and x.org could (if they were using NetBSD) use -DLOCALID=\"XConsortium\",
etc.

>How-To-Repeat:
>Fix:

Apply this in src/gnu/usr.bin/rcs/lib

*** rcsbase.h.orig	Wed Aug 31 19:43:25 1994
--- rcsbase.h	Wed Aug 31 19:43:37 1994
***************
*** 266,272 ****
  #define IDH             "Id"
  #define LOCKER          "Locker"
  #define LOG             "Log"
- #define	NETBSDH		"NetBSD"
  #define RCSFILE         "RCSfile"
  #define REVISION        "Revision"
  #define SOURCE          "Source"
--- 266,271 ----
***************
*** 275,282 ****
  
  enum markers { Nomatch, Author, Date, Header, Id,
  	       Locker, Log,
! #ifdef NETBSD_DEVELOPMENT
! 	       NetBSDH,
  #endif
  	       RCSfile, Revision, Source, State };
  	/* This must be in the same order as rcskeys.c's Keyword[] array. */
--- 274,281 ----
  
  enum markers { Nomatch, Author, Date, Header, Id,
  	       Locker, Log,
! #ifdef LOCALID
! 	       LocalId,
  #endif
  	       RCSfile, Revision, Source, State };
  	/* This must be in the same order as rcskeys.c's Keyword[] array. */
*** rcsedit.c.orig	Wed Aug 31 19:43:37 1994
--- rcsedit.c	Wed Aug 31 19:43:50 1994
***************
*** 843,850 ****
                  break;
  	case Header:
          case Id:
! #ifdef NETBSD_DEVELOPMENT
! 	case NetBSDH:
  #endif
  		aprintf(out, "%s %s %s %s %s",
  			  marker!=Header || RCSv<VERSION(4)
--- 843,850 ----
                  break;
  	case Header:
          case Id:
! #ifdef LOCALID
! 	case LocalId:
  #endif
  		aprintf(out, "%s %s %s %s %s",
  			  marker!=Header || RCSv<VERSION(4)
*** rcskeep.c.orig	Wed Aug 31 19:43:37 1994
--- rcskeep.c	Wed Aug 31 19:43:50 1994
***************
*** 130,137 ****
                  break;
              case Header:
              case Id:
! #ifdef NETBSD_DEVELOPMENT
! 	    case NetBSDH:
  #endif
  		if (!(
  		      getval(fp, (struct buf*)nil, false) &&
--- 130,137 ----
                  break;
              case Header:
              case Id:
! #ifdef LOCALID
! 	    case LocalId:
  #endif
  		if (!(
  		      getval(fp, (struct buf*)nil, false) &&
*** rcskeys.c.orig	Wed Aug 31 19:43:37 1994
--- rcskeys.c	Wed Aug 31 19:43:50 1994
***************
*** 38,45 ****
  	nil,
  	AUTHOR, DATE, HEADER, IDH,
  	LOCKER, LOG,
! #ifdef NETBSD_DEVELOPMENT
! 	NETBSDH,
  #endif
  	RCSFILE, REVISION, SOURCE, STATE
  };
--- 38,45 ----
  	nil,
  	AUTHOR, DATE, HEADER, IDH,
  	LOCKER, LOG,
! #ifdef LOCALID
! 	LOCALID,
  #endif
  	RCSFILE, REVISION, SOURCE, STATE
  };

>Audit-Trail:
>Unformatted:


------------------------------------------------------------------------------