lineedit: do not hang on error, but return error indicator.

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

diff --git a/coreutils/env.c b/coreutils/env.c
index 2f8c8b71d047dc1ed43c159356bc22decac3509a..f50ee78693d287f708279680711fc2078d096650 100644 (file)
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -5,7 +5,7 @@
  * Copyright (c) 1988, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Original copyright notice is retained at the end of this file.
  *
@@ -43,29 +43,30 @@ static const char env_longopts[] ALIGN1 =
 int env_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int env_main(int argc UNUSED_PARAM, char **argv)
 {
-       /* cleanenv was static - why? */
-       char *cleanenv[1];
-       char **ep;
-       unsigned opt;
+       unsigned opts;
        llist_t *unset_env = NULL;
 
        opt_complementary = "u::";
 #if ENABLE_FEATURE_ENV_LONG_OPTIONS
        applet_long_options = env_longopts;
 #endif
-       opt = getopt32(argv, "+iu:", &unset_env);
+       opts = getopt32(argv, "+iu:", &unset_env);
        argv += optind;
-       if (*argv && LONE_DASH(argv[0])) {
-               opt |= 1;
+       if (argv[0] && LONE_DASH(argv[0])) {
+               opts |= 1;
                ++argv;
        }
-       if (opt & 1) {
-               cleanenv[0] = NULL;
-               environ = cleanenv;
-       } else {
-               while (unset_env) {
-                       unsetenv(llist_pop(&unset_env));
-               }
+       if (opts & 1) {
+               clearenv();
+       }
+       while (unset_env) {
+               char *var = llist_pop(&unset_env);
+               /* This does not handle -uVAR=VAL
+                * (coreutils _sets_ the variable in that case): */
+               /*unsetenv(var);*/
+               /* This does, but uses somewhan undocumented feature that
+                * putenv("name_without_equal_sign") unsets the variable: */
+               putenv(var);
        }
 
        while (*argv && (strchr(*argv, '=') != NULL)) {
@@ -75,15 +76,15 @@ int env_main(int argc UNUSED_PARAM, char **argv)
                ++argv;
        }
 
-       if (*argv) {
-               BB_EXECVP(*argv, argv);
-               /* SUSv3-mandated exit codes. */
-               xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
-               bb_simple_perror_msg_and_die(*argv);
+       if (argv[0]) {
+               BB_EXECVP_or_die(argv);
        }
 
-       for (ep = environ; *ep; ep++) {
-               puts(*ep);
+       if (environ) { /* clearenv() may set environ == NULL! */
+               char **ep;
+               for (ep = environ; *ep; ep++) {
+                       puts(*ep);
+               }
        }
 
        fflush_stdout_and_exit(EXIT_SUCCESS);