diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/envop.c | 14 | ||||
| -rw-r--r-- | lib/envop.h | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lib/envop.c b/lib/envop.c index 79083f7..80a8b6c 100644 --- a/lib/envop.c +++ b/lib/envop.c @@ -173,7 +173,7 @@ environ_set (environ_t *env, char const *name, char const *value) return -1; } if (!value) - return environ_unset (env, name); + return environ_unset (env, name, value); ws.ws_env = (char const **) env->env_base; if (wordsplit (value, &ws, @@ -218,18 +218,21 @@ environ_set (environ_t *env, char const *name, char const *value) } int -environ_unset (environ_t *env, char const *name) +environ_unset (environ_t *env, char const *name, char const *refval) { ssize_t n; + char *val; if (!env || !name) { errno = EINVAL; return -1; } - n = getenvind (env, name, NULL); + n = getenvind (env, name, &val); if (n == -1) return ENOENT; + if (refval && strcmp (val, refval)) + return ENOENT; free (env->env_base[n]); memmove (env->env_base + n, env->env_base + n + 1, @@ -457,7 +460,10 @@ envop_exec (struct envop_entry *op, environ_t *env) break; case envop_unset: - environ_unset_glob (env, op->name); + if (op->value) + environ_unset (env, op->name, op->value); + else + environ_unset_glob (env, op->name); break; case envop_keep: diff --git a/lib/envop.h b/lib/envop.h index 054152e..82be3a5 100644 --- a/lib/envop.h +++ b/lib/envop.h @@ -27,7 +27,7 @@ environ_t *environ_create (char **); void environ_free (environ_t *env); int environ_add (environ_t *env, char const *def); int environ_set (environ_t *env, char const *name, char const *val); -int environ_unset (environ_t *env, char const *name); +int environ_unset (environ_t *env, char const *name, char const *val); int environ_unset_glob (environ_t *env, const char *pattern); static inline char ** environ_ptr (environ_t *env) |