1 $DragonFly: src/gnu/usr.bin/cvs/cvs/Attic/parseinfo.c.patch,v 1.1 2005/03/01 23:18:32 corecode Exp $
3 ===================================================================
4 RCS file: /space/cvs/dragonfly/src/contrib/cvs-1.12.9/src/parseinfo.c,v
5 retrieving revision 1.1
6 diff -u -r1.1 parseinfo.c
7 --- parseinfo.c 3 Aug 2004 18:08:51 -0000 1.1
8 +++ parseinfo.c 18 Nov 2004 16:47:34 -0000
11 Returns 0 for success, negative value for failure. Call
12 error(0, ...) on errors in addition to the return value. */
15 +parse_config_file (const char *cvsroot, const char *config);
18 parse_config (char *cvsroot)
23 - size_t line_allocated = 0;
27 /* FIXME-reentrancy: If we do a multi-threaded server, this would need
28 to go to the per-connection data structures. */
29 static int parsed = 0;
35 + ret = parse_config_file (cvsroot, CVSROOTADM_CONFIG);
36 + ret = parse_config_file (cvsroot, CVSROOTADM_OPTIONS) || ret;
42 +parse_config_file (const char *cvsroot, const char *config_name)
44 + char *infopath = NULL;
47 + size_t line_allocated = 0;
51 infopath = xmalloc (strlen (cvsroot)
52 - + sizeof (CVSROOTADM_CONFIG)
53 + + strlen (config_name)
58 strcat (infopath, "/");
59 strcat (infopath, CVSROOTADM);
60 strcat (infopath, "/");
61 - strcat (infopath, CVSROOTADM_CONFIG);
62 + strcat (infopath, config_name);
64 fp_info = CVS_FOPEN (infopath, "r");
70 - else if (strcmp (line, "LocalKeyword") == 0)
71 + else if (strcmp (line, "LocalKeyword") == 0 ||
72 + strcmp (line, "tag") == 0)
77 - else if (strcmp (line, "KeywordExpand") == 0)
78 + else if (strcmp (line, "KeywordExpand") == 0 ||
79 + strcmp (line, "tagexpand") == 0)
85 error (0, 0, "%s: unrecognized keyword '%s'",
89 + /* Don't break processing on legacy CVSROOT/options keywords */
90 + if (strcmp (line, "umask") != 0 &&
91 + strcmp (line, "dlimit") != 0)