aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--toys/posix/env.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/toys/posix/env.c b/toys/posix/env.c
index 87c25a01..c2fc5cf3 100644
--- a/toys/posix/env.c
+++ b/toys/posix/env.c
@@ -4,36 +4,45 @@
*
* http://opengroup.org/onlinepubs/9699919799/utilities/env.html
-USE_ENV(NEWTOY(env, "^i", TOYFLAG_USR|TOYFLAG_BIN))
+USE_ENV(NEWTOY(env, "^iu*", TOYFLAG_USR|TOYFLAG_BIN))
config ENV
bool "env"
default y
help
- usage: env [-i] [NAME=VALUE...] [command [option...]]
+ usage: env [-i] [-u NAME] [NAME=VALUE...] [command [option...]]
Set the environment for command invocation.
-i Clear existing environment.
+ -u NAME Remove NAME from the environment
*/
+#define FOR_env
#include "toys.h"
+GLOBALS(
+ struct arg_list *u;
+);
+
extern char **environ;
void env_main(void)
{
char **ev;
- if (toys.optflags) clearenv();
+ if (toys.optflags & FLAG_i) clearenv();
+ while (TT.u) {
+ unsetenv(TT.u->arg);
+ TT.u = TT.u->next;
+ }
for (ev = toys.optargs; *ev; ev++) {
char *name = *ev, *val = strchr(name, '=');
if (val) {
*(val++) = 0;
- if (*val) setenv(name, val, 1);
- else unsetenv(name);
+ setenv(name, val, 1);
} else xexec(ev);
}