136 files changed, 590 insertions, 16 deletions
diff --git a/tools/regression/acltools/00.t b/tools/regression/acltools/00.t
index c76b39e..1f91de3 100644
--- a/tools/regression/acltools/00.t
+++ b/tools/regression/acltools/00.t
@@ -27,7 +27,7 @@
 # $FreeBSD$
 #
 
-# This is a wrapper script to run tools-posix.test.
+# This is a wrapper script to run tools-posix.test on UFS filesystem.
 #
 # If any of the tests fails, here is how to debug it: go to
 # the directory with problematic filesystem mounted on it,
diff --git a/tools/regression/acltools/03.t b/tools/regression/acltools/03.t
new file mode 100644
index 0000000..8e56af5
--- /dev/null
+++ b/tools/regression/acltools/03.t
@@ -0,0 +1,110 @@
+#!/bin/sh
+#
+# Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+# This is a wrapper script to run tools-crossfs.test between UFS without
+# ACLs, UFS with POSIX.1e ACLs, and ZFS with NFSv4 ACLs.
+#
+# WARNING: It uses hardcoded ZFS pool name "acltools"
+#
+# Output should be obvious.
+
+echo "1..5"
+
+if [ `whoami` != "root" ]; then
+	echo "not ok 1 - you need to be root to run this test."
+	exit 1
+fi
+
+TESTDIR=`dirname $0`
+MNTROOT=`mktemp -dt acltools`
+
+# Set up the test filesystems.
+MD1=`mdconfig -at swap -s 64m`
+MNT1=$MNTROOT/nfs4
+mkdir $MNT1
+zpool create -R $MNT1 acltools /dev/$MD1
+if [ $? -ne 0 ]; then
+	echo "not ok 1 - 'zpool create' failed."
+	exit 1
+fi
+
+echo "ok 1"
+
+MD2=`mdconfig -at swap -s 10m`
+MNT2=$MNTROOT/posix
+mkdir $MNT2
+newfs /dev/$MD2 > /dev/null
+mount -o acls /dev/$MD2 $MNT2
+if [ $? -ne 0 ]; then
+	echo "not ok 2 - mount failed."
+	exit 1
+fi
+
+echo "ok 2"
+
+MD3=`mdconfig -at swap -s 10m`
+MNT3=$MNTROOT/none
+mkdir $MNT3
+newfs /dev/$MD3 > /dev/null
+mount /dev/$MD3 $MNT3
+if [ $? -ne 0 ]; then
+	echo "not ok 3 - mount failed."
+	exit 1
+fi
+
+echo "ok 3"
+
+cd $MNTROOT
+
+perl $TESTDIR/run $TESTDIR/tools-crossfs.test > /dev/null
+
+if [ $? -eq 0 ]; then
+	echo "ok 4"
+else
+	echo "not ok 4"
+fi
+
+cd /
+
+umount -f $MNT3
+rmdir $MNT3
+mdconfig -du $MD3
+
+umount -f $MNT2
+rmdir $MNT2
+mdconfig -du $MD2
+
+zpool destroy -f acltools
+rmdir $MNT1
+mdconfig -du $MD1
+
+rmdir $MNTROOT
+
+echo "ok 5"
+
diff --git a/tools/regression/acltools/aclfuzzer.sh b/tools/regression/acltools/aclfuzzer.sh
new file mode 100755
index 0000000..dff07d8
--- /dev/null
+++ b/tools/regression/acltools/aclfuzzer.sh
@@ -0,0 +1,225 @@
+#!/bin/sh
+#
+# Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+# This is an NFSv4 ACL fuzzer.  It expects to be run by non-root in a scratch
+# directory on a filesystem with NFSv4 ACLs support.  Output it generates
+# is expected to be fed to /usr/src/tools/regression/acltools/run script.
+
+NUMBER_OF_COMMANDS=300
+
+run_command()
+{
+	echo "\$ $1"
+	eval $1 2>&1 | sed 's/^/> /'
+}
+
+rnd_from_0_to()
+{
+	max=`expr $1 + 1`
+	rnd=`jot -r 1`
+	rnd=`expr $rnd % $max`
+
+	echo $rnd
+}
+
+rnd_path()
+{
+	rnd=`rnd_from_0_to 3`
+	case $rnd in
+		0) echo "$TMP/aaa" ;;
+		1) echo "$TMP/bbb" ;;
+		2) echo "$TMP/aaa/ccc" ;;
+		3) echo "$TMP/bbb/ddd" ;;
+	esac
+}
+
+f_prepend_random_acl_on()
+{
+	rnd=`rnd_from_0_to 4`
+	case $rnd in
+		0) u="owner@" ;;
+		1) u="group@" ;;
+		2) u="everyone@" ;;
+		3) u="u:1138" ;;
+		4) u="g:1138" ;;
+	esac
+
+	p=""
+	while :; do
+		rnd=`rnd_from_0_to 30`
+		if [ -n "$p" -a $rnd -ge 14 ]; then
+			break;
+		fi
+
+		case $rnd in
+			0) p="${p}r" ;;
+			1) p="${p}w" ;;
+			2) p="${p}x" ;;
+			3) p="${p}p" ;;
+			4) p="${p}d" ;;
+			5) p="${p}D" ;;
+			6) p="${p}a" ;;
+			7) p="${p}A" ;;
+			8) p="${p}R" ;;
+			9) p="${p}W" ;;
+			10) p="${p}R" ;;
+			11) p="${p}c" ;;
+			12) p="${p}C" ;;
+			13) p="${p}o" ;;
+			14) p="${p}s" ;;
+		esac
+	done
+
+	f=""
+	while :; do
+		rnd=`rnd_from_0_to 10`
+		if [ $rnd -ge 6 ]; then
+			break;
+		fi
+
+		case $rnd in
+			0) f="${f}f" ;;
+			1) f="${f}d" ;;
+			2) f="${f}n" ;;
+			3) f="${f}i" ;;
+		esac
+	done
+
+	rnd=`rnd_from_0_to 1`
+	case $rnd in
+		0) x="allow" ;;
+		1) x="deny" ;;
+	esac
+
+	acl="$u:$p:$f:$x"
+
+	file=`rnd_path`
+	run_command "setfacl -a0 $acl $file"
+}
+
+f_getfacl()
+{
+	file=`rnd_path`
+	run_command "getfacl -qn $file"
+}
+
+f_ls_mode()
+{
+	file=`rnd_path`
+	run_command "ls -al $file | sed -n '2p' | cut -d' ' -f1"
+}
+
+f_chmod()
+{
+	b1=`rnd_from_0_to 7`
+	b2=`rnd_from_0_to 7`
+	b3=`rnd_from_0_to 7`
+	b4=`rnd_from_0_to 7`
+	file=`rnd_path`
+
+	run_command "chmod $b1$b2$b3$b4 $file $2"
+}
+
+f_touch()
+{
+	file=`rnd_path`
+	run_command "touch $file"
+}
+
+f_rm()
+{
+	file=`rnd_path`
+	run_command "rm -f $file"
+}
+
+f_mkdir()
+{
+	file=`rnd_path`
+	run_command "mkdir $file"
+}
+
+f_rmdir()
+{
+	file=`rnd_path`
+	run_command "rmdir $file"
+}
+
+f_mv()
+{
+	from=`rnd_path`
+	to=`rnd_path`
+	run_command "mv -f $from $to"
+}
+
+# XXX: To be implemented: chown(8), setting times with touch(1).
+
+switch_to_random_user()
+{
+	# XXX: To be implemented.
+}
+
+execute_random_command()
+{
+	rnd=`rnd_from_0_to 20`
+
+	case $rnd in
+		0|10|11|12|13|15) cmd=f_prepend_random_acl_on ;;
+		1) cmd=f_getfacl ;;
+		2) cmd=f_ls_mode ;;
+		3) cmd=f_chmod ;;
+		4|18|19) cmd=f_touch ;;
+		5) cmd=f_rm ;;
+		6|16|17) cmd=f_mkdir ;;
+		7) cmd=f_rmdir ;;
+		8) cmd=f_mv ;;
+	esac
+
+	$cmd "XXX"
+}
+
+echo "# Fuzzing; will stop after $NUMBER_OF_COMMANDS commands."
+TMP="aclfuzzer_`dd if=/dev/random bs=1k count=1 2>/dev/null | openssl md5`"
+
+run_command "whoami"
+umask 022
+run_command "umask 022"
+run_command "mkdir $TMP"
+
+i=0;
+while [ "$i" -lt "$NUMBER_OF_COMMANDS" ]; do
+	switch_to_random_user
+	execute_random_command
+	i=`expr $i + 1`
+done
+
+run_command "find $TMP -exec setfacl -a0 everyone@:rxd:allow {} \;"
+run_command "rm -rfv $TMP"
+
+echo "# Fuzzed, thank you."
+
diff --git a/tools/regression/acltools/tools-crossfs.test b/tools/regression/acltools/tools-crossfs.test
new file mode 100644
index 0000000..f6c5ed4
--- /dev/null
+++ b/tools/regression/acltools/tools-crossfs.test
@@ -0,0 +1,178 @@
+# Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+# This is a tools-level test intended to verify that cp(1) and mv(1)
+# do the right thing with respect to ACLs.  Run it as root using
+# ACL-enabled kernel:
+#
+# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-nfs4.test
+#
+# You need to have three subdirectories, named nfs4, posix and none,
+# with filesystems with NFSv4 ACLs, POSIX.1e ACLs and no ACLs enabled,
+# respectively, mounted on them, in your current directory.
+#
+# WARNING: Creates files in unsafe way.
+
+$ whoami
+> root
+$ umask 022
+
+$ touch nfs4/xxx
+$ getfacl -nq nfs4/xxx
+>             owner@:--x-----------:------:deny
+>             owner@:rw-p---A-W-Co-:------:allow
+>             group@:-wxp----------:------:deny
+>             group@:r-------------:------:allow
+>          everyone@:-wxp---A-W-Co-:------:deny
+>          everyone@:r-----a-R-c--s:------:allow
+
+$ touch posix/xxx
+$ getfacl -nq posix/xxx
+> user::rw-
+> group::r--
+> other::r--
+
+$ rm posix/xxx
+
+# mv without any ACLs.
+$ chmod 456 nfs4/xxx
+$ mv nfs4/xxx posix/
+$ ls -l posix/xxx | cut -d' ' -f1
+> -r--r-xrw-
+
+# mv with POSIX.1e ACLs.
+$ setfacl -m u:42:x,g:43:w posix/xxx
+$ rm -f posix/yyy
+$ mv posix/xxx posix/yyy
+$ getfacl -nq posix/yyy
+> user::r--
+> user:42:--x
+> group::r-x
+> group:43:-w-
+> mask::rwx
+> other::rw-
+
+# mv from POSIX.1e to NFSv4.
+$ rm -f nfs4/xxx
+$ mv posix/yyy nfs4/xxx
+> mv: failed to set acl entries for nfs4/xxx: Invalid argument
+$ getfacl -nq nfs4/xxx
+>             owner@:-wxp----------:------:deny
+>             owner@:r------A-W-Co-:------:allow
+>             group@:--------------:------:deny
+>             group@:rwxp----------:------:allow
+>          everyone@:--x----A-W-Co-:------:deny
+>          everyone@:rw-p--a-R-c--s:------:allow
+
+# mv with NFSv4 ACLs.
+$ setfacl -a0 u:42:x:allow,g:43:w:allow nfs4/xxx
+$ rm -f nfs4/yyy
+$ mv nfs4/xxx nfs4/yyy
+$ getfacl -nq nfs4/yyy
+>            user:42:--x-----------:------:allow
+>           group:43:-w------------:------:allow
+>             owner@:-wxp----------:------:deny
+>             owner@:r------A-W-Co-:------:allow
+>             group@:--------------:------:deny
+>             group@:rwxp----------:------:allow
+>          everyone@:--x----A-W-Co-:------:deny
+>          everyone@:rw-p--a-R-c--s:------:allow
+
+# mv from NFSv4 to POSIX.1e.
+$ rm -f posix/xxx
+$ mv nfs4/yyy posix/xxx
+> mv: failed to set acl entries for posix/xxx: Invalid argument
+$ ls -l posix/xxx | cut -d' ' -f1
+> -r--rwxrw-
+
+# mv from POSIX.1e to none.
+$ setfacl -m u:42:x,g:43:w posix/xxx
+$ mv posix/xxx none/xxx
+> mv: failed to set acl entries for none/xxx: Operation not supported
+$ ls -l none/xxx | cut -d' ' -f1
+> -r--rwxrw-
+
+# cp with POSIX.1e ACLs.
+$ rm -f posix/xxx
+$ touch posix/xxx
+$ setfacl -m u:42:x,g:43:w posix/xxx
+$ getfacl -nq posix/xxx
+> user::rw-
+> user:42:--x
+> group::r--
+> group:43:-w-
+> mask::rwx
+> other::r--
+
+$ rm -f posix/yyy
+$ cp posix/xxx posix/yyy
+$ getfacl -nq posix/yyy
+> user::rw-
+> group::r-x
+> other::r--
+
+$ rm -f posix/yyy
+$ cp -p posix/xxx posix/yyy
+$ getfacl -nq posix/yyy
+> user::rw-
+> user:42:--x
+> group::r--
+> group:43:-w-
+> mask::rwx
+> other::r--
+
+# mv from POSIX.1e to NFSv4.
+$ rm -f nfs4/xxx
+$ cp -p posix/xxx nfs4/xxx
+> cp: failed to set acl entries for nfs4/xxx: Invalid argument
+$ ls -l nfs4/xxx | cut -d' ' -f1
+> -rw-rwxr--
+
+# cp with NFSv4 ACLs.
+$ setfacl -a0 u:42:x:allow,g:43:w:allow nfs4/xxx
+$ rm -f nfs4/yyy
+$ cp -p nfs4/xxx nfs4/yyy
+$ getfacl -nq nfs4/yyy
+>            user:42:--x-----------:------:allow
+>           group:43:-w------------:------:allow
+>             owner@:--x-----------:------:deny
+>             owner@:rw-p---A-W-Co-:------:allow
+>             group@:--------------:------:deny
+>             group@:rwxp----------:------:allow
+>          everyone@:-wxp---A-W-Co-:------:deny
+>          everyone@:r-----a-R-c--s:------:allow
+
+# cp from NFSv4 to POSIX.1e.
+$ rm -f posix/xxx
+$ cp -p nfs4/xxx posix/xxx
+> cp: failed to set acl entries for posix/xxx: Invalid argument
+$ ls -l posix/xxx | cut -d' ' -f1
+> -rw-rwxr--
+
+$ cp -p nfs4/yyy none/xxx
+> cp: failed to set acl entries for none/xxx: Operation not supported
+
diff --git a/tools/regression/sockets/accf_data_attach/accf_data_attach.c b/tools/regression/sockets/accf_data_attach/accf_data_attach.c
index 697d83a..369481e 100644
--- a/tools/regression/sockets/accf_data_attach/accf_data_attach.c
+++ b/tools/regression/sockets/accf_data_attach/accf_data_attach.c
@@ -169,9 +169,6 @@ main(int argc, char *argv[])
 	if (ret != 0)
 		errx(-1, "not ok 9 - setsockopt() after listen() failed with %d "
 		    "(%s)", errno, strerror(errno));
