sh: Initialize OPTIND=1 even if it came from the environment.

2013-12-24 22:38:24 +00:00 · 2013-12-24 22:38:24 +00:00 · 7e81d0c8c3
commit 7e81d0c8c3
parent 0c695afb96
3 changed files with 5 additions and 0 deletions
--- a/bin/sh/tests/parameters/Makefile
+++ b/bin/sh/tests/parameters/Makefile
@ -10,6 +10,7 @@ FILES+=		exitstatus1.0
 FILES+=		mail1.0
 FILES+=		mail2.0
 FILES+=		optind1.0
+FILES+=		optind2.0
 FILES+=		positional1.0
 FILES+=		positional2.0
 FILES+=		pwd1.0
--- a/bin/sh/tests/parameters/optind2.0
+++ b/bin/sh/tests/parameters/optind2.0
@ -0,0 +1,3 @@
+# $FreeBSD$
+
+[ "$(OPTIND=42 ${SH} -c 'printf %s "$OPTIND"')" = 1 ]
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@ -188,6 +188,7 @@ initvar(void)
 			setvareq(*envp, VEXPORT|VTEXTFIXED);
 		}
 	}
+	setvareq("OPTIND=1", VTEXTFIXED);
 }

 /*