Author: jilles
Date: Fri May 6 12:49:32 2011
New Revision: 221522
URL: http://svn.freebsd.org/changeset/base/221522
Log:
MFC r220903: sh: Do not word split "${#parameter}".
This is only a problem if IFS contains digits, which is unusual but valid.
Because of an incorrect fix for PR bin/12137, "${#parameter}" was treated
as ${#parameter}. The underlying problem was that "${#parameter}"
erroneously added CTLESC bytes before determining the length. This
was properly fixed for PR bin/56147 but the incorrect fix was not backed
out.
Reported by: Seeker on forums.freebsd.org
Added:
stable/8/tools/regression/bin/sh/expansion/length6.0
- copied unchanged from r220903, head/tools/regression/bin/sh/expansion/length6.0
Modified:
stable/8/bin/sh/parser.c
Directory Properties:
stable/8/bin/sh/ (props changed)
stable/8/tools/regression/bin/sh/ (props changed)
Modified: stable/8/bin/sh/parser.c
==============================================================================
--- stable/8/bin/sh/parser.c Fri May 6 07:13:34 2011 (r221521)
+++ stable/8/bin/sh/parser.c Fri May 6 12:49:32 2011 (r221522)
@@ -1289,7 +1289,7 @@ parsesub: {
pungetc();
}
STPUTC('=', out);
- if (subtype != VSLENGTH && (dblquote || arinest))
+ if (dblquote || arinest)
flags |= VSQUOTE;
*(stackblock() + typeloc) = subtype | flags;
if (subtype != VSNORMAL)
Copied: stable/8/tools/regression/bin/sh/expansion/length6.0 (from r220903, head/tools/regression/bin/sh/expansion/length6.0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/8/tools/regression/bin/sh/expansion/length6.0 Fri May 6 12:49:32 2011 (r221522, copy of r220903, head/tools/regression/bin/sh/expansion/length6.0)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+x='!@#$%^&*()[]'
+[ ${#x} = 12 ] || echo bad 1
+[ "${#x}" = 12 ] || echo bad 2
+IFS=2
+[ ${#x} = 1 ] || echo bad 3
+[ "${#x}" = 12 ] || echo bad 4