- backout using features which are not available with the previous stable

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

diff --git a/coreutils/env.c b/coreutils/env.c
index 8bb690b72e5134554e81e6d06e65b222965339ab..fd58a23da823b4a5104e4298465c7ff3348e918d 100644 (file)
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -21,58 +21,95 @@
  *
  * Original copyright notice is retained at the end of this file.
  *
- * Modified for BusyBox by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Modified for BusyBox by Erik Andersen <andersen@codepoet.org>
  */
 
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/env.html */
+
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ *
+ * Fixed bug involving exit return codes if execvp fails.  Also added
+ * output error checking.
+ */
+
+/*
+ * Modified by Vladimir Oleynik <dzo@simtreas.ru> (C) 2003
+ * - correct "-" option usage
+ * - multiple "-u unsetenv" support
+ * - GNU long option support
+ * - use bb_default_error_retval
+ */
+
+
 #include <stdio.h>
 #include <string.h>
-#include <getopt.h>
 #include <stdlib.h>
+#include <errno.h>
 #include <unistd.h>
+#include <getopt.h> /* struct option */
 #include "busybox.h"
 
-extern int env_main(int argc, char** argv)
+
+static const struct option env_long_options[] = {
+       { "ignore-environment", 0, NULL, 'i' },
+       { "unset", 1, NULL, 'u' },
+       { 0, 0, 0, 0 }
+};
+
+int env_main(int argc, char** argv)
 {
+       static char *cleanenv[1] = { NULL };
+
        char **ep, *p;
-       char *cleanenv[1];
-       int ignore_environment = 0;
-       int ch;
-
-       while ((ch = getopt(argc, argv, "+iu:")) != -1) {
-               switch(ch) {
-               case 'i':
-                       ignore_environment = 1;
-                       break;
-               case 'u':
-                       unsetenv(optarg);
-                       break;
-               default:
-                       show_usage();
-               }
-       }
-       if (optind != argc && !strcmp(argv[optind], "-")) {
-               ignore_environment = 1;
-               argv++;
+       unsigned long opt;
+       llist_t *unset_env = NULL;
+       extern char **environ;
+
+       bb_opt_complementally = "u::";
+       bb_applet_long_options = env_long_options;
+
+       opt = bb_getopt_ulflags(argc, argv, "+iu:", &unset_env);
+
+       argv += optind;
+       if (*argv && (argv[0][0] == '-') && !argv[0][1]) {
+               opt |= 1;
+               ++argv;
        }
-       if (ignore_environment) {
+
+       if(opt & 1)
                environ = cleanenv;
-               cleanenv[0] = NULL;
+       else if(opt & 2) {
+               while(unset_env) {
+                       unsetenv(unset_env->data);
+                       unset_env = unset_env->link;
+               }
        }
-       for (argv += optind; *argv && (p = strchr(*argv, '=')); ++argv)
-               if (putenv(*argv) < 0)
-                       perror_msg_and_die("%s", *argv);
+
+       while (*argv && ((p = strchr(*argv, '=')) != NULL)) {
+               if (putenv(*argv) < 0) {
+                       bb_perror_msg_and_die("putenv");
+               }
+               ++argv;
+       }
+
        if (*argv) {
                execvp(*argv, argv);
-               perror_msg_and_die("%s", *argv);
+               /* SUSv3-mandated exit codes. */
+               bb_default_error_retval = (errno == ENOENT) ? 127 : 126;
+               bb_perror_msg_and_die("%s", *argv);
        }
-       for (ep = environ; *ep; ep++)
+
+       for (ep = environ; *ep; ep++) {
                puts(*ep);
-       return 0;
+       }
+
+       bb_fflush_stdout_and_exit(0);
 }
 
 /*
  * 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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -83,8 +120,8 @@ extern 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