From owner-svn-src-all@FreeBSD.ORG  Tue Dec 24 22:38:25 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AE73D61E;
 Tue, 24 Dec 2013 22:38:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 997EE1626;
 Tue, 24 Dec 2013 22:38:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOMcP0Z006759;
 Tue, 24 Dec 2013 22:38:25 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOMcP2S006756;
 Tue, 24 Dec 2013 22:38:25 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201312242238.rBOMcP2S006756@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Tue, 24 Dec 2013 22:38:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259846 - in head/bin/sh: . tests/parameters
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Dec 2013 22:38:25 -0000

Author: jilles
Date: Tue Dec 24 22:38:24 2013
New Revision: 259846
URL: http://svnweb.freebsd.org/changeset/base/259846

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

Added:
  head/bin/sh/tests/parameters/optind2.0   (contents, props changed)
Modified:
  head/bin/sh/tests/parameters/Makefile
  head/bin/sh/var.c

Modified: head/bin/sh/tests/parameters/Makefile
==============================================================================
--- head/bin/sh/tests/parameters/Makefile	Tue Dec 24 22:24:17 2013	(r259845)
+++ head/bin/sh/tests/parameters/Makefile	Tue Dec 24 22:38:24 2013	(r259846)
@@ -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

Added: head/bin/sh/tests/parameters/optind2.0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/bin/sh/tests/parameters/optind2.0	Tue Dec 24 22:38:24 2013	(r259846)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+[ "$(OPTIND=42 ${SH} -c 'printf %s "$OPTIND"')" = 1 ]

Modified: head/bin/sh/var.c
==============================================================================
--- head/bin/sh/var.c	Tue Dec 24 22:24:17 2013	(r259845)
+++ head/bin/sh/var.c	Tue Dec 24 22:38:24 2013	(r259846)
@@ -188,6 +188,7 @@ initvar(void)
 			setvareq(*envp, VEXPORT|VTEXTFIXED);
 		}
 	}
+	setvareq("OPTIND=1", VTEXTFIXED);
 }
 
 /*