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

Cosmetic cleanups for the local tag support. Since rcs isn't called

Browse Source 
anymore, don't do all the putenv's for it's benefit.
This commit is contained in:
Peter Wemm 1998-01-31 01:39:40 +00:00
parent f5160d1e06
commit 178f53ff27
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -828,7 +828,6 @@ Copyright (c) 1989-1997 Brian Berliner, david d `zoo' zuhn, \n\
error (1, save_errno, "%s", path);
}
free (path);
parseopts(CVSroot_directory);
}
#ifdef HAVE_PUTENV
@ -940,6 +939,9 @@ Copyright (c) 1989-1997 Brian Berliner, david d `zoo' zuhn, \n\
if we didn't, then there would be no way to check in a new
CVSROOT/config file to fix the broken one! */
parse_config (CVSroot_directory);
/* Now is a convenient time to read CVSROOT/options */
parseopts(CVSroot_directory);
}
} /* end of stuff that gets done if the user DOESN'T ask for help */
@ -1057,13 +1059,6 @@ parseopts(root)
rcs_localid = buf + 4;
RCS_setlocalid(rcs_localid);
what = malloc(sizeof("RCSLOCALID") + 2 + strlen(rcs_localid));
if (what == NULL) {
printf("no memory for local tag\n");
return;
}
sprintf(what, "RCSLOCALID=%s", rcs_localid);
putenv(what);
}
if (!strncmp(buf, "tagexpand=", 10)) {
char *what;
@ -1071,19 +1066,12 @@ parseopts(root)
rcs_incexc = buf + 10;
RCS_setincexc(rcs_incexc);
what = malloc(sizeof("RCSINCEXC") + 2 + strlen(rcs_incexc));
if (what == NULL) {
printf("no memory for tag expand mode\n");
return;
}
sprintf(what, "RCSINCEXC=%s", rcs_incexc);
putenv(what);
}
/*
* OpenBSD has a "umask=" and "dlimit=" command, we silently
* ignore them here since they are not much use to us. cvsumask
* defaults to 002 already, and the dlimit (data size limit)
* should really be handled elsewhere.
* should really be handled elsewhere (eg: login.conf).
*/
}
fclose(fp);

4
contrib/cvs/src/server.c
View File

@ -584,6 +584,9 @@ serve_root (arg)
nothing. But for rsh, we need to do it now. */
parse_config (CVSroot_directory);
/* Now is a good time to read CVSROOT/options too. */
parseopts(CVSroot_directory);
path = xmalloc (strlen (CVSroot_directory)
+ sizeof (CVSROOTADM)
+ sizeof (CVSROOTADM_HISTORY)
@ -621,7 +624,6 @@ Sorry, you don't have read/write access to the history file %s", path);
(void) putenv (env);
/* do not free env, as putenv has control of it */
#endif
parseopts(CVSroot_directory);
}
static int max_dotdot_limit = 0;