lineedit: do not hang on error, but return error indicator.

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

diff --git a/coreutils/env.c b/coreutils/env.c
index db13b3aed977b65b8fdec1ead5f8f15cc5388f40..f50ee78693d287f708279680711fc2078d096650 100644 (file)
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -5,23 +5,11 @@
  * 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 source tree.
  *
  * Original copyright notice is retained at the end of this file.
  *
- * Modified for BusyBox by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Modified for BusyBox by Erik Andersen <andersen@codepoet.org>
  */
 
 /* BB_AUDIT SUSv3 compliant */
@@ -33,62 +21,78 @@
  * output error checking.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include "busybox.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
+ */
 
-extern int env_main(int argc, char** argv)
-{
-       char **ep, *p;
-       char *cleanenv[1] = { NULL };
-       int ch;
+/* This is a NOEXEC applet. Be very careful! */
 
-       while ((ch = getopt(argc, argv, "iu:")) > 0) {
-               switch(ch) {
-               case 'i':
-                       environ = cleanenv;
-                       break;
-               case 'u':
-                       unsetenv(optarg);
-                       break;
-               default:
-                       bb_show_usage();
-               }
-       }
+#include "libbb.h"
 
-       argv += optind;
+#if ENABLE_FEATURE_ENV_LONG_OPTIONS
+static const char env_longopts[] ALIGN1 =
+       "ignore-environment\0" No_argument       "i"
+       "unset\0"              Required_argument "u"
+       ;
+#endif
 
-       if (*argv && (argv[0][0] == '-') && !argv[0][1]) {
-               environ = cleanenv;
+int env_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int env_main(int argc UNUSED_PARAM, char **argv)
+{
+       unsigned opts;
+       llist_t *unset_env = NULL;
+
+       opt_complementary = "u::";
+#if ENABLE_FEATURE_ENV_LONG_OPTIONS
+       applet_long_options = env_longopts;
+#endif
+       opts = getopt32(argv, "+iu:", &unset_env);
+       argv += optind;
+       if (argv[0] && LONE_DASH(argv[0])) {
+               opts |= 1;
                ++argv;
        }
+       if (opts & 1) {
+               clearenv();
+       }
+       while (unset_env) {
+               char *var = llist_pop(&unset_env);
+               /* This does not handle -uVAR=VAL
+                * (coreutils _sets_ the variable in that case): */
+               /*unsetenv(var);*/
+               /* This does, but uses somewhan undocumented feature that
+                * putenv("name_without_equal_sign") unsets the variable: */
+               putenv(var);
+       }
 
-       while (*argv && ((p = strchr(*argv, '=')) != NULL)) {
+       while (*argv && (strchr(*argv, '=') != NULL)) {
                if (putenv(*argv) < 0) {
                        bb_perror_msg_and_die("putenv");
                }
                ++argv;
        }
 
-       if (*argv) {
-               execvp(*argv, argv);
-               bb_perror_msg("%s", *argv);     /* Avoid multibyte problems. */
-               return (errno == ENOENT) ? 127 : 126;   /* SUSv3-mandated exit codes. */
+       if (argv[0]) {
+               BB_EXECVP_or_die(argv);
        }
 
-       for (ep = environ; *ep; ep++) {
-               puts(*ep);
+       if (environ) { /* clearenv() may set environ == NULL! */
+               char **ep;
+               for (ep = environ; *ep; ep++) {
+                       puts(*ep);
+               }
        }
 
-       bb_fflush_stdout_and_exit(0);
+       fflush_stdout_and_exit(EXIT_SUCCESS);
 }
 
 /*
  * 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
@@ -99,8 +103,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
@@ -118,5 +122,3 @@ extern int env_main(int argc, char** argv)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
-