mirror of
https://salsa.debian.org/srivasta/make-dfsg.git
synced 2024-12-27 06:27:57 +00:00
Formerly variable.c.~24~
This commit is contained in:
parent
1bafe5ed81
commit
d2654362c5
1 changed files with 2 additions and 4 deletions
|
@ -446,7 +446,6 @@ target_environment (file)
|
||||||
register struct variable *v;
|
register struct variable *v;
|
||||||
for (v = set->table[i]; v != 0; v = v->next)
|
for (v = set->table[i]; v != 0; v = v->next)
|
||||||
{
|
{
|
||||||
extern char *getenv ();
|
|
||||||
unsigned int j = i % buckets;
|
unsigned int j = i % buckets;
|
||||||
register struct variable_bucket *ov;
|
register struct variable_bucket *ov;
|
||||||
register char *p = v->name;
|
register char *p = v->name;
|
||||||
|
@ -464,10 +463,9 @@ target_environment (file)
|
||||||
/* Only export default variables by explicit request. */
|
/* Only export default variables by explicit request. */
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!export_all_variables
|
if (! export_all_variables
|
||||||
&& v->origin != o_command
|
&& v->origin != o_command
|
||||||
&& v->origin != o_env && v->origin != o_env_override
|
&& v->origin != o_env && v->origin != o_env_override)
|
||||||
&& !(v->origin == o_file && getenv (p) != 0))
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (*p != '_' && (*p < 'A' || *p > 'Z')
|
if (*p != '_' && (*p < 'A' || *p > 'Z')
|
||||||
|
|
Loading…
Reference in a new issue