aboutsummaryrefslogtreecommitdiff
path: root/coreutils/env.c
diff options
context:
space:
mode:
authorGravatar Matt Kraai <kraai@debian.org>2001-05-11 14:26:29 +0000
committerGravatar Matt Kraai <kraai@debian.org>2001-05-11 14:26:29 +0000
commit5b44f48afc2b5b8153fcfc44bae289281a0bef5b (patch)
tree56d0765474951f9278ae48fc054f9c34af8887ab /coreutils/env.c
parentf3e79ba6e3b3bfa380241205829d0a78570c9af3 (diff)
downloadbusybox-5b44f48afc2b5b8153fcfc44bae289281a0bef5b.tar.gz
busybox-5b44f48afc2b5b8153fcfc44bae289281a0bef5b.tar.bz2
Fix handling of '-' option and way that variables are added to the
environment from Jonas Holmberg <jonas.holmberg@axis.com>. Fix handling of command options by adding + to getopt string.
Diffstat (limited to 'coreutils/env.c')
-rw-r--r--coreutils/env.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/coreutils/env.c b/coreutils/env.c
index 56577b611..aca7c3ae2 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -35,14 +35,13 @@ extern int env_main(int argc, char** argv)
{
char **ep, *p;
char *cleanenv[1];
+ int ignore_environment = 0;
int ch;
- while ((ch = getopt(argc, argv, "-iu:")) != -1)
+ while ((ch = getopt(argc, argv, "+iu:")) != -1) {
switch(ch) {
- case '-':
case 'i':
- environ = cleanenv;
- cleanenv[0] = NULL;
+ ignore_environment = 1;
break;
case 'u':
unsetenv(optarg);
@@ -50,15 +49,24 @@ extern int env_main(int argc, char** argv)
default:
show_usage();
}
+ }
+ if (optind != argc && !strcmp(argv[optind], "-")) {
+ ignore_environment = 1;
+ argv++;
+ }
+ if (ignore_environment) {
+ environ = cleanenv;
+ cleanenv[0] = NULL;
+ }
for (argv += optind; *argv && (p = strchr(*argv, '=')); ++argv)
- setenv(*argv, ++p, 1);
+ putenv(*argv);
if (*argv) {
execvp(*argv, argv);
perror_msg_and_die("%s", *argv);
}
for (ep = environ; *ep; ep++)
printf("%s\n", *ep);
- exit(EXIT_SUCCESS);
+ return 0;
}
/*