1 diff -ruN cvs-1.12.13-old/src/cvs.h cvs-1.12.13/src/cvs.h
2 --- cvs-1.12.13-old/src/cvs.h 2006-08-19 00:05:38.000000000 +0100
3 +++ cvs-1.12.13/src/cvs.h 2006-08-19 00:05:41.000000000 +0100
5 #define CVSROOTADM_LOGINFO "loginfo"
6 #define CVSROOTADM_MODULES "modules"
7 #define CVSROOTADM_NOTIFY "notify"
8 +#define CVSROOTADM_OPTIONS "options"
9 #define CVSROOTADM_PASSWD "passwd"
10 #define CVSROOTADM_POSTADMIN "postadmin"
11 #define CVSROOTADM_POSTPROXY "postproxy"
13 char *strcat_filename_onto_homedir (const char *, const char *);
14 char *cvs_temp_name (void);
15 FILE *cvs_temp_file (char **filename);
16 +void parseopts (const char *root);
18 int ls (int argc, char *argv[]);
19 int unlink_file (const char *f);
20 diff -ruN cvs-1.12.13-old/src/main.c cvs-1.12.13/src/main.c
21 --- cvs-1.12.13-old/src/main.c 2006-08-19 00:05:38.000000000 +0100
22 +++ cvs-1.12.13/src/main.c 2006-08-19 00:08:14.000000000 +0100
24 CVSROOT/config file to fix the broken one! */
25 if (config) free_config (config);
26 config = parse_config (current_parsed_root->directory, NULL);
27 + /* Now is a convenient time to read CVSROOT/options */
28 + parseopts(current_parsed_root->directory);
30 /* Can set TMPDIR in the environment if necessary now, since
31 * if it was set in config, we now know it.
32 @@ -1482,5 +1484,63 @@
40 + char path[PATH_MAX];
48 + printf("no CVSROOT in parseopts\n");
51 + p = strchr (root, ':');
57 + printf("mangled CVSROOT in parseopts\n");
60 + (void) sprintf (path, "%s/%s/%s", p, CVSROOTADM, CVSROOTADM_OPTIONS);
61 + if ((fp = fopen(path, "r")) != NULL) {
62 + while (fgets(buf, sizeof buf, fp) != NULL) {
65 + q = strrchr(buf, '\n');
69 + if (!strncmp(buf, "tag=", 4)) {
73 + rcs_localid = buf + 4;
74 + RCS_setlocalid(path, 0, &config->keywords, rcs_localid);
76 + if (!strncmp(buf, "tagexpand=", 10)) {
80 + rcs_incexc = buf + 10;
81 + RCS_setincexc(&config->keywords, rcs_incexc);
84 + * OpenBSD has a "umask=" and "dlimit=" command, we silently
85 + * ignore them here since they are not much use to us. cvsumask
86 + * defaults to 002 already, and the dlimit (data size limit)
87 + * should really be handled elsewhere (eg: login.conf).
94 /* vim:tabstop=8:shiftwidth=4
96 diff -ruN cvs-1.12.13-old/src/server.c cvs-1.12.13/src/server.c
97 --- cvs-1.12.13-old/src/server.c 2006-08-19 00:05:38.000000000 +0100
98 +++ cvs-1.12.13/src/server.c 2006-08-19 00:05:41.000000000 +0100
100 config->MaxCompressionLevel);
103 + /* Now is a good time to read CVSROOT/options too. */
104 + parseopts(current_parsed_root->directory);
106 path = xmalloc (strlen (current_parsed_root->directory)
107 + sizeof (CVSROOTADM)