Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/env.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/env.c (modified) (5 diffs)

branches/2.2.5/mindi-busybox/coreutils/env.c

@@ -6 +6 @@
  *  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.
@@ -39 +27 @@
  * - multiple "-u unsetenv" support
  * - GNU long option support
- * - use bb_default_error_retval
+ * - use xfunc_error_retval
  */
 
+#include <getopt.h> /* struct option */
+extern char **environ;
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <getopt.h> /* struct option */
-#include "busybox.h"
+#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)
 {
-    static char *cleanenv[1] = { NULL };
+    /* cleanenv was static - why? */
+    char *cleanenv[1];
+    char **ep;
+    unsigned opt;
+    llist_t *unset_env = NULL;
 
-    char **ep, *p;
-    unsigned long 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_longopts;
 #endif
-
-    opt = bb_getopt_ulflags(argc, argv, "+iu:", &unset_env);
-
+    opt = getopt32(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 {
+        while (unset_env) {
             unsetenv(unset_env->data);
             unset_env = unset_env->link;
@@ -90 +71 @@
     }
 
-    while (*argv && ((p = strchr(*argv, '=')) != NULL)) {
+    while (*argv && (strchr(*argv, '=') != NULL)) {
         if (putenv(*argv) < 0) {
             bb_perror_msg_and_die("putenv");
@@ -98 +79 @@
 
     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);
     }
@@ -108 +89 @@
     }
 
-    bb_fflush_stdout_and_exit(0);
+    fflush_stdout_and_exit(0);
 }