circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 20:57:00 +00:00
Code Issues Projects Releases Wiki Activity

Make update-environment an array as well.

Browse Source
This commit is contained in:
nicm
2017-01-24 20:15:32 +00:00
parent b77dd75b57
commit 4b2821ff98
7 changed files with 30 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
environ.c
View File

@ -169,25 +169,27 @@ environ_unset(struct environ *env, const char *name)
free(envent);
}
/*
* Copy a space-separated list of variables from a destination into a source
* environment.
*/
/* Copy variables from a destination into a source * environment. */
void
environ_update(const char *vars, struct environ *srcenv,
struct environ *dstenv)
environ_update(struct options *oo, struct environ *src, struct environ *dst)
{
struct environ_entry *envent;
char *copyvars, *var, *next;
struct options_entry *o;
u_int size, idx;
const char *value;
copyvars = next = xstrdup(vars);
while ((var = strsep(&next, " ")) != NULL) {
if ((envent = environ_find(srcenv, var)) == NULL)
environ_clear(dstenv, var);
o = options_get(oo, "update-environment");
if (o == NULL || options_array_size(o, &size) == -1)
return;
for (idx = 0; idx < size; idx++) {
value = options_array_get(o, idx);
if (value == NULL)
continue;
if ((envent = environ_find(src, value)) == NULL)
environ_clear(dst, value);
else
environ_set(dstenv, envent->name, "%s", envent->value);
environ_set(dst, envent->name, "%s", envent->value);
}
free(copyvars);
}
/* Push environment into the real environment - use after fork(). */