Author: jilles
Date: Wed Apr 20 22:24:54 2011
New Revision: 220903
URL: http://svn.freebsd.org/changeset/base/220903
Log:
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
MFC after: 2 weeks
Added:
head/tools/regression/bin/sh/expansion/length6.0 (contents, props changed)
Modified:
head/bin/sh/parser.c
Modified: head/bin/sh/parser.c
==============================================================================
--- head/bin/sh/parser.c Wed Apr 20 22:10:44 2011 (r220902)
+++ head/bin/sh/parser.c Wed Apr 20 22:24:54 2011 (r220903)
@@ -1572,8 +1572,8 @@ varname:
pungetc();
}
STPUTC('=', out);
- if (subtype != VSLENGTH && (state[level].syntax == DQSYNTAX ||
- state[level].syntax == ARISYNTAX))
+ if (state[level].syntax == DQSYNTAX ||
+ state[level].syntax == ARISYNTAX)
flags |= VSQUOTE;
*(stackblock() + typeloc) = subtype | flags;
if (subtype != VSNORMAL) {
Added: head/tools/regression/bin/sh/expansion/length6.0
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/bin/sh/expansion/length6.0 Wed Apr 20 22:24:54
2011 (r220903)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
