31a32,41
> * Revision 1.6 1995/10/28 21:49:45 peter
> * First part of import conflict merge from rcs-5.7 import.
> *
> * All those $Log$ entries, combined with the whitespace changes are a real
> * pain.
> *
> * I'm committing this now, before it's completely finished to get it compiling
> * and working again ASAP. Some of the FreeBSD specific features are not working
> * in this commit yet (mainly rlog stuff and $FreeBSD: head/gnu/usr.bin/rcs/lib/rcskeys.c 11927 1995-10-29 19:31:11Z peter $ support)
> *
67c77
< libId(keysId, "$Id: rcskeys.c,v 5.4 1995/06/16 06:19:24 eggert Exp $")
---
> libId(keysId, "$Id: rcskeys.c,v 1.6 1995/10/28 21:49:45 peter Exp $")
74c84,85
< LOCKER, LOG, NAME, RCSFILE, REVISION, SOURCE, STATE
---
> LOCKER, LOG, NAME, RCSFILE, REVISION, SOURCE, STATE,
> FREEBSD
76a88
> /* Expand all keywords by default */
77a90,95
> static int ExpandKeyword[] = {
> false,
> true, true, true, true,
> true, true, true, true, true, true, true,
> false
> };
89a108,109
> if (!ExpandKeyword[j])
> continue;
106a127,156
> setIncExc(arg)
> char *arg;
> /* Sets up the ExpandKeyword table according to command-line flags */
> {
> char *key;
> int include = 0, j;
>
> arg += 2;
> switch (*arg++) {
> case 'e':
> include = false;
> break;
> case 'i':
> include = true;
> break;
> default:
> return(false);
> }
> if (include)
> for (j = sizeof(Keyword)/sizeof(*Keyword); (--j); )
> ExpandKeyword[j] = false;
> key = strtok(arg, ",");
> while (key) {
> for (j = sizeof(Keyword)/sizeof(*Keyword); (--j); )
> if (!strcmp(key, Keyword[j]))
> ExpandKeyword[j] = include;
> key = strtok(NULL, ",");
> }
> return(true);
> }