rpm2cpio: handle bz2 too; code shrink

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

diff --git a/coreutils/env.c b/coreutils/env.c
index 04279f3e00fbf25424c1a34fec533f5cb4e9fc97..f50a03e8b683b868f2fdf05d22f428208a3f52e8 100644 (file)
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -29,48 +29,45 @@
  * - use xfunc_error_retval
  */
 
-#include "busybox.h"
-#include <errno.h>
-#include <getopt.h> /* struct option */
+/* This is a NOEXEC applet. Be very careful! */
+
+#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)
 {
-       static char *cleanenv[1] = { NULL };
-
        char **ep;
        unsigned opt;
        llist_t *unset_env = NULL;
-       extern char **environ;
 
        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);
-
+       opt = getopt32(argv, "+iu:", &unset_env);
        argv += optind;
        if (*argv && LONE_DASH(argv[0])) {
                opt |= 1;
                ++argv;
        }
-
-       if (opt & 1)
-               environ = cleanenv;
-       else if (opt & 2) {
-               while (unset_env) {
-                       unsetenv(unset_env->data);
-                       unset_env = unset_env->link;
-               }
+       if (opt & 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)) {
@@ -81,17 +78,17 @@ int env_main(int argc, char** argv)
        }
 
        if (*argv) {
-               execvp(*argv, argv);
+               BB_EXECVP(*argv, argv);
                /* SUSv3-mandated exit codes. */
                xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
-               bb_perror_msg_and_die("%s", *argv);
+               bb_simple_perror_msg_and_die(*argv);
        }
 
        for (ep = environ; *ep; ep++) {
                puts(*ep);
        }
 
-       fflush_stdout_and_exit(0);
+       fflush_stdout_and_exit(EXIT_SUCCESS);
 }
 
 /*
@@ -126,5 +123,3 @@ int env_main(int argc, char** argv)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
-