- 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 a07bd324cd986be80be5e1a080bb6959ad629b60..f47d450c5fcc6785d4b01c45d6c9cd8af75ab169 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.
  *
@@ -33,33 +21,57 @@
  * output error checking.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
+/*
+ * Modified by Vladimir Oleynik <dzo@simtreas.ru> (C) 2003
+ * - correct "-" option usage
+ * - multiple "-u unsetenv" support
+ * - GNU long option support
+ * - use xfunc_error_retval
+ */
+
 #include "busybox.h"
+#include <errno.h>
+#include <getopt.h> /* struct option */
 
-extern int env_main(int argc, char** argv)
-{
-       char **ep, *p;
-       char *cleanenv[1] = { NULL };
-       unsigned long opt;
+#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
 
-       opt = bb_getopt_ulflags(argc, argv, "iu:", &p);
-       if(opt & 1)
-                       environ = cleanenv;
-       if(opt & 2)
-               unsetenv(p);
+int env_main(int argc, char** argv);
+int env_main(int argc, char** argv)
+{
+       /* cleanenv was static - why? */
+       char *cleanenv[1];
+       char **ep;
+       unsigned opt;
+       llist_t *unset_env = NULL;
+       extern char **environ;
 
+       opt_complementary = "u::";
+#if ENABLE_FEATURE_ENV_LONG_OPTIONS
+       applet_long_options = env_long_options;
+#endif
+       opt = getopt32(argc, argv, "+iu:", &unset_env);
        argv += optind;
-
-       if (*argv && (argv[0][0] == '-') && !argv[0][1]) {
-               environ = cleanenv;
+       if (*argv && LONE_DASH(argv[0])) {
+               opt |= 1;
                ++argv;
        }
+       if (opt & 1) {
+               cleanenv[0] = NULL;
+               environ = cleanenv;
+       } 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");
                }
@@ -67,21 +79,22 @@ extern int env_main(int argc, char** argv)
        }
 
        if (*argv) {
-               execvp(*argv, argv);
-               bb_perror_msg("%s", *argv);     /* Avoid multibyte problems. */
-               return (errno == ENOENT) ? 127 : 126;   /* SUSv3-mandated exit codes. */
+               BB_EXECVP(*argv, argv);
+               /* SUSv3-mandated exit codes. */
+               xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
+               bb_perror_msg_and_die("%s", *argv);
        }
 
        for (ep = environ; *ep; ep++) {
                puts(*ep);
        }
 
-       bb_fflush_stdout_and_exit(0);
+       fflush_stdout_and_exit(0);
 }
 
 /*
  * Copyright (c) 1988, 1993, 1994
- *     The Regents of the University of California.  All rights reserved.
+ *      The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -92,8 +105,8 @@ extern int env_main(int argc, char** argv)
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change 
- *             ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> 
+ * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
+ *             ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
  *
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software