svn commit: r208397 - in stable/8: tools/regression/usr.bin/sed usr.bin/sed

[Marius Strobl]

Author: marius
Date: Fri May 21 19:21:47 2010
New Revision: 208397
URL: http://svn.freebsd.org/changeset/base/208397

Log:
  MFC: r197356
  
  Allow [ to be used as a delimiter.
  
  Pointed by:	Marius Strobl
  Obtained from:	Apple

Modified:
  stable/8/tools/regression/usr.bin/sed/multitest.t
  stable/8/usr.bin/sed/compile.c
Directory Properties:
  stable/8/tools/regression/usr.bin/sed/   (props changed)
  stable/8/tools/regression/usr.bin/sed/regress.multitest.out/   (props changed)
  stable/8/usr.bin/sed/   (props changed)

Modified: stable/8/tools/regression/usr.bin/sed/multitest.t
==============================================================================
--- stable/8/tools/regression/usr.bin/sed/multitest.t	Fri May 21 19:17:31 2010	(r208396)
+++ stable/8/tools/regression/usr.bin/sed/multitest.t	Fri May 21 19:21:47 2010	(r208397)
@@ -432,6 +432,15 @@ u2/g' lines1
 	# POSIX does not say that this should work,
 	# but it does for GNU, BSD, and SunOS
 	mark '8.17' ; $SED -e 's/[/]/Q/' lines1
+
+	COMMENT='[ as an s delimiter and its escapes'
+	mark '8.18' ; $SED -e 's[_[X[' lines1
+	# This is a matter of interpretation
+	# POSIX 1003.1, 2004 says "Within the BRE and the replacement,
+	# the BRE delimiter itself can be used as a *literal* character
+	# if it is preceded by a backslash
+	mark '8.19' ; sed 's/l/[/' lines1 | $SED -e 's[\[.[X['
+	mark '8.20' ; sed 's/l/[/' lines1 | $SED -e 's[\[.[X\[['
 }
 
 test_error()

Modified: stable/8/usr.bin/sed/compile.c
==============================================================================
--- stable/8/usr.bin/sed/compile.c	Fri May 21 19:17:31 2010	(r208396)
+++ stable/8/usr.bin/sed/compile.c	Fri May 21 19:21:47 2010	(r208397)
@@ -387,7 +387,7 @@ compile_delimited(char *p, char *d)
 		errx(1, "%lu: %s: newline can not be used as a string delimiter",
 				linenum, fname);
 	while (*p) {
-		if (*p == '[') {
+		if (*p == '[' && *p != c) {
 			if ((d = compile_ccl(&p, d)) == NULL)
 				errx(1, "%lu: %s: unbalanced brackets ([])", linenum, fname);
 			continue;