From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 23 Mar 2001 17:06:01 +0000 (-0000)
Subject: -Wshadow sh fix from Jeff Garzik
X-Git-Tag: 0_51~96
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=82ab8da24595fced332faf947cc63497216b09db;p=oweals%2Fbusybox.git

-Wshadow sh fix from Jeff Garzik
---

diff --git a/lash.c b/lash.c
index 5a59c018a..e33fd369c 100644
--- a/lash.c
+++ b/lash.c
@@ -1560,9 +1560,9 @@ static int pseudo_exec(struct child_prog *child)
 #endif
 
 	{
-	    char** argv=child->argv;
+	    char** argv_l=child->argv;
 	    int argc_l;
-	    for(argc_l=0;*argv!=NULL; argv++, argc_l++);
+	    for(argc_l=0;*argv_l!=NULL; argv_l++, argc_l++);
 	    optind = 1;
 	    run_applet_by_name(name, argc_l, child->argv);
 	}
diff --git a/sh.c b/sh.c
index 5a59c018a..e33fd369c 100644
--- a/sh.c
+++ b/sh.c
@@ -1560,9 +1560,9 @@ static int pseudo_exec(struct child_prog *child)
 #endif
 
 	{
-	    char** argv=child->argv;
+	    char** argv_l=child->argv;
 	    int argc_l;
-	    for(argc_l=0;*argv!=NULL; argv++, argc_l++);
+	    for(argc_l=0;*argv_l!=NULL; argv_l++, argc_l++);
 	    optind = 1;
 	    run_applet_by_name(name, argc_l, child->argv);
 	}
diff --git a/shell/lash.c b/shell/lash.c
index 5a59c018a..e33fd369c 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -1560,9 +1560,9 @@ static int pseudo_exec(struct child_prog *child)
 #endif
 
 	{
-	    char** argv=child->argv;
+	    char** argv_l=child->argv;
 	    int argc_l;
-	    for(argc_l=0;*argv!=NULL; argv++, argc_l++);
+	    for(argc_l=0;*argv_l!=NULL; argv_l++, argc_l++);
 	    optind = 1;
 	    run_applet_by_name(name, argc_l, child->argv);
 	}