From owner-svn-src-head@FreeBSD.ORG  Wed May  4 21:49:35 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2E39E106564A;
	Wed,  4 May 2011 21:49:35 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1AAB18FC0A;
	Wed,  4 May 2011 21:49:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p44LnZgu068627;
	Wed, 4 May 2011 21:49:35 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p44LnYr1068623;
	Wed, 4 May 2011 21:49:34 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201105042149.p44LnYr1068623@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Wed, 4 May 2011 21:49:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221461 - in head: bin/sh tools/regression/bin/sh/errors
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2011 21:49:35 -0000

Author: jilles
Date: Wed May  4 21:49:34 2011
New Revision: 221461
URL: http://svn.freebsd.org/changeset/base/221461

Log:
  sh: Detect an error for ${#var<GARBAGE>}.
  
  In particular, this makes things like ${#foo[0]} and ${#foo[@]} errors
  rather than silent equivalents of ${#foo}.
  
  PR:		bin/151720
  Submitted by:	Mark Johnston
  Exp-run done by: pav (with some other sh(1) changes)

Added:
  head/tools/regression/bin/sh/errors/bad-parm-exp6.2   (contents, props changed)
  head/tools/regression/bin/sh/errors/bad-parm-exp6.2.stderr   (contents, props changed)
Modified:
  head/bin/sh/parser.c

Modified: head/bin/sh/parser.c
==============================================================================
--- head/bin/sh/parser.c	Wed May  4 21:27:05 2011	(r221460)
+++ head/bin/sh/parser.c	Wed May  4 21:49:34 2011	(r221461)
@@ -1569,6 +1569,8 @@ varname:
 				}
 			}
 		} else if (subtype != VSERROR) {
+			if (subtype == VSLENGTH && c != '}')
+				subtype = VSERROR;
 			pungetc();
 		}
 		STPUTC('=', out);

Added: head/tools/regression/bin/sh/errors/bad-parm-exp6.2
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/regression/bin/sh/errors/bad-parm-exp6.2	Wed May  4 21:49:34 2011	(r221461)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+${#foo^}

Added: head/tools/regression/bin/sh/errors/bad-parm-exp6.2.stderr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/regression/bin/sh/errors/bad-parm-exp6.2.stderr	Wed May  4 21:49:34 2011	(r221461)
@@ -0,0 +1 @@
+./errors/bad-parm-exp6.2: ${foo...}: Bad substitution