-Wshadow sh fix from Jeff Garzik

diff --git a/lash.c b/lash.c
index 5a59c018afc595f94cdb46355fa5f94a23790cf3..e33fd369c189d0ab8f9da7cf4615fac9b34d2a2f 100644 (file)
--- 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 5a59c018afc595f94cdb46355fa5f94a23790cf3..e33fd369c189d0ab8f9da7cf4615fac9b34d2a2f 100644 (file)
--- 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 5a59c018afc595f94cdb46355fa5f94a23790cf3..e33fd369c189d0ab8f9da7cf4615fac9b34d2a2f 100644 (file)
--- 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);
        }