diff options
author | nicm <nicm> | 2019-03-18 11:58:40 +0000 |
---|---|---|
committer | nicm <nicm> | 2019-03-18 11:58:40 +0000 |
commit | ce6be7afd4d10b542f9cce8634d6bdd81754f775 (patch) | |
tree | 01a13843f212816c057069a13d02b46743ed8fd0 /environ.c | |
parent | d2d43987d0f35af2bc012f1260fdb81c851fe390 (diff) |
Make array options a sparse tree instead of an array of char * and
remove the size limit.
Diffstat (limited to 'environ.c')
-rw-r--r-- | environ.c | 20 |
1 files changed, 12 insertions, 8 deletions
@@ -174,22 +174,26 @@ environ_unset(struct environ *env, const char *name) void environ_update(struct options *oo, struct environ *src, struct environ *dst) { - struct environ_entry *envent; - struct options_entry *o; - u_int size, idx; - const char *value; + struct environ_entry *envent; + struct options_entry *o; + struct options_array_item *a; + const char *value; o = options_get(oo, "update-environment"); - if (o == NULL || options_array_size(o, &size) == -1) + if (o == NULL) return; - for (idx = 0; idx < size; idx++) { - value = options_array_get(o, idx); - if (value == NULL) + a = options_array_first(o); + while (a != NULL) { + value = options_array_item_value(a); + if (value == NULL) { + a = options_array_next(a); continue; + } if ((envent = environ_find(src, value)) == NULL) environ_clear(dst, value); else environ_set(dst, envent->name, "%s", envent->value); + a = options_array_next(a); } } |