-	if (len != sizeof(afa))
-		errx(-1, "not ok 9 - setsockopt() after listen() returned wrong "
-		    "size (%d vs expected %d)", len, sizeof(afa));
 	printf("ok 9 - setsockopt\n");
 
 	/*
@@ -186,7 +183,7 @@ main(int argc, char *argv[])
 		    "failed with %d (%s)", errno, strerror(errno));
 	if (len != sizeof(afa))
 		errx(-1, "not ok 10 - getsockopt() after setsockopet()  after "
-		    "listen() returned wrong size (got %d expected %d)", len,
+		    "listen() returned wrong size (got %d expected %zd)", len,
 		    sizeof(afa));
 	if (strcmp(afa.af_name, ACCF_NAME) != 0)
 		errx(-1, "not ok 10 - getsockopt() after setsockopt() after "
diff --git a/tools/regression/usr.bin/sed/multitest.t b/tools/regression/usr.bin/sed/multitest.t
index f3a42e2..67dcded 100644
--- a/tools/regression/usr.bin/sed/multitest.t
+++ b/tools/regression/usr.bin/sed/multitest.t
@@ -37,11 +37,9 @@
 #
 # The directory regress.test.out contains the expected test results
 #
-# These are the regression tests created during the development of the
-# BSD sed.  The reference file naming scheme used in this script can't
-# handle gracefully the insertion of new tests between existing ones.
-# Therefore, either use the new m4-based regress.t framework, or add
-# tests after the last existing test.
+# These are the regression tests mostly created during the development
+# of the BSD sed.  Each test should have a unique mark name, which is
+# used for naming the corresponding file in regress.multitest.out.
 
 main()
 {
@@ -88,11 +86,11 @@ result()
 	else
 		TODO=''
 	fi
-	if ! [ -r $REGRESS/${MARK}_${TESTNAME} ] ; then
-		echo "Seeding $REGRESS/${MARK}_${TESTNAME} with current result" 1>&2
-		cp current.out $REGRESS/${MARK}_${TESTNAME}
+	if ! [ -r $REGRESS/${TESTNAME} ] ; then
+		echo "Seeding $REGRESS/${TESTNAME} with current result" 1>&2
+		cp current.out $REGRESS/${TESTNAME}
 	fi
-	if diff -c $REGRESS/${MARK}_${TESTNAME} current.out ; then
+	if diff -c $REGRESS/${TESTNAME} current.out ; then
 		echo "ok $MARK $TESTNAME # $TODO$COMMENT"
 	else
 		echo "not ok $MARK $TESTNAME # $TODO$COMMENT"
@@ -434,6 +432,26 @@ 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"
+	# SunOS 5.1 /usr/bin/sed and Mac OS X follow the literal POSIX
+	# interpretation.
+	# GNU sed version 4.1.5 treats \[ as the beginning of a character
+	# set specification (both with --posix and without).
+	mark '8.19' ; sed 's/l/[/' lines1 | $SED -e 's[\[.[X['
+	mark '8.20' ; sed 's/l/[/' lines1 | $SED -e 's[\[.[X\[['
+	COMMENT='\ in y command'
+	mark '8.21'
+	echo 'a\b(c' |
+	$SED 'y%ABCDEFGHIJKLMNOPQRSTUVWXYZ, /\\()"%abcdefghijklmnopqrstuvwxyz,------%'
+	COMMENT='\n in a character class and a BRE'
+	mark '8.22' ; (echo 1; echo 2) | $SED -n '1{;N;s/[\n]/X/;p;}'
+	mark '8.23' ; (echo 1; echo 2) | $SED -n '1{;N;s/\n/X/;p;}'
 }
 
 test_error()
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1_1.1 b/tools/regression/usr.bin/sed/regress.multitest.out/1.1
index 70fd43b..70fd43b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/1_1.1
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/10_1.9 b/tools/regression/usr.bin/sed/regress.multitest.out/1.10
index 44f4ec3..44f4ec3 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/10_1.9
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.10
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/12_1.11 b/tools/regression/usr.bin/sed/regress.multitest.out/1.11
index 7af945d..7af945d 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/12_1.11
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.11
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/13_1.12 b/tools/regression/usr.bin/sed/regress.multitest.out/1.12
index 7af945d..7af945d 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/13_1.12
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.12
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/14_1.13 b/tools/regression/usr.bin/sed/regress.multitest.out/1.13
index 90582c8..90582c8 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/14_1.13
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.13
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/15_1.14 b/tools/regression/usr.bin/sed/regress.multitest.out/1.14
index fd78274..fd78274 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/15_1.14
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.14
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/16_1.15 b/tools/regression/usr.bin/sed/regress.multitest.out/1.15
index 7b3700c..7b3700c 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/16_1.15
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.15
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/17_1.16 b/tools/regression/usr.bin/sed/regress.multitest.out/1.16
index 2bfa3fe..2bfa3fe 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/17_1.16
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.16
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/18_1.17 b/tools/regression/usr.bin/sed/regress.multitest.out/1.17
index 0833b55..0833b55 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/18_1.17
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.17
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/19_1.18 b/tools/regression/usr.bin/sed/regress.multitest.out/1.18
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/19_1.18
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.18
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2_1.2 b/tools/regression/usr.bin/sed/regress.multitest.out/1.2
index 7af945d..7af945d 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/2_1.2
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/3_1.3 b/tools/regression/usr.bin/sed/regress.multitest.out/1.3
index 70fd43b..70fd43b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/3_1.3
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/4_1.4 b/tools/regression/usr.bin/sed/regress.multitest.out/1.4
index 7af945d..7af945d 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/4_1.4
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/5_1.4.1 b/tools/regression/usr.bin/sed/regress.multitest.out/1.4.1
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/5_1.4.1
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.4.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/6_1.5 b/tools/regression/usr.bin/sed/regress.multitest.out/1.5
index dfd85f7..dfd85f7 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/6_1.5
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/7_1.6 b/tools/regression/usr.bin/sed/regress.multitest.out/1.6
index dfd85f7..dfd85f7 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/7_1.6
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8_1.7 b/tools/regression/usr.bin/sed/regress.multitest.out/1.7
index 70fd43b..70fd43b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/8_1.7
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9_1.8 b/tools/regression/usr.bin/sed/regress.multitest.out/1.8
index 70fd43b..70fd43b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/9_1.8
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/11_1.10 b/tools/regression/usr.bin/sed/regress.multitest.out/1.9
index 44f4ec3..44f4ec3 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/11_1.10
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/1.9
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/20_2.1 b/tools/regression/usr.bin/sed/regress.multitest.out/2.1
index a7c92f0..a7c92f0 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/20_2.1
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/28_2.9 b/tools/regression/usr.bin/sed/regress.multitest.out/2.10
index 8e6f085..8e6f085 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/28_2.9
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.10
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/29_2.10 b/tools/regression/usr.bin/sed/regress.multitest.out/2.11
index 8e6f085..8e6f085 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/29_2.10
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.11
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/31_2.12 b/tools/regression/usr.bin/sed/regress.multitest.out/2.12
index ddd4976..ddd4976 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/31_2.12
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.12
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/32_2.13 b/tools/regression/usr.bin/sed/regress.multitest.out/2.13
index d08d35c..d08d35c 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/32_2.13
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.13
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/33_2.14 b/tools/regression/usr.bin/sed/regress.multitest.out/2.14
index d08d35c..d08d35c 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/33_2.14
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.14
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/34_2.15 b/tools/regression/usr.bin/sed/regress.multitest.out/2.15
index 1f20a52..1f20a52 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/34_2.15
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.15
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/35_2.16 b/tools/regression/usr.bin/sed/regress.multitest.out/2.16
index 4d8dc1e..4d8dc1e 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/35_2.16
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.16
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/36_2.17 b/tools/regression/usr.bin/sed/regress.multitest.out/2.17
index df7978f..df7978f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/36_2.17
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.17
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/37_2.18 b/tools/regression/usr.bin/sed/regress.multitest.out/2.18
index c4d558b..c4d558b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/37_2.18
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.18
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/38_2.19 b/tools/regression/usr.bin/sed/regress.multitest.out/2.19
index 7fb81db..7fb81db 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/38_2.19
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.19
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/21_2.2 b/tools/regression/usr.bin/sed/regress.multitest.out/2.2
index fe925b0..fe925b0 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/21_2.2
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/30_2.11 b/tools/regression/usr.bin/sed/regress.multitest.out/2.20
index 8e6f085..8e6f085 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/30_2.11
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.20
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/40_2.21 b/tools/regression/usr.bin/sed/regress.multitest.out/2.21
index 1a9e066..1a9e066 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/40_2.21
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.21
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/41_2.22 b/tools/regression/usr.bin/sed/regress.multitest.out/2.22
index b182791..b182791 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/41_2.22
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.22
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/22_2.3 b/tools/regression/usr.bin/sed/regress.multitest.out/2.3
index 6165ce8..6165ce8 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/22_2.3
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/23_2.4 b/tools/regression/usr.bin/sed/regress.multitest.out/2.4
index 1502f00..1502f00 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/23_2.4
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/24_2.5 b/tools/regression/usr.bin/sed/regress.multitest.out/2.5
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/24_2.5
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/25_2.6 b/tools/regression/usr.bin/sed/regress.multitest.out/2.6
index 1502f00..1502f00 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/25_2.6
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/26_2.7 b/tools/regression/usr.bin/sed/regress.multitest.out/2.7
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/26_2.7
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/27_2.8 b/tools/regression/usr.bin/sed/regress.multitest.out/2.8
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/27_2.8
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/39_2.20 b/tools/regression/usr.bin/sed/regress.multitest.out/2.9
index 8e6f085..8e6f085 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/39_2.20
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/2.9
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/40_3.1 b/tools/regression/usr.bin/sed/regress.multitest.out/3.1
index f963b03..f963b03 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/40_3.1
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/3.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/41_3.2 b/tools/regression/usr.bin/sed/regress.multitest.out/3.2
index 488e94f..488e94f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/41_3.2
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/3.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/42_3.3 b/tools/regression/usr.bin/sed/regress.multitest.out/3.3
index 5b15dae..5b15dae 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/42_3.3
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/3.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/43_3.4 b/tools/regression/usr.bin/sed/regress.multitest.out/3.4
index 67f03ef..67f03ef 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/43_3.4
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/3.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/44_4.1 b/tools/regression/usr.bin/sed/regress.multitest.out/4.1
index 455093c..455093c 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/44_4.1
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/4.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/45_4.2 b/tools/regression/usr.bin/sed/regress.multitest.out/4.2
index 4161c1c..4161c1c 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/45_4.2
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/4.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/46_4.3 b/tools/regression/usr.bin/sed/regress.multitest.out/4.3
index ccfa194..ccfa194 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/46_4.3
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/4.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/47_4.4 b/tools/regression/usr.bin/sed/regress.multitest.out/4.4
index 94e9a6d..94e9a6d 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/47_4.4
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/4.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/48_4.5 b/tools/regression/usr.bin/sed/regress.multitest.out/4.5
index ce01362..ce01362 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/48_4.5
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/4.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/49_4.6 b/tools/regression/usr.bin/sed/regress.multitest.out/4.6
index ce01362..ce01362 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/49_4.6
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/4.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/50_4.7 b/tools/regression/usr.bin/sed/regress.multitest.out/4.7
index ce01362..ce01362 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/50_4.7
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/4.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/51_4.8 b/tools/regression/usr.bin/sed/regress.multitest.out/4.8
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/51_4.8
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/4.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/52_5.1 b/tools/regression/usr.bin/sed/regress.multitest.out/5.1
index ac9202e..ac9202e 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/52_5.1
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/5.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/53_5.2 b/tools/regression/usr.bin/sed/regress.multitest.out/5.2
index ec339f4..ec339f4 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/53_5.2
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/5.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3 b/tools/regression/usr.bin/sed/regress.multitest.out/5.3
index e1ddb54..e1ddb54 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/5.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/55_5.4 b/tools/regression/usr.bin/sed/regress.multitest.out/5.4
index a9ec85b..a9ec85b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/55_5.4
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/5.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/56_5.5 b/tools/regression/usr.bin/sed/regress.multitest.out/5.5
index 6766fea..6766fea 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/56_5.5
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/5.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/57_5.6 b/tools/regression/usr.bin/sed/regress.multitest.out/5.6
index 7ffbba3..7ffbba3 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/57_5.6
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/5.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/58_5.7 b/tools/regression/usr.bin/sed/regress.multitest.out/5.7
index f15f6e3..f15f6e3 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/58_5.7
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/5.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/59_5.8 b/tools/regression/usr.bin/sed/regress.multitest.out/5.8
index 1557318..1557318 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/59_5.8
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/5.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/60_6.1 b/tools/regression/usr.bin/sed/regress.multitest.out/6.1
index 78db2a5..78db2a5 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/60_6.1
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/6.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/61_6.2 b/tools/regression/usr.bin/sed/regress.multitest.out/6.2
index 77e5cc0..77e5cc0 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/61_6.2
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/6.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/62_6.3 b/tools/regression/usr.bin/sed/regress.multitest.out/6.3
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/62_6.3
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/6.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/63_6.4 b/tools/regression/usr.bin/sed/regress.multitest.out/6.4
index e9169dc..e9169dc 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/63_6.4
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/6.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/64_6.5 b/tools/regression/usr.bin/sed/regress.multitest.out/6.5
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/64_6.5
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/6.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/65_6.6 b/tools/regression/usr.bin/sed/regress.multitest.out/6.6
index e69de29..e69de29 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/65_6.6
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/6.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/66_7.1 b/tools/regression/usr.bin/sed/regress.multitest.out/7.1
index 586cac7..586cac7 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/66_7.1
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/7.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/67_7.2 b/tools/regression/usr.bin/sed/regress.multitest.out/7.2
index cb8d266..cb8d266 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/67_7.2
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/7.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/68_7.3 b/tools/regression/usr.bin/sed/regress.multitest.out/7.3
index c742250..c742250 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/68_7.3
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/7.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/69_7.4 b/tools/regression/usr.bin/sed/regress.multitest.out/7.4
index 19a9461..19a9461 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/69_7.4
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/7.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/70_7.5 b/tools/regression/usr.bin/sed/regress.multitest.out/7.5
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/70_7.5
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/7.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/71_7.6 b/tools/regression/usr.bin/sed/regress.multitest.out/7.6
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/71_7.6
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/7.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/72_7.7 b/tools/regression/usr.bin/sed/regress.multitest.out/7.7
index 7baa931..7baa931 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/72_7.7
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/7.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/73_7.8 b/tools/regression/usr.bin/sed/regress.multitest.out/7.8
index 8b13789..8b13789 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/73_7.8
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/7.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/74_8.1 b/tools/regression/usr.bin/sed/regress.multitest.out/8.1
index dcf124b..dcf124b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/74_8.1
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/83_8.10 b/tools/regression/usr.bin/sed/regress.multitest.out/8.10
index 86f75c15..86f75c15 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/83_8.10
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.10
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/84_8.11 b/tools/regression/usr.bin/sed/regress.multitest.out/8.11
index 70a0f11..70a0f11 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/84_8.11
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.11
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/85_8.12 b/tools/regression/usr.bin/sed/regress.multitest.out/8.12
index ded4e98..ded4e98 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/85_8.12
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.12
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/86_8.13 b/tools/regression/usr.bin/sed/regress.multitest.out/8.13
index 48646d1..48646d1 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/86_8.13
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.13
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/87_8.14 b/tools/regression/usr.bin/sed/regress.multitest.out/8.14
index 48646d1..48646d1 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/87_8.14
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.14
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/88_8.15 b/tools/regression/usr.bin/sed/regress.multitest.out/8.15
index f414bb5..f414bb5 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/88_8.15
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.15
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/89_8.16 b/tools/regression/usr.bin/sed/regress.multitest.out/8.16
index 230cc08..230cc08 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/89_8.16
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.16
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/77_8.4 b/tools/regression/usr.bin/sed/regress.multitest.out/8.17
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/77_8.4
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.17
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/78_8.5 b/tools/regression/usr.bin/sed/regress.multitest.out/8.18
index 833e1ba..833e1ba 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/78_8.5
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.18
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.19 b/tools/regression/usr.bin/sed/regress.multitest.out/8.19
new file mode 100644
index 0000000..6536cb8
--- /dev/null
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.19
@@ -0,0 +1,14 @@
+X_1
+X_2
+X_3
+X_4
+X_5
+X_6
+X_7
+X_8
+X_9
+X_10
+X_11
+X_12
+X_13
+X_14
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/75_8.2 b/tools/regression/usr.bin/sed/regress.multitest.out/8.2
index dcf124b..dcf124b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/75_8.2
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.20 b/tools/regression/usr.bin/sed/regress.multitest.out/8.20
new file mode 100644
index 0000000..f9adada
--- /dev/null
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.20
@@ -0,0 +1,14 @@
+X[_1
+X[_2
+X[_3
+X[_4
+X[_5
+X[_6
+X[_7
+X[_8
+X[_9
+X[_10
+X[_11
+X[_12
+X[_13
+X[_14
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.21 b/tools/regression/usr.bin/sed/regress.multitest.out/8.21
new file mode 100644
index 0000000..ec4d9e6
--- /dev/null
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.21
@@ -0,0 +1 @@
+a-b-c
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.22 b/tools/regression/usr.bin/sed/regress.multitest.out/8.22
new file mode 100644
index 0000000..1191247
--- /dev/null
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.22
@@ -0,0 +1,2 @@
+1
+2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.23 b/tools/regression/usr.bin/sed/regress.multitest.out/8.23
new file mode 100644
index 0000000..c66dd65
--- /dev/null
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.23
@@ -0,0 +1 @@
+1X2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/76_8.3 b/tools/regression/usr.bin/sed/regress.multitest.out/8.3
index dcf124b..dcf124b 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/76_8.3
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/90_8.17 b/tools/regression/usr.bin/sed/regress.multitest.out/8.4
index 3bcc601..3bcc601 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/90_8.17
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8.5 b/tools/regression/usr.bin/sed/regress.multitest.out/8.5
new file mode 100644
index 0000000..833e1ba
--- /dev/null
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.5
@@ -0,0 +1,14 @@
+l1X1
+l1X2
+l1X3
+l1X4
+l1X5
+l1X6
+l1X7
+l1X8
+l1X9
+l1X10
+l1X11
+l1X12
+l1X13
+l1X14
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/79_8.6 b/tools/regression/usr.bin/sed/regress.multitest.out/8.6
index 47c08ae..47c08ae 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/79_8.6
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/80_8.7 b/tools/regression/usr.bin/sed/regress.multitest.out/8.7
index 0ff0b9e..0ff0b9e 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/80_8.7
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/81_8.8 b/tools/regression/usr.bin/sed/regress.multitest.out/8.8
index 08bbf8c..08bbf8c 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/81_8.8
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/82_8.9 b/tools/regression/usr.bin/sed/regress.multitest.out/8.9
index e0cd8b5..e0cd8b5 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/82_8.9
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/8.9
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/100_9.10 b/tools/regression/usr.bin/sed/regress.multitest.out/9.1
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/100_9.10
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.1
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/101_9.11 b/tools/regression/usr.bin/sed/regress.multitest.out/9.10
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/101_9.11
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.10
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/102_9.12 b/tools/regression/usr.bin/sed/regress.multitest.out/9.11
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/102_9.12
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.11
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/103_9.13 b/tools/regression/usr.bin/sed/regress.multitest.out/9.12
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/103_9.13
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.12
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/104_9.14 b/tools/regression/usr.bin/sed/regress.multitest.out/9.13
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/104_9.14
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.13
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/105_9.15 b/tools/regression/usr.bin/sed/regress.multitest.out/9.14
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/105_9.15
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.14
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/106_9.16 b/tools/regression/usr.bin/sed/regress.multitest.out/9.15
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/106_9.16
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.15
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/107_9.17 b/tools/regression/usr.bin/sed/regress.multitest.out/9.16
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/107_9.17
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.16
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/108_9.18 b/tools/regression/usr.bin/sed/regress.multitest.out/9.17
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/108_9.18
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.17
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/109_9.19 b/tools/regression/usr.bin/sed/regress.multitest.out/9.18
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/109_9.19
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.18
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/110_9.20 b/tools/regression/usr.bin/sed/regress.multitest.out/9.19
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/110_9.20
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.19
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/111_9.21 b/tools/regression/usr.bin/sed/regress.multitest.out/9.2
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/111_9.21
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.2
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/112_9.22 b/tools/regression/usr.bin/sed/regress.multitest.out/9.20
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/112_9.22
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.20
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/113_9.23 b/tools/regression/usr.bin/sed/regress.multitest.out/9.21
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/113_9.23
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.21
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/114_9.24 b/tools/regression/usr.bin/sed/regress.multitest.out/9.22
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/114_9.24
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.22
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/115_9.25 b/tools/regression/usr.bin/sed/regress.multitest.out/9.23
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/115_9.25
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.23
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/116_9.26 b/tools/regression/usr.bin/sed/regress.multitest.out/9.24
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/116_9.26
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.24
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/117_9.27 b/tools/regression/usr.bin/sed/regress.multitest.out/9.25
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/117_9.27
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.25
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/118_9.28 b/tools/regression/usr.bin/sed/regress.multitest.out/9.26
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/118_9.28
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.26
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/119_9.29 b/tools/regression/usr.bin/sed/regress.multitest.out/9.27
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/119_9.29
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.27
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/120_9.30 b/tools/regression/usr.bin/sed/regress.multitest.out/9.28
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/120_9.30
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.28
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/91_9.1 b/tools/regression/usr.bin/sed/regress.multitest.out/9.29
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/91_9.1
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.29
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/92_9.2 b/tools/regression/usr.bin/sed/regress.multitest.out/9.3
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/92_9.2
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.3
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/93_9.3 b/tools/regression/usr.bin/sed/regress.multitest.out/9.30
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/93_9.3
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.30
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/121_9.31 b/tools/regression/usr.bin/sed/regress.multitest.out/9.31
index 573541a..573541a 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/121_9.31
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.31
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/94_9.4 b/tools/regression/usr.bin/sed/regress.multitest.out/9.4
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/94_9.4
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.4
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/95_9.5 b/tools/regression/usr.bin/sed/regress.multitest.out/9.5
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/95_9.5
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.5
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/96_9.6 b/tools/regression/usr.bin/sed/regress.multitest.out/9.6
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/96_9.6
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.6
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/97_9.7 b/tools/regression/usr.bin/sed/regress.multitest.out/9.7
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/97_9.7
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.7
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/98_9.8 b/tools/regression/usr.bin/sed/regress.multitest.out/9.8
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/98_9.8
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.8
diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/99_9.9 b/tools/regression/usr.bin/sed/regress.multitest.out/9.9
index d00491f..d00491f 100644
--- a/tools/regression/usr.bin/sed/regress.multitest.out/99_9.9
+++ b/tools/regression/usr.bin/sed/regress.multitest.out/9.9
diff --git a/tools/tools/mwl/mwlstats/mwlstats.c b/tools/tools/mwl/mwlstats/mwlstats.c
index e92b790..de4f934 100644
--- a/tools/tools/mwl/mwlstats/mwlstats.c
+++ b/tools/tools/mwl/mwlstats/mwlstats.c
@@ -47,8 +47,8 @@
 #include <unistd.h>
 #include <err.h>
 
-#include "../../sys/net80211/ieee80211_ioctl.h"
-#include "../../sys/net80211/ieee80211_radiotap.h"
+#include "../../../../sys/net80211/ieee80211_ioctl.h"
+#include "../../../../sys/net80211/ieee80211_radiotap.h"
 
 /*
  * Get Hardware Statistics.