- add libbb function str_tolower to convert a string to lowercase.

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

diff --git a/coreutils/env.c b/coreutils/env.c
index eb1f0b2683858b2945e5454688c703323674b1f4..f47d450c5fcc6785d4b01c45d6c9cd8af75ab169 100644 (file)
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -26,17 +26,12 @@
  * - correct "-" option usage
  * - multiple "-u unsetenv" support
  * - GNU long option support
- * - use bb_default_error_retval
+ * - use xfunc_error_retval
  */
 
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include "busybox.h"
 #include <errno.h>
-#include <unistd.h>
 #include <getopt.h> /* struct option */
-#include "busybox.h"
 
 #if ENABLE_FEATURE_ENV_LONG_OPTIONS
 static const struct option env_long_options[] = {
@@ -46,38 +41,37 @@ static const struct option env_long_options[] = {
 };
 #endif
 
+int env_main(int argc, char** argv);
 int env_main(int argc, char** argv)
 {
-       static char *cleanenv[1] = { NULL };
-
-       char **ep, *p;
-       unsigned long opt;
+       /* cleanenv was static - why? */
+       char *cleanenv[1];
+       char **ep;
+       unsigned opt;
        llist_t *unset_env = NULL;
        extern char **environ;
 
-       bb_opt_complementally = "u::";
+       opt_complementary = "u::";
 #if ENABLE_FEATURE_ENV_LONG_OPTIONS
-       bb_applet_long_options = env_long_options;
+       applet_long_options = env_long_options;
 #endif
-
-       opt = bb_getopt_ulflags(argc, argv, "+iu:", &unset_env);
-
+       opt = getopt32(argc, argv, "+iu:", &unset_env);
        argv += optind;
-       if (*argv && (argv[0][0] == '-') && !argv[0][1]) {
+       if (*argv && LONE_DASH(argv[0])) {
                opt |= 1;
                ++argv;
        }
-
-       if(opt & 1)
+       if (opt & 1) {
+               cleanenv[0] = NULL;
                environ = cleanenv;
-       else if(opt & 2) {
-               while(unset_env) {
+       } else if (opt & 2) {
+               while (unset_env) {
                        unsetenv(unset_env->data);
                        unset_env = unset_env->link;
                }
        }
 
-       while (*argv && ((p = strchr(*argv, '=')) != NULL)) {
+       while (*argv && (strchr(*argv, '=') != NULL)) {
                if (putenv(*argv) < 0) {
                        bb_perror_msg_and_die("putenv");
                }
@@ -85,9 +79,9 @@ int env_main(int argc, char** argv)
        }
 
        if (*argv) {
-               execvp(*argv, argv);
+               BB_EXECVP(*argv, argv);
                /* SUSv3-mandated exit codes. */
-               bb_default_error_retval = (errno == ENOENT) ? 127 : 126;
+               xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
                bb_perror_msg_and_die("%s", *argv);
        }
 
@@ -95,7 +89,7 @@ int env_main(int argc, char** argv)
                puts(*ep);
        }
 
-       bb_fflush_stdout_and_exit(0);
+       fflush_stdout_and_exit(0);
 }
 
 /*