diff options
author | nicm <nicm> | 2015-05-07 07:35:31 +0000 |
---|---|---|
committer | nicm <nicm> | 2015-05-07 07:35:31 +0000 |
commit | 73c871ba0a075bdd458a1b4208afd0e9bb293096 (patch) | |
tree | e03237b7d5160f05010c7af9c87ae557775cde20 /environ.c | |
parent | b6be03f01aaf10230bf4de4c49d56bc7d9bee9bf (diff) |
Simplify environ_push so it doesn't need the ARRAY_* functions.
Diffstat (limited to 'environ.c')
-rw-r--r-- | environ.c | 25 |
1 files changed, 9 insertions, 16 deletions
@@ -157,23 +157,16 @@ environ_update(const char *vars, struct environ *srcenv, void environ_push(struct environ *env) { - ARRAY_DECL(, char *) varlist; - struct environ_entry *envent; - char **varp, *var; - u_int i; - - ARRAY_INIT(&varlist); - for (varp = environ; *varp != NULL; varp++) { - var = xstrdup(*varp); - var[strcspn(var, "=")] = '\0'; - ARRAY_ADD(&varlist, var); - } - for (i = 0; i < ARRAY_LENGTH(&varlist); i++) { - var = ARRAY_ITEM(&varlist, i); - unsetenv(var); - free(var); + struct environ_entry *envent; + char **vp, *v; + + for (vp = environ; *vp != NULL; vp++) { + v = xstrdup(*vp); + v[strcspn(v, "=")] = '\0'; + + unsetenv(v); + free(v); } - ARRAY_FREE(&varlist); RB_FOREACH(envent, environ, env) { if (envent->value != NULL) |