8203c24723
Make LOCALID a runtime option, instead of a compiletime option, by moving the value to CVSROOT/config (repository specific). Some minor fixes for buffer sizes. Add a RCS Id where missing; add some warning about the deprecated RCS_LOCALID variable. Both changes from OpenBSD. Bump to 1.11nb1.
60 lines
1.4 KiB
Text
60 lines
1.4 KiB
Text
$NetBSD: patch-ae,v 1.3 2000/10/21 19:29:06 wiz Exp $
|
|
|
|
--- src/rcs.c.orig Mon Aug 21 23:16:38 2000
|
|
+++ src/rcs.c
|
|
@@ -3348,7 +3348,7 @@
|
|
size_t len;
|
|
};
|
|
#define KEYWORD_INIT(s) (s), sizeof (s) - 1
|
|
-static const struct rcs_keyword keywords[] =
|
|
+static struct rcs_keyword keywords[] =
|
|
{
|
|
{ KEYWORD_INIT ("Author") },
|
|
{ KEYWORD_INIT ("Date") },
|
|
@@ -3361,6 +3361,7 @@
|
|
{ KEYWORD_INIT ("Revision") },
|
|
{ KEYWORD_INIT ("Source") },
|
|
{ KEYWORD_INIT ("State") },
|
|
+ { NULL, 0 },
|
|
{ NULL, 0 }
|
|
};
|
|
enum keyword
|
|
@@ -3375,7 +3376,8 @@
|
|
KEYWORD_RCSFILE,
|
|
KEYWORD_REVISION,
|
|
KEYWORD_SOURCE,
|
|
- KEYWORD_STATE
|
|
+ KEYWORD_STATE,
|
|
+ KEYWORD_LOCALID
|
|
};
|
|
|
|
/* Convert an RCS date string into a readable string. This is like
|
|
@@ -3512,6 +3514,11 @@
|
|
return;
|
|
}
|
|
|
|
+ if (RCS_citag != NULL) {
|
|
+ keywords[KEYWORD_LOCALID].string = RCS_citag;
|
|
+ keywords[KEYWORD_LOCALID].len = strlen(RCS_citag);
|
|
+ }
|
|
+
|
|
/* If we are using -kkvl, dig out the locker information if any. */
|
|
locker = NULL;
|
|
if (expand == KFLAG_KVL)
|
|
@@ -3603,6 +3610,7 @@
|
|
|
|
case KEYWORD_HEADER:
|
|
case KEYWORD_ID:
|
|
+ case KEYWORD_LOCALID:
|
|
{
|
|
char *path;
|
|
int free_path;
|
|
@@ -4234,7 +4242,7 @@
|
|
if (info != NULL)
|
|
{
|
|
/* If the size of `devtype' changes, fix the sscanf call also */
|
|
- char devtype[16];
|
|
+ char devtype[16+1];
|
|
|
|
if (sscanf (info->data, "%16s %lu",
|
|
devtype, &devnum_long) < 2)
|