busybox-1.0.1-rc1.patch

[oweals/busybox.git] / busybox / networking / ifupdown.c

diff --git a/busybox/networking/ifupdown.c b/busybox/networking/ifupdown.c
index 1842be58bcac02c1a7233601796472dda49ec0ef..21afe42d44232629226f3648f8d15c2a5b5c376a 100644 (file)
--- a/busybox/networking/ifupdown.c
+++ b/busybox/networking/ifupdown.c
@@ -150,7 +150,7 @@ struct interfaces_file_t
 
 static char no_act = 0;
 static char verbose = 0;
-static char **environ = NULL;
+static char **__myenviron = NULL;
 
 #ifdef CONFIG_FEATURE_IFUPDOWN_IP
 
@@ -961,16 +961,16 @@ static void set_environ(struct interface_defn_t *iface, char *mode)
        const int n_env_entries = iface->n_options + 5;
        char **ppch;
 
-       if (environ != NULL) {
-               for (ppch = environ; *ppch; ppch++) {
+       if (__myenviron != NULL) {
+               for (ppch = __myenviron; *ppch; ppch++) {
                        free(*ppch);
                        *ppch = NULL;
                }
-               free(environ);
-               environ = NULL;
+               free(__myenviron);
+               __myenviron = NULL;
        }
-       environ = xmalloc(sizeof(char *) * (n_env_entries + 1 /* for final NULL */ ));
-       environend = environ;
+       __myenviron = xmalloc(sizeof(char *) * (n_env_entries + 1 /* for final NULL */ ));
+       environend = __myenviron;
        *environend = NULL;
 
        for (i = 0; i < iface->n_options; i++) {
@@ -1010,7 +1010,7 @@ static int doit(char *str)
                        case -1:                /* failure */
                                return 0;
                        case 0:         /* child */
-                               execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, NULL, environ);
+                               execle(DEFAULT_SHELL, DEFAULT_SHELL, "-c", str, NULL, __myenviron);
                                exit(127);
                }
                waitpid(child, &status, 0);