Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/env.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/env.c (modified) (7 diffs)

branches/2.2.9/mindi-busybox/coreutils/env.c

@@ -4 +4 @@
  *
  * Copyright (c) 1988, 1993, 1994
- *  The Regents of the University of California.  All rights reserved.
+ * 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.
@@ -30 +30 @@
  */
 
-#include <getopt.h> /* struct option */
-extern char **environ;
+/* This is a NOEXEC applet. Be very careful! */
 
 #include "libbb.h"
@@ -42 +41 @@
 #endif
 
-int env_main(int argc, char** argv);
-int env_main(int argc, char** argv)
+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;
 
@@ -55 +51 @@
     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(unset_env->data);
-            unset_env = unset_env->link;
-        }
+    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);
     }
 
@@ -78 +77 @@
     }
 
-    if (*argv) {
-        BB_EXECVP(*argv, argv);
-        /* SUSv3-mandated exit codes. */
-        xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
-        bb_perror_msg_and_die("%s", *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(0);
+    fflush_stdout_and_exit(EXIT_SUCCESS);
 }
 
@@ -105 +104 @@
  *    documentation and/or other materials provided with the distribution.
  *
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
- *      ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
+ * 3. BSD Advertising Clause omitted per the July 22, 1999 licensing change
+ *    ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
  *
  * 4. Neither the name of the University nor the names of its contributors
@@ -124 +123 @@
  * SUCH DAMAGE.
  */
-
-