Merge branch 'obsd-master'

pull/432/head
Thomas Adam 2016-05-26 14:01:10 +01:00
commit 95e304d111
1 changed files with 3 additions and 11 deletions

View File

@ -195,19 +195,11 @@ environ_update(const char *vars, struct environ *srcenv,
void
environ_push(struct environ *env)
{
struct environ_entry *envent;
char *v;
while (*environ != NULL) {
v = xstrdup(*environ);
v[strcspn(v, "=")] = '\0';
unsetenv(v);
free(v);
}
struct environ_entry *envent;
environ = xcalloc(1, sizeof *environ);
RB_FOREACH(envent, environ, env) {
if (envent->value != NULL)
if (envent->value != NULL && *envent->name != '\0')
setenv(envent->name, envent->value, 1);
}
}