From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/coreutils/env.c | 101 ++++++++++++----------------- 1 file changed, 41 insertions(+), 60 deletions(-) (limited to 'release/src/router/busybox/coreutils/env.c') diff --git a/release/src/router/busybox/coreutils/env.c b/release/src/router/busybox/coreutils/env.c index d8a76e36..f50a03e8 100644 --- a/release/src/router/busybox/coreutils/env.c +++ b/release/src/router/busybox/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. * @@ -34,58 +22,55 @@ */ /* - * Modified by Vladimir Oleynik (C) 2003 - * - corretion "-" option usage + * Modified by Vladimir Oleynik (C) 2003 + * - correct "-" option usage * - multiple "-u unsetenv" support * - GNU long option support - * - save errno after exec failed before bb_perror_msg() + * - use xfunc_error_retval */ +/* This is a NOEXEC applet. Be very careful! */ -#include -#include -#include -#include -#include -#include -#include "busybox.h" - +#include "libbb.h" -static const struct option env_long_options[] = { - { "ignore-environment", 0, NULL, 'i' }, - { "unset", 1, NULL, 'u' }, - { 0, 0, 0, 0 } -}; +#if ENABLE_FEATURE_ENV_LONG_OPTIONS +static const char env_longopts[] ALIGN1 = + "ignore-environment\0" No_argument "i" + "unset\0" Required_argument "u" + ; +#endif -extern int env_main(int argc, char** argv) +int env_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int env_main(int argc UNUSED_PARAM, char **argv) { - char **ep, *p; - char *cleanenv[1] = { NULL }; - unsigned long opt; - llist_t *unset_env; - extern char **environ; - - bb_opt_complementaly = "u*"; - bb_applet_long_options = env_long_options; - - opt = bb_getopt_ulflags(argc, argv, "+iu:", &unset_env); - + char **ep; + unsigned opt; + llist_t *unset_env = NULL; + + opt_complementary = "u::"; +#if ENABLE_FEATURE_ENV_LONG_OPTIONS + applet_long_options = env_longopts; +#endif + 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) - environ = cleanenv; - else if(opt & 2) { - while(unset_env) { - unsetenv(unset_env->data); - unset_env = unset_env->link; - } + if (opt & 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"); } @@ -93,19 +78,17 @@ extern int env_main(int argc, char** argv) } if (*argv) { - int er; - - execvp(*argv, argv); - er = errno; - bb_perror_msg("%s", *argv); /* Avoid multibyte problems. */ - return (er == ENOENT) ? 127 : 126; /* SUSv3-mandated exit codes. */ + BB_EXECVP(*argv, argv); + /* SUSv3-mandated exit codes. */ + xfunc_error_retval = (errno == ENOENT) ? 127 : 126; + bb_simple_perror_msg_and_die(*argv); } for (ep = environ; *ep; ep++) { puts(*ep); } - bb_fflush_stdout_and_exit(0); + fflush_stdout_and_exit(EXIT_SUCCESS); } /* @@ -140,5 +123,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. */ - - -- cgit v1.2.3-54-g00ecf