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

Add additional field 'overwrite' to login_vars. It mainly needed to handle

Browse Source 
"term" according to manpage, i.e. not overwrite it, if already present in
environment.
This commit is contained in:
Andrey A. Chernov 2002-06-28 14:45:30 +00:00
parent 88127f1a62
commit cc1b8dcb1c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=98977
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/libutil/login_class.c
View File

@ -113,17 +113,18 @@ static struct login_vars {
const char *tag;
const char *var;
const char *def;
int overwrite;
} pathvars[] = {
{ "path", "PATH", NULL },
{ "cdpath", "CDPATH", NULL },
{ "manpath", "MANPATH", NULL },
{ NULL, NULL, NULL }
{ "path", "PATH", NULL, 1},
{ "cdpath", "CDPATH", NULL, 1},
{ "manpath", "MANPATH", NULL, 1},
{ NULL, NULL, NULL, 0}
}, envars[] = {
{ "lang", "LANG", NULL },
{ "charset", "MM_CHARSET", NULL },
{ "timezone", "TZ", NULL },
{ "term", "TERM", NULL },
{ NULL, NULL, NULL }
{ "lang", "LANG", NULL, 1},
{ "charset", "MM_CHARSET", NULL, 1},
{ "timezone", "TZ", NULL, 1},
{ "term", "TERM", NULL, 0},
{ NULL, NULL, NULL, 0}
};
static char *
@ -202,7 +203,7 @@ setclassenvironment(login_cap_t *lc, const struct passwd * pwd, int paths)
char * np = substvar(var, pwd, hlen, pch, nlen);
if (np != NULL) {
setenv(vars->var, np, 1);
setenv(vars->var, np, vars->overwrite);
free(np);
} else if (vars->def != NULL) {
setenv(vars->var, vars->def, 0);