use bb_xbind/bb_xlisten

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

diff --git a/coreutils/env.c b/coreutils/env.c
index 70cef6588c5800bb26cc8e0b1699b78454d82a46..a07c0c617ee42c567afea2759999cb706d104d3c 100644 (file)
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -38,7 +38,7 @@
  * - correct "-" option usage
  * - multiple "-u unsetenv" support
  * - GNU long option support
- * - save errno after exec failed before bb_perror_msg()
+ * - use bb_default_error_retval
  */
 
 
@@ -47,26 +47,30 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
-#include <getopt.h>
+#include <getopt.h> /* struct option */
 #include "busybox.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 }
 };
+#endif
 
-extern int env_main(int argc, char** argv)
+int env_main(int argc, char** argv)
 {
+       static char *cleanenv[1] = { NULL };
+
        char **ep, *p;
-       char *cleanenv[1] = { NULL };
        unsigned long opt;
        llist_t *unset_env = NULL;
        extern char **environ;
 
-       bb_opt_complementally = "u*";
+       bb_opt_complementally = "u::";
+#if ENABLE_FEATURE_ENV_LONG_OPTIONS
        bb_applet_long_options = env_long_options;
+#endif
 
        opt = bb_getopt_ulflags(argc, argv, "+iu:", &unset_env);
 
@@ -93,12 +97,10 @@ extern int env_main(int argc, char** argv)
        }
 
        if (*argv) {
-               int er;
-
                execvp(*argv, argv);
-               er = errno;
-               bb_perror_msg("%s", *argv);     /* Avoid multibyte problems. */
-               return (er == ENOENT) ? 127 : 126;   /* SUSv3-mandated exit codes. */
+               /* SUSv3-mandated exit codes. */
+               bb_default_error_retval = (errno == ENOENT) ? 127 : 126;
+               bb_perror_msg_and_die("%s", *argv);
        }
 
        for (ep = environ; *ep; ep++) {