X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fenv.c;h=87ab30cdd3977c18563e58a01c55e2aa05a2c2fe;hb=5cfa5ef6f358bb979b76f8927899b920074f698d;hp=626fc1952a6d976aad3b590086ed60942af294e4;hpb=eb5f433736c80ee6d3909b2803827b5d7af58bcf;p=oweals%2Fbusybox.git

diff --git a/coreutils/env.c b/coreutils/env.c
index 626fc1952..87ab30cdd 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -21,58 +21,96 @@
  *
  * 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 */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/env.html */
+
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
+ *
+ * Fixed bug involving exit return codes if execvp fails.  Also added
+ * output error checking.
+ */
+
+/*
+ * Modified by Vladimir Oleynik <dzo@simtreas.ru> (C) 2003
+ * - correct "-" option usage
+ * - multiple "-u unsetenv" support
+ * - GNU long option support
+ * - save errno after exec failed before bb_perror_msg()
+ */
+
+
 #include <stdio.h>
 #include <string.h>
-#include <getopt.h>
 #include <stdlib.h>
+#include <errno.h>
 #include <unistd.h>
+#include <getopt.h>
 #include "busybox.h"
 
+
+static const struct option env_long_options[] = {
+	{ "ignore-environment", 0, NULL, 'i' },
+	{ "unset", 1, NULL, 'u' },
+	{ 0, 0, 0, 0 }
+};
+
 extern int env_main(int argc, char** argv)
 {
 	char **ep, *p;
-	char *cleanenv[1];
-	int ignore_environment = 0;
-	int ch;
-
-	while ((ch = getopt(argc, argv, "+iu:")) != -1) {
-		switch(ch) {
-		case 'i':
-			ignore_environment = 1;
-			break;
-		case 'u':
-			unsetenv(optarg);
-			break;
-		default:
-			show_usage();
-		}
-	}
-	if (optind != argc && !strcmp(argv[optind], "-")) {
-		ignore_environment = 1;
-		argv++;
+	char *cleanenv[1] = { NULL };
+	unsigned long opt;
+	llist_t *unset_env = NULL;
+	extern char **environ;
+
+	bb_opt_complementaly = "u*";
+	bb_applet_long_options = env_long_options;
+
+	opt = bb_getopt_ulflags(argc, argv, "+iu:", &unset_env);
+
+	argv += optind;
+	if (*argv && (argv[0][0] == '-') && !argv[0][1]) {
+		opt |= 1;
+		++argv;
 	}
-	if (ignore_environment) {
+
+	if(opt & 1)
 		environ = cleanenv;
-		cleanenv[0] = NULL;
+	else if(opt & 2) {
+		while(unset_env) {
+			unsetenv(unset_env->data);
+			unset_env = unset_env->link;
+		}
+	}
+
+	while (*argv && ((p = strchr(*argv, '=')) != NULL)) {
+		if (putenv(*argv) < 0) {
+			bb_perror_msg_and_die("putenv");
+		}
+		++argv;
 	}
-	for (argv += optind; *argv && (p = strchr(*argv, '=')); ++argv)
-		if (putenv(*argv) < 0)
-			perror_msg_and_die("%s", *argv);
+
 	if (*argv) {
+		int er;
+
 		execvp(*argv, argv);
-		perror_msg_and_die("%s", *argv);
+		er = errno;
+		bb_perror_msg("%s", *argv);     /* Avoid multibyte problems. */
+		return (er == ENOENT) ? 127 : 126;   /* SUSv3-mandated exit codes. */
 	}
-	for (ep = environ; *ep; ep++)
-		printf("%s\n", *ep);
-	return 0;
+
+	for (ep = environ; *ep; ep++) {
+		puts(*ep);
+	}
+
+	bb_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
@@ -83,8 +121,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