Bump to version 1.22.1

[platform/upstream/busybox.git] / coreutils / env.c

diff --git a/coreutils/env.c b/coreutils/env.c
index 2a271f7..807ef13 100644 (file)
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -3,9 +3,9 @@
  * env implementation for busybox
  *
  * 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.
  *
@@ -29,46 +29,52 @@
  * - use xfunc_error_retval
  */
 
-#include "busybox.h"
-#include <errno.h>
-#include <getopt.h> /* struct option */
-extern char **environ;
+/* This is a NOEXEC applet. Be very careful! */
+
+//usage:#define env_trivial_usage
+//usage:       "[-iu] [-] [name=value]... [PROG ARGS]"
+//usage:#define env_full_usage "\n\n"
+//usage:       "Print the current environment or run PROG after setting up\n"
+//usage:       "the specified environment\n"
+//usage:     "\n       -, -i   Start with an empty environment"
+//usage:     "\n       -u      Remove variable from the environment"
+
+#include "libbb.h"
 
 #if ENABLE_FEATURE_ENV_LONG_OPTIONS
-static const struct option env_long_options[] = {
-       { "ignore-environment", 0, NULL, 'i' },
-       { "unset", 1, NULL, 'u' },
-       { 0, 0, 0, 0 }
-};
+static const char env_longopts[] ALIGN1 =
+       "ignore-environment\0" No_argument       "i"
+       "unset\0"              Required_argument "u"
+       ;
 #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;
 
        opt_complementary = "u::";
 #if ENABLE_FEATURE_ENV_LONG_OPTIONS
-       applet_long_options = env_long_options;
+       applet_long_options = env_longopts;
 #endif
-       opt = getopt32(argc, 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 if (opt & 2) {
-               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);
        }
 
        while (*argv && (strchr(*argv, '=') != NULL)) {
@@ -78,18 +84,18 @@ int env_main(int argc, char** argv)
                ++argv;
        }
 
-       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,8 +111,8 @@ int env_main(int argc, char** argv)
  *    notice, this list of conditions and the following disclaimer in the
  *    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
  *    may be used to endorse or promote products derived from this software
@@ -124,5 +130,3 @@ int env_main(int argc, char** argv)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
-