getopt_ulflags -> getopt32.

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

diff --git a/coreutils/env.c b/coreutils/env.c
index a07c0c617ee42c567afea2759999cb706d104d3c..d03318feac2b946e4f3c68f0946ada4207c9ec73 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.
  *
@@ -38,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[] = {
@@ -62,17 +45,17 @@ int env_main(int argc, char** argv)
 {
        static char *cleanenv[1] = { NULL };
 
-       char **ep, *p;
-       unsigned long opt;
+       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]) {
@@ -80,16 +63,16 @@ int env_main(int argc, char** argv)
                ++argv;
        }
 
-       if(opt & 1)
+       if (opt & 1)
                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");
                }
@@ -99,7 +82,7 @@ int env_main(int argc, char** argv)
        if (*argv) {
                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);
        }