Another whack at scripts/individual. Now builds 212 applets.

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

diff --git a/coreutils/env.c b/coreutils/env.c
index 1e95f819c614c77c8462d6d7f8b83aeb1437d002..eb1f0b2683858b2945e5454688c703323674b1f4 100644 (file)
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -5,19 +5,7 @@
  * Copyright (c) 1988, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  * Original copyright notice is retained at the end of this file.
  *
@@ -34,11 +22,11 @@
  */
 
 /*
- * Modified by Vladimir Oleynik <andersen@codepoet.org> (C) 2003
- * - corretion "-" option usage
+ * Modified by Vladimir Oleynik <dzo@simtreas.ru> (C) 2003
+ * - 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 +35,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_complementaly = "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 +85,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++) {