mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00
Code Issues Releases Activity

Untangle VarFind and, while rewriting most of the function, fix the

Browse Source 
intendation. (A large part of the function was already at intendation 8).
This commit is contained in:
Hartmut Brandt 2005-02-09 13:13:59 +00:00
parent 93931378d9
commit f2b48f62c6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=141572
1 changed files with 54 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
usr.bin/make/var.c
View File

@ -256,9 +256,9 @@ VarPossiblyExpand(const char *name, GNode *ctxt)
static Var *
VarFind(const char *name, GNode *ctxt, int flags)
{
Boolean localCheckEnvFirst;
LstNode *var;
Var *v;
Boolean localCheckEnvFirst;
LstNode *var;
char *env;
/*
* If the variable name begins with a '.', it could very well be one of
@ -299,54 +299,60 @@ VarFind(const char *name, GNode *ctxt, int flags)
}
}
/*
* Note whether this is one of the specific variables we were told through
* the -E flag to use environment-variable-override for.
*/
if (Lst_Find(&envFirstVars, name, (CompareProc *)strcmp) != NULL) {
localCheckEnvFirst = TRUE;
} else {
localCheckEnvFirst = FALSE;
}
/*
* First look for the variable in the given context. If it's not there,
* look for it in VAR_CMD, VAR_GLOBAL and the environment, in that order,
* depending on the FIND_* flags in 'flags'
*/
var = Lst_Find(&ctxt->context, name, VarCmp);
if ((var == NULL) && (flags & FIND_CMD) && (ctxt != VAR_CMD)) {
var = Lst_Find(&VAR_CMD->context, name, VarCmp);
}
if ((var == NULL) && (flags & FIND_GLOBAL) && (ctxt != VAR_GLOBAL) &&
!checkEnvFirst && !localCheckEnvFirst)
{
var = Lst_Find(&VAR_GLOBAL->context, name, VarCmp);
}
if ((var == NULL) && (flags & FIND_ENV)) {
char *env;
if ((env = getenv(name)) != NULL) {
v = VarCreate(name, env, VAR_FROM_ENV);
return (v);
} else if ((checkEnvFirst || localCheckEnvFirst) &&
(flags & FIND_GLOBAL) && (ctxt != VAR_GLOBAL))
{
var = Lst_Find(&VAR_GLOBAL->context, name, VarCmp);
if (var == NULL) {
return (NULL);
} else {
return (Lst_Datum(var));
}
/*
* Note whether this is one of the specific variables we were told
* through the -E flag to use environment-variable-override for.
*/
if (Lst_Find(&envFirstVars, name, (CompareProc *)strcmp) != NULL) {
localCheckEnvFirst = TRUE;
} else {
return (NULL);
localCheckEnvFirst = FALSE;
}
/*
* First look for the variable in the given context. If it's not there,
* look for it in VAR_CMD, VAR_GLOBAL and the environment,
* in that order, depending on the FIND_* flags in 'flags'
*/
var = Lst_Find(&ctxt->context, name, VarCmp);
if (var != NULL) {
/* got it */
return (Lst_Datum(var));
}
/* not there - try command line context */
if ((flags & FIND_CMD) && (ctxt != VAR_CMD)) {
var = Lst_Find(&VAR_CMD->context, name, VarCmp);
if (var != NULL)
return (Lst_Datum(var));
}
/* not there - try global context, but only if not -e/-E */
if ((flags & FIND_GLOBAL) && (ctxt != VAR_GLOBAL) &&
!checkEnvFirst && !localCheckEnvFirst) {
var = Lst_Find(&VAR_GLOBAL->context, name, VarCmp);
if (var != NULL)
return (Lst_Datum(var));
}
if (!(flags & FIND_ENV))
/* we were not told to look into the environment */
return (NULL);
/* look in the environment */
if ((env = getenv(name)) != NULL) {
/* craft this variable from the environment value */
return (VarCreate(name, env, VAR_FROM_ENV));
}
/* deferred check for the environment (in case of -e/-E) */
if ((checkEnvFirst || localCheckEnvFirst) &&
(flags & FIND_GLOBAL) && (ctxt != VAR_GLOBAL)) {
var = Lst_Find(&VAR_GLOBAL->context, name, VarCmp);
if (var != NULL)
return (Lst_Datum(var));
}
} else if (var == NULL) {
return (NULL);
} else {
return (Lst_Datum(var));
}
}
/*-