From owner-svn-src-all@freebsd.org  Fri Jan 22 20:10:10 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 91FE4A8D285;
 Fri, 22 Jan 2016 20:10:10 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6008D12F0;
 Fri, 22 Jan 2016 20:10:10 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MKA9xO005740;
 Fri, 22 Jan 2016 20:10:09 GMT (envelope-from jilles@FreeBSD.org)
Received: (from jilles@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MKA9NN005737;
 Fri, 22 Jan 2016 20:10:09 GMT (envelope-from jilles@FreeBSD.org)
Message-Id: <201601222010.u0MKA9NN005737@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jilles set sender to
 jilles@FreeBSD.org using -f
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Fri, 22 Jan 2016 20:10:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294593 - in head/bin/sh: . tests/builtins
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.20
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jan 2016 20:10:10 -0000

Author: jilles
Date: Fri Jan 22 20:10:08 2016
New Revision: 294593
URL: https://svnweb.freebsd.org/changeset/base/294593

Log:
  sh: Clean a readonly local, even if the variable does not exist outside.
  
  If a local variable has been made read-only, this should not prevent its
  removal when the function returns.

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

Modified: head/bin/sh/tests/builtins/Makefile
==============================================================================
--- head/bin/sh/tests/builtins/Makefile	Fri Jan 22 19:43:26 2016	(r294592)
+++ head/bin/sh/tests/builtins/Makefile	Fri Jan 22 20:10:08 2016	(r294593)
@@ -113,6 +113,7 @@ FILES+=		local3.0
 FILES+=		local4.0
 FILES+=		local5.0
 FILES+=		local6.0
+FILES+=		local7.0
 .if ${MK_NLS} != "no"
 FILES+=		locale1.0
 .endif

Added: head/bin/sh/tests/builtins/local7.0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/bin/sh/tests/builtins/local7.0	Fri Jan 22 20:10:08 2016	(r294593)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+f() {
+	local x
+	readonly x=2
+}
+unset x
+f
+x=4
+[ "$x" = 4 ]

Modified: head/bin/sh/var.c
==============================================================================
--- head/bin/sh/var.c	Fri Jan 22 19:43:26 2016	(r294592)
+++ head/bin/sh/var.c	Fri Jan 22 20:10:08 2016	(r294593)
@@ -802,6 +802,7 @@ poplocalvars(void)
 			ckfree(lvp->text);
 			optschanged();
 		} else if ((lvp->flags & (VUNSET|VSTRFIXED)) == VUNSET) {
+			vp->flags &= ~VREADONLY;
 			(void)unsetvar(vp->text);
 		} else {
 			islocalevar = (vp->flags | lvp->flags) & VEXPORT &&