d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge rev 1.2 (extensions to the $CVSROOT/config syntax) and

Browse Source 
rev 1.4 (1.12 CVSROOT/config keyword expansion forward compatability)
into version 1.11-20080310.
Note the vendor has also added some forward compatability support.
We should determine if we can live with just the vendor's method.
This commit is contained in:
obrien 2008-03-19 15:05:27 +00:00
parent 17bdda65ae
commit f9e077664c
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/cvs/src/parseinfo.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1986-2005 The Free Software Foundation, Inc.
* Copyright (C) 1986-2008 The Free Software Foundation, Inc.
*
* Portions Copyright (C) 1998-2005 Derek Price, Ximbiot <http://ximbiot.com>,
* and others.
@ -247,6 +247,7 @@ parse_config (cvsroot)
/* FIXME-reentrancy: If we do a multi-threaded server, this would need
to go to the per-connection data structures. */
static int parsed = 0;
int ignore_unknown_config_keys = 0;
/* Authentication code and serve_root might both want to call us.
Let this happen smoothly. */
@ -446,6 +447,23 @@ warning: this CVS does not support PreservePermissions");
/* Recognize cvs-1.12-style keyword control rather than erroring out. */
RCS_setincexc(p);
}
else if (strcmp (line, "IgnoreUnknownConfigKeys") == 0)
{
if (strcmp (p, "no") == 0 || strcmp (p, "false") == 0
|| strcmp (p, "off") == 0 || strcmp (p, "0") == 0)
ignore_unknown_config_keys = 0;
else if (strcmp (p, "yes") == 0 || strcmp (p, "true") == 0
|| strcmp (p, "on") == 0 || strcmp (p, "1") == 0)
ignore_unknown_config_keys = 1;
else
{
error (0, 0, "%s: unrecognized value '%s' for '%s'",
infopath, p, line);
goto error_return;
}
}
else if (ignore_unknown_config_keys)
;
else
{
/* We may be dealing with a keyword which was added in a