* archival/bunzip2.c (bunzip2_main): Do not remove files if writing to standard

[oweals/busybox.git] / coreutils / env.c

diff --git a/coreutils/env.c b/coreutils/env.c
index 56577b611038ba58eee36a3f51f3d62fe24c8966..8bb690b72e5134554e81e6d06e65b222965339ab 100644 (file)
--- 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,25 @@ 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);
+               if (putenv(*argv) < 0)
+                       perror_msg_and_die("%s", *argv);
        if (*argv) {
                execvp(*argv, argv);
                perror_msg_and_die("%s", *argv);
        }
        for (ep = environ; *ep; ep++)
-               printf("%s\n", *ep);
-       exit(EXIT_SUCCESS);
+               puts(*ep);
+       return 0;
 }
 
 /*