circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2016-05-26 14:01:10 +01:00
parent 05ec232f3e cd14ac0486
commit 95e304d111
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
environ.c
View File

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