diff -uprk.orig cvs-1.11.15.orig/src/rcs.c cvs-1.11.15/src/rcs.c

--- cvs-1.11.15.orig/src/rcs.c	2004-04-15 17:11:11 +0400

+++ cvs-1.11.15/src/rcs.c	2004-04-15 17:18:02 +0400

@@ -134,6 +134,8 @@ static char *rcs_lockfilename PROTO ((co

    evaluates its arguments multiple times.  */

 #define STREQ(a, b) (*(char *)(a) == *(char *)(b) && strcmp ((a), (b)) == 0)

+static const char * getfullCVSname PROTO ((const char *, char **));

+

 /*

  * We don't want to use isspace() from the C library because:

  *

@@ -3493,27 +3495,31 @@ struct rcs_keyword

 {

     const char *string;

     size_t len;

+    int expandit;

 };

 #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") },

-    { KEYWORD_INIT ("Header") },

-    { KEYWORD_INIT ("Id") },

-    { KEYWORD_INIT ("Locker") },

-    { KEYWORD_INIT ("Log") },

-    { KEYWORD_INIT ("Name") },

-    { KEYWORD_INIT ("RCSfile") },

-    { KEYWORD_INIT ("Revision") },

-    { KEYWORD_INIT ("Source") },

-    { KEYWORD_INIT ("State") },

-    { NULL, 0 }

+    { KEYWORD_INIT ("Author"), 1 },

+    { KEYWORD_INIT ("Date"), 1 },

+    { KEYWORD_INIT ("CVSHeader"), 1 },

+    { KEYWORD_INIT ("Header"), 1 },

+    { KEYWORD_INIT ("Id"), 1 },

+    { KEYWORD_INIT ("Locker"), 1 },

+    { KEYWORD_INIT ("Log"), 1 },

+    { KEYWORD_INIT ("Name"), 1 },

+    { KEYWORD_INIT ("RCSfile"), 1 },

+    { KEYWORD_INIT ("Revision"), 1 },

+    { KEYWORD_INIT ("Source"), 1 },

+    { KEYWORD_INIT ("State"), 1 },

+    { NULL, 0, 0 },

+    { NULL, 0, 0 }

 };

 enum keyword

 {

     KEYWORD_AUTHOR = 0,

     KEYWORD_DATE,

+    KEYWORD_CVSHEADER,

     KEYWORD_HEADER,

     KEYWORD_ID,

     KEYWORD_LOCKER,

@@ -3522,8 +3528,10 @@ enum keyword

     KEYWORD_RCSFILE,

     KEYWORD_REVISION,

     KEYWORD_SOURCE,

-    KEYWORD_STATE

+    KEYWORD_STATE,

+    KEYWORD_LOCALID

 };

+enum keyword keyword_local = KEYWORD_ID;

 /* Convert an RCS date string into a readable string.  This is like

    the RCS date2str function.  */

@@ -3706,7 +3714,8 @@ expand_keywords (rcs, ver, name, log, lo

 	slen = s - srch;

 	for (keyword = keywords; keyword->string != NULL; keyword++)

 	{

-	    if (keyword->len == slen

+	    if (keyword->expandit

+		&& keyword->len == slen

 		&& strncmp (keyword->string, srch, slen) == 0)

 	    {

 		break;

@@ -3753,15 +3762,25 @@ expand_keywords (rcs, ver, name, log, lo

 		free_value = 1;

 		break;

+	    case KEYWORD_CVSHEADER:

 	    case KEYWORD_HEADER:

 	    case KEYWORD_ID:

+	    case KEYWORD_LOCALID:

 		{

 		    const char *path;

 		    int free_path;

 		    char *date;

+		    char *old_path;

-		    if (kw == KEYWORD_HEADER)

+		    old_path = NULL;

+		    if (kw == KEYWORD_HEADER ||

+			    (kw == KEYWORD_LOCALID &&

+			     keyword_local == KEYWORD_HEADER))

 			path = rcs->path;

+		    else if (kw == KEYWORD_CVSHEADER ||

+			     (kw == KEYWORD_LOCALID &&

+			      keyword_local == KEYWORD_CVSHEADER))

+			path = getfullCVSname(rcs->path, &old_path);

 		    else

 			path = last_component (rcs->path);

 		    path = escape_keyword_value (path, &free_path);

@@ -3784,6 +3803,8 @@ expand_keywords (rcs, ver, name, log, lo

 			 * and we can discard the const.

 			 */

 			free ((char *)path);

+		    if (old_path)

+			free (old_path);

 		    free (date);

 		    free_value = 1;

 		}

@@ -8637,3 +8658,102 @@ make_file_label (path, rev, rcs)

     }

     return label;

 }

+

+void

+RCS_setlocalid (const char *arg)

+{

+    char *copy, *next, *key;

+

+    copy = xstrdup(arg);

+    next = copy;

+    key = strtok(next, "=");

+

+    keywords[KEYWORD_LOCALID].string = xstrdup(key);

+    keywords[KEYWORD_LOCALID].len = strlen(key);

+    keywords[KEYWORD_LOCALID].expandit = 1;

+

+    /* options? */

+    while ((key = strtok(NULL, ","))) {

+	if (!strcmp(key, keywords[KEYWORD_ID].string))

+	    keyword_local = KEYWORD_ID;

+	else if (!strcmp(key, keywords[KEYWORD_HEADER].string))

+	    keyword_local = KEYWORD_HEADER;

+	else if (!strcmp(key, keywords[KEYWORD_CVSHEADER].string))

+	    keyword_local = KEYWORD_CVSHEADER;

+	else

+	    error(1, 0, "Unknown LocalId mode: %s", key);

+    }

+    free(copy);

+}

+

+void

+RCS_setincexc (const char *arg)

+{

+    char *key;

+    char *copy, *next;

+    int include = 0;

+    struct rcs_keyword *keyword;

+

+    copy = xstrdup(arg);

+    next = copy;

+    switch (*next++) {

+	case 'e':

+	    include = 0;

+	    break;

+	case 'i':

+	    include = 1;

+	    break;

+	default:

+	    free(copy);

+	    return;

+    }

+

+    if (include)

+	for (keyword = keywords; keyword->string != NULL; keyword++)

+	{

+	    keyword->expandit = 0;

+	}

+

+    key = strtok(next, ",");

+    while (key) {

+	for (keyword = keywords; keyword->string != NULL; keyword++) {

+	    if (strcmp (keyword->string, key) == 0)

+		keyword->expandit = include;

+	}

+	key = strtok(NULL, ",");

+    }

+    free(copy);

+    return;

+}

+

+#define ROOT_ATTIC "/" CVSATTIC

+static const char *

+getfullCVSname(const char *CVSname, char **pathstore)

+{

+    if (current_parsed_root->directory) {

+	int rootlen;

+	char *c = NULL;

+	int alen = sizeof(ROOT_ATTIC) - 1;

+

+	*pathstore = xstrdup(CVSname);

+	if ((c = strrchr(*pathstore, '/')) != NULL) {

+	    if (c - *pathstore >= alen) {

+		if (!strncmp(c - alen, ROOT_ATTIC, alen)) {

+		    while (*c != '\0') {

+			*(c - alen) = *c;

+			c++;

+		    }

+		    *(c - alen) = '\0';

+		}

+	    }

+	}

+

+	rootlen = strlen(current_parsed_root->directory);

+	if (!strncmp(*pathstore, current_parsed_root->directory, rootlen) &&

+	    (*pathstore)[rootlen] == '/')

+	    CVSname = (*pathstore + rootlen + 1);

+	else

+	    CVSname = (*pathstore);

+    }

+    return CVSname;

+}

diff -uprk.orig cvs-1.11.15.orig/src/rcs.h cvs-1.11.15/src/rcs.h

--- cvs-1.11.15.orig/src/rcs.h	2004-03-20 05:19:44 +0300

+++ cvs-1.11.15/src/rcs.h	2004-04-15 17:18:02 +0400

@@ -241,6 +241,8 @@ void RCS_rewrite PROTO ((RCSNode *, Delt

 void RCS_abandon PROTO ((RCSNode *));

 int rcs_change_text PROTO ((const char *, char *, size_t, const char *,

 			    size_t, char **, size_t *));

+void RCS_setincexc PROTO ((const char *arg));

+void RCS_setlocalid PROTO ((const char *arg));

 void RCS_deltas PROTO ((RCSNode *, FILE *, struct rcsbuffer *, const char *,

 			enum rcs_delta_op, char **, size_t *,

 			char **, size_t *));