From: deraadt <deraadt@openbsd.org>
Date: Mon, 19 Aug 2024 01:43:23 +0000 (+0000)
Subject: move ed/tests files to regress/bin/ed, where they are used
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=421bf2dd52f9ccf1a5f7ebc8a7f452ce5e8a6d3d;p=openbsd

move ed/tests files to regress/bin/ed, where they are used
---

diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile
deleted file mode 100644
index de3e737f7fb..00000000000
--- a/bin/ed/test/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/23 14:20:05 deraadt Exp $
-#	$NetBSD: Makefile,v 1.11 1995/03/21 09:05:14 cgd Exp $
-
-SHELL=	/bin/sh
-ED=	../obj/ed
-
-all: check
-	@:
-
-check: build test
-	@if grep -h '\*\*\*' errs.o scripts.o; then :; else \
-		echo "tests completed successfully."; \
-	fi
-
-build: mkscripts.sh
-	@if [ -f errs.o ]; then :; else \
-		echo "building test scripts for $(ED) ..."; \
-		$(SHELL) mkscripts.sh $(ED); \
-	fi
-
-test: build ckscripts.sh
-	@echo testing $(ED) ...
-	@$(SHELL) ckscripts.sh $(ED)
-
-clean:
-	rm -f *.ed *.red *.[oz] *~
diff --git a/bin/ed/test/README b/bin/ed/test/README
deleted file mode 100644
index 27ad28dd9f5..00000000000
--- a/bin/ed/test/README
+++ /dev/null
@@ -1,33 +0,0 @@
-$OpenBSD: README,v 1.3 2018/01/09 00:43:10 bluhm Exp $
-$NetBSD: README,v 1.8 1995/03/21 09:05:18 cgd Exp $
-
-The files in this directory with suffixes `.t', `.d', `.r' and `.err' are
-used for testing ed.  To run the tests, set the ED variable in the Makefile
-for the path name of the program to be tested (e.g., /bin/ed), and type
-`make'.  The tests do not exhaustively verify POSIX compliance nor do
-they verify correct 8-bit or long line support.
-
-The test file suffixes have the following meanings:
-.t    Template - a list of ed commands from which an ed script is
-      constructed
-.d    Data - read by an ed script
-.r    Result - the expected output after processing data via an ed
-      script.
-.err  Error - invalid ed commands that should generate an error
-
-The output of the tests is written to the two files err.o and scripts.o.
-At the end of the tests, these files are grep'ed for error messages,
-which look like:
-	*** The script u.ed exited abnormally ***
-or:
-	*** Output u.o of script u.ed is incorrect ***
-
-The POSIX requirement that an address range not be used where at most
-a single address is expected has been relaxed in this version of ed.
-Therefore, the  following scripts  which test for compliance with this
-POSIX rule exit abnormally:
-a1-err.ed
-eq-err.ed
-i1-err.ed
-k1-err.ed
-r1-err.ed
diff --git a/bin/ed/test/TODO b/bin/ed/test/TODO
deleted file mode 100644
index a119709bf7a..00000000000
--- a/bin/ed/test/TODO
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: TODO,v 1.2 1996/06/23 14:20:06 deraadt Exp $
-$NetBSD: TODO,v 1.3 1995/03/21 09:05:20 cgd Exp $
-
-Some missing tests:
-0) g/./s^@^@	- okay: NULs in commands
-1) g/./s/^@/	- okay: NULs in patterns
-2) a
-   hello^V^Jworld	
-   .		- okay: embedded newlines in insert mode
-3) ed ""	- error: invalid filename
-4) red ..	- error: restricted
-5) red /	- error: restricted
-5) red !xx	- error: restricted
-6) ed -x 	- verify: 8-bit clean
-7) ed		- verify: long-line support
-8) ed		- verify: interactive/help mode
-9) G/pat/	- verify: global interactive command
-10) V/pat/	- verify: global interactive command
diff --git a/bin/ed/test/a.d b/bin/ed/test/a.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/a.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/a.r b/bin/ed/test/a.r
deleted file mode 100644
index 26257bd3b3c..00000000000
--- a/bin/ed/test/a.r
+++ /dev/null
@@ -1,8 +0,0 @@
-hello world
-line 1
-hello world!
-line 2
-line 3
-line 4
-line5
-hello world!!
diff --git a/bin/ed/test/a.t b/bin/ed/test/a.t
deleted file mode 100644
index ac98c40d085..00000000000
--- a/bin/ed/test/a.t
+++ /dev/null
@@ -1,9 +0,0 @@
-0a
-hello world
-.
-2a
-hello world!
-.
-$a
-hello world!!
-.
diff --git a/bin/ed/test/a1.err b/bin/ed/test/a1.err
deleted file mode 100644
index e80815ff50d..00000000000
--- a/bin/ed/test/a1.err
+++ /dev/null
@@ -1,3 +0,0 @@
-1,$a
-hello world
-.
diff --git a/bin/ed/test/a2.err b/bin/ed/test/a2.err
deleted file mode 100644
index ec4b00b40c4..00000000000
--- a/bin/ed/test/a2.err
+++ /dev/null
@@ -1,3 +0,0 @@
-aa
-hello world
-.
diff --git a/bin/ed/test/addr.d b/bin/ed/test/addr.d
deleted file mode 100644
index 8f7ba1b5d35..00000000000
--- a/bin/ed/test/addr.d
+++ /dev/null
@@ -1,9 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
-1ine6
-line7
-line8
-line9
diff --git a/bin/ed/test/addr.r b/bin/ed/test/addr.r
deleted file mode 100644
index 04caf17f422..00000000000
--- a/bin/ed/test/addr.r
+++ /dev/null
@@ -1,2 +0,0 @@
-line 2
-line9
diff --git a/bin/ed/test/addr.t b/bin/ed/test/addr.t
deleted file mode 100644
index 750b224ed88..00000000000
--- a/bin/ed/test/addr.t
+++ /dev/null
@@ -1,5 +0,0 @@
-1 d
-1 1 d
-1,2,d
-1;+ + ,d
-1,2;., + 2d
diff --git a/bin/ed/test/addr1.err b/bin/ed/test/addr1.err
deleted file mode 100644
index 29d6383b52c..00000000000
--- a/bin/ed/test/addr1.err
+++ /dev/null
@@ -1 +0,0 @@
-100
diff --git a/bin/ed/test/addr2.err b/bin/ed/test/addr2.err
deleted file mode 100644
index e96acb9254b..00000000000
--- a/bin/ed/test/addr2.err
+++ /dev/null
@@ -1 +0,0 @@
--100
diff --git a/bin/ed/test/ascii.d b/bin/ed/test/ascii.d
deleted file mode 100644
index c86626638e0..00000000000
Binary files a/bin/ed/test/ascii.d and /dev/null differ
diff --git a/bin/ed/test/ascii.r b/bin/ed/test/ascii.r
deleted file mode 100644
index c86626638e0..00000000000
Binary files a/bin/ed/test/ascii.r and /dev/null differ
diff --git a/bin/ed/test/ascii.t b/bin/ed/test/ascii.t
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/bang1.d b/bin/ed/test/bang1.d
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/bang1.err b/bin/ed/test/bang1.err
deleted file mode 100644
index 630af9011c9..00000000000
--- a/bin/ed/test/bang1.err
+++ /dev/null
@@ -1 +0,0 @@
-.!date
diff --git a/bin/ed/test/bang1.r b/bin/ed/test/bang1.r
deleted file mode 100644
index dcf02b2fb6b..00000000000
--- a/bin/ed/test/bang1.r
+++ /dev/null
@@ -1 +0,0 @@
-okay
diff --git a/bin/ed/test/bang1.t b/bin/ed/test/bang1.t
deleted file mode 100644
index d7b1fea1f7f..00000000000
--- a/bin/ed/test/bang1.t
+++ /dev/null
@@ -1,5 +0,0 @@
-!read one
-hello, world
-a
-okay
-.
diff --git a/bin/ed/test/bang2.err b/bin/ed/test/bang2.err
deleted file mode 100644
index 79d89568222..00000000000
--- a/bin/ed/test/bang2.err
+++ /dev/null
@@ -1 +0,0 @@
-!!
diff --git a/bin/ed/test/c.d b/bin/ed/test/c.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/c.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/c.r b/bin/ed/test/c.r
deleted file mode 100644
index 0fb3e4fffc0..00000000000
--- a/bin/ed/test/c.r
+++ /dev/null
@@ -1,4 +0,0 @@
-at the top
-between top/middle
-in the middle
-at the bottom
diff --git a/bin/ed/test/c.t b/bin/ed/test/c.t
deleted file mode 100644
index ebdd536f817..00000000000
--- a/bin/ed/test/c.t
+++ /dev/null
@@ -1,12 +0,0 @@
-1c
-at the top
-.
-4c
-in the middle
-.
-$c
-at the bottom
-.
-2,3c
-between top/middle
-.
diff --git a/bin/ed/test/c1.err b/bin/ed/test/c1.err
deleted file mode 100644
index 658ec38b464..00000000000
--- a/bin/ed/test/c1.err
+++ /dev/null
@@ -1,3 +0,0 @@
-cc
-hello world
-.
diff --git a/bin/ed/test/c2.err b/bin/ed/test/c2.err
deleted file mode 100644
index 24b322776a6..00000000000
--- a/bin/ed/test/c2.err
+++ /dev/null
@@ -1,3 +0,0 @@
-0c
-hello world
-.
diff --git a/bin/ed/test/ckscripts.sh b/bin/ed/test/ckscripts.sh
deleted file mode 100644
index b401a79058e..00000000000
--- a/bin/ed/test/ckscripts.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh -
-#	$OpenBSD: ckscripts.sh,v 1.3 1998/07/12 03:49:08 todd Exp $
-#	$NetBSD: ckscripts.sh,v 1.9 1995/04/23 10:07:34 cgd Exp $
-#
-# This script runs the .ed scripts generated by mkscripts.sh
-# and compares their output against the .r files, which contain
-# the correct output
-
-PATH="/bin:/usr/bin:/usr/local/bin/:."
-ED=$1
-[ ! -x $ED ] && { echo "$ED: cannot execute"; exit 1; }
-
-# Run the *.red scripts first, since these don't generate output;
-# they exit with non-zero status
-for i in *.red; do
-	echo $i
-	if $i; then
-		echo "*** The script $i exited abnormally  ***"
-	fi
-done >errs.o 2>&1
-
-# Run the remaining scripts; they exit with zero status
-for i in *.ed; do
-#	base=`expr $i : '\([^.]*\)'`
-#	base=`echo $i | sed 's/\..*//'`
-	base=`$ED - \!"echo $i" <<-EOF
-		s/\..*
-	EOF`
-	if $base.ed; then
-		if cmp -s $base.o $base.r; then :; else
-			echo "*** Output $base.o of script $i is incorrect ***"
-		fi
-	else
-		echo "*** The script $i exited abnormally ***"
-	fi
-done >scripts.o 2>&1
-
-grep -h '\*\*\*' errs.o scripts.o
diff --git a/bin/ed/test/d.d b/bin/ed/test/d.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/d.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/d.err b/bin/ed/test/d.err
deleted file mode 100644
index f03f6945fbf..00000000000
--- a/bin/ed/test/d.err
+++ /dev/null
@@ -1 +0,0 @@
-dd
diff --git a/bin/ed/test/d.r b/bin/ed/test/d.r
deleted file mode 100644
index b7e242c00cd..00000000000
--- a/bin/ed/test/d.r
+++ /dev/null
@@ -1 +0,0 @@
-line 2
diff --git a/bin/ed/test/d.t b/bin/ed/test/d.t
deleted file mode 100644
index c7c473febdf..00000000000
--- a/bin/ed/test/d.t
+++ /dev/null
@@ -1,3 +0,0 @@
-1d
-2;+1d
-$d
diff --git a/bin/ed/test/d0.d b/bin/ed/test/d0.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/d0.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/d0.r b/bin/ed/test/d0.r
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/d0.t b/bin/ed/test/d0.t
deleted file mode 100644
index 5725f1046d0..00000000000
--- a/bin/ed/test/d0.t
+++ /dev/null
@@ -1 +0,0 @@
-,d
diff --git a/bin/ed/test/d1.d b/bin/ed/test/d1.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/d1.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/d1.r b/bin/ed/test/d1.r
deleted file mode 100644
index 071c8f373dd..00000000000
--- a/bin/ed/test/d1.r
+++ /dev/null
@@ -1,2 +0,0 @@
-line 4
-line5
diff --git a/bin/ed/test/d1.t b/bin/ed/test/d1.t
deleted file mode 100644
index 0bdfc29e1f2..00000000000
--- a/bin/ed/test/d1.t
+++ /dev/null
@@ -1 +0,0 @@
-,3d
diff --git a/bin/ed/test/d2.d b/bin/ed/test/d2.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/d2.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/d2.r b/bin/ed/test/d2.r
deleted file mode 100644
index c29a1e3b9d8..00000000000
--- a/bin/ed/test/d2.r
+++ /dev/null
@@ -1,4 +0,0 @@
-line 1
-line 2
-line 4
-line5
diff --git a/bin/ed/test/d2.t b/bin/ed/test/d2.t
deleted file mode 100644
index 34a3f8d0e42..00000000000
--- a/bin/ed/test/d2.t
+++ /dev/null
@@ -1 +0,0 @@
-3,d
diff --git a/bin/ed/test/d3.d b/bin/ed/test/d3.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/d3.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/d3.r b/bin/ed/test/d3.r
deleted file mode 100644
index 89b24ecec50..00000000000
--- a/bin/ed/test/d3.r
+++ /dev/null
@@ -1 +0,0 @@
-line 1
diff --git a/bin/ed/test/d3.t b/bin/ed/test/d3.t
deleted file mode 100644
index 50996be51db..00000000000
--- a/bin/ed/test/d3.t
+++ /dev/null
@@ -1,2 +0,0 @@
-2
-;d
diff --git a/bin/ed/test/d4.d b/bin/ed/test/d4.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/d4.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/d4.r b/bin/ed/test/d4.r
deleted file mode 100644
index 0d1bbcfdc85..00000000000
--- a/bin/ed/test/d4.r
+++ /dev/null
@@ -1,3 +0,0 @@
-line 1
-line 4
-line5
diff --git a/bin/ed/test/d4.t b/bin/ed/test/d4.t
deleted file mode 100644
index 9ebddc6a110..00000000000
--- a/bin/ed/test/d4.t
+++ /dev/null
@@ -1,2 +0,0 @@
-2
-;3d
diff --git a/bin/ed/test/d5.d b/bin/ed/test/d5.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/d5.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/d5.r b/bin/ed/test/d5.r
deleted file mode 100644
index c29a1e3b9d8..00000000000
--- a/bin/ed/test/d5.r
+++ /dev/null
@@ -1,4 +0,0 @@
-line 1
-line 2
-line 4
-line5
diff --git a/bin/ed/test/d5.t b/bin/ed/test/d5.t
deleted file mode 100644
index ef303a6e3ff..00000000000
--- a/bin/ed/test/d5.t
+++ /dev/null
@@ -1,2 +0,0 @@
-4
-3;d
diff --git a/bin/ed/test/e1.d b/bin/ed/test/e1.d
deleted file mode 100644
index 3b18e512dba..00000000000
--- a/bin/ed/test/e1.d
+++ /dev/null
@@ -1 +0,0 @@
-hello world
diff --git a/bin/ed/test/e1.err b/bin/ed/test/e1.err
deleted file mode 100644
index 827cc292b6b..00000000000
--- a/bin/ed/test/e1.err
+++ /dev/null
@@ -1 +0,0 @@
-ee e1.err
diff --git a/bin/ed/test/e1.r b/bin/ed/test/e1.r
deleted file mode 100644
index e656728bab2..00000000000
--- a/bin/ed/test/e1.r
+++ /dev/null
@@ -1 +0,0 @@
-E e1.t
diff --git a/bin/ed/test/e1.t b/bin/ed/test/e1.t
deleted file mode 100644
index e656728bab2..00000000000
--- a/bin/ed/test/e1.t
+++ /dev/null
@@ -1 +0,0 @@
-E e1.t
diff --git a/bin/ed/test/e2.d b/bin/ed/test/e2.d
deleted file mode 100644
index aa44630d22a..00000000000
--- a/bin/ed/test/e2.d
+++ /dev/null
@@ -1 +0,0 @@
-E !echo hello world-
diff --git a/bin/ed/test/e2.err b/bin/ed/test/e2.err
deleted file mode 100644
index 779a64b54ff..00000000000
--- a/bin/ed/test/e2.err
+++ /dev/null
@@ -1 +0,0 @@
-.e e2.err
diff --git a/bin/ed/test/e2.r b/bin/ed/test/e2.r
deleted file mode 100644
index 59ebf11fd09..00000000000
--- a/bin/ed/test/e2.r
+++ /dev/null
@@ -1 +0,0 @@
-hello world-
diff --git a/bin/ed/test/e2.t b/bin/ed/test/e2.t
deleted file mode 100644
index aa44630d22a..00000000000
--- a/bin/ed/test/e2.t
+++ /dev/null
@@ -1 +0,0 @@
-E !echo hello world-
diff --git a/bin/ed/test/e3.d b/bin/ed/test/e3.d
deleted file mode 100644
index aa44630d22a..00000000000
--- a/bin/ed/test/e3.d
+++ /dev/null
@@ -1 +0,0 @@
-E !echo hello world-
diff --git a/bin/ed/test/e3.err b/bin/ed/test/e3.err
deleted file mode 100644
index 80a7fdcf92e..00000000000
--- a/bin/ed/test/e3.err
+++ /dev/null
@@ -1 +0,0 @@
-ee.err
diff --git a/bin/ed/test/e3.r b/bin/ed/test/e3.r
deleted file mode 100644
index aa44630d22a..00000000000
--- a/bin/ed/test/e3.r
+++ /dev/null
@@ -1 +0,0 @@
-E !echo hello world-
diff --git a/bin/ed/test/e3.t b/bin/ed/test/e3.t
deleted file mode 100644
index 1c507261389..00000000000
--- a/bin/ed/test/e3.t
+++ /dev/null
@@ -1 +0,0 @@
-E
diff --git a/bin/ed/test/e4.d b/bin/ed/test/e4.d
deleted file mode 100644
index aa44630d22a..00000000000
--- a/bin/ed/test/e4.d
+++ /dev/null
@@ -1 +0,0 @@
-E !echo hello world-
diff --git a/bin/ed/test/e4.r b/bin/ed/test/e4.r
deleted file mode 100644
index aa44630d22a..00000000000
--- a/bin/ed/test/e4.r
+++ /dev/null
@@ -1 +0,0 @@
-E !echo hello world-
diff --git a/bin/ed/test/e4.t b/bin/ed/test/e4.t
deleted file mode 100644
index d905d9da82c..00000000000
--- a/bin/ed/test/e4.t
+++ /dev/null
@@ -1 +0,0 @@
-e
diff --git a/bin/ed/test/eq.err b/bin/ed/test/eq.err
deleted file mode 100644
index 6a6055955b1..00000000000
--- a/bin/ed/test/eq.err
+++ /dev/null
@@ -1 +0,0 @@
-1,$=
diff --git a/bin/ed/test/f1.err b/bin/ed/test/f1.err
deleted file mode 100644
index e60975adabb..00000000000
--- a/bin/ed/test/f1.err
+++ /dev/null
@@ -1 +0,0 @@
-.f f1.err
diff --git a/bin/ed/test/f2.err b/bin/ed/test/f2.err
deleted file mode 100644
index 26d1c5e3a75..00000000000
--- a/bin/ed/test/f2.err
+++ /dev/null
@@ -1 +0,0 @@
-ff1.err
diff --git a/bin/ed/test/g1.d b/bin/ed/test/g1.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/g1.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/g1.err b/bin/ed/test/g1.err
deleted file mode 100644
index f95ea22232c..00000000000
--- a/bin/ed/test/g1.err
+++ /dev/null
@@ -1 +0,0 @@
-g/./s //x/
diff --git a/bin/ed/test/g1.r b/bin/ed/test/g1.r
deleted file mode 100644
index 578a44b6b21..00000000000
--- a/bin/ed/test/g1.r
+++ /dev/null
@@ -1,15 +0,0 @@
-line5
-help! world
-order
-line 4
-help! world
-order
-line 3
-help! world
-order
-line 2
-help! world
-order
-line 1
-help! world
-order
diff --git a/bin/ed/test/g1.t b/bin/ed/test/g1.t
deleted file mode 100644
index 2d0b54f35ad..00000000000
--- a/bin/ed/test/g1.t
+++ /dev/null
@@ -1,6 +0,0 @@
-g/./m0
-g/./s/$/\
-hello world
-g/hello /s/lo/p!/\
-a\
-order
diff --git a/bin/ed/test/g2.d b/bin/ed/test/g2.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/g2.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/g2.err b/bin/ed/test/g2.err
deleted file mode 100644
index 0ff6a5a601d..00000000000
--- a/bin/ed/test/g2.err
+++ /dev/null
@@ -1 +0,0 @@
-g//s/./x/
diff --git a/bin/ed/test/g2.r b/bin/ed/test/g2.r
deleted file mode 100644
index 3b18e512dba..00000000000
--- a/bin/ed/test/g2.r
+++ /dev/null
@@ -1 +0,0 @@
-hello world
diff --git a/bin/ed/test/g2.t b/bin/ed/test/g2.t
deleted file mode 100644
index 831ee8367bc..00000000000
--- a/bin/ed/test/g2.t
+++ /dev/null
@@ -1,2 +0,0 @@
-g/[2-4]/-1,+1c\
-hello world
diff --git a/bin/ed/test/g3.d b/bin/ed/test/g3.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/g3.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/g3.err b/bin/ed/test/g3.err
deleted file mode 100644
index 01058d844a9..00000000000
--- a/bin/ed/test/g3.err
+++ /dev/null
@@ -1 +0,0 @@
-g
diff --git a/bin/ed/test/g3.r b/bin/ed/test/g3.r
deleted file mode 100644
index cc6fbddec23..00000000000
--- a/bin/ed/test/g3.r
+++ /dev/null
@@ -1,5 +0,0 @@
-linc 3
-xine 1
-xine 2
-xinc 4
-xinc5
diff --git a/bin/ed/test/g3.t b/bin/ed/test/g3.t
deleted file mode 100644
index 2d052a6e840..00000000000
--- a/bin/ed/test/g3.t
+++ /dev/null
@@ -1,4 +0,0 @@
-g/./s//x/\
-3m0
-g/./s/e/c/\
-2,3m1
diff --git a/bin/ed/test/g4.d b/bin/ed/test/g4.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/g4.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/g4.r b/bin/ed/test/g4.r
deleted file mode 100644
index 350882d8237..00000000000
--- a/bin/ed/test/g4.r
+++ /dev/null
@@ -1,7 +0,0 @@
-hello
-zine 1
-line 2
-line 3
-line 4
-line5
-world
diff --git a/bin/ed/test/g4.t b/bin/ed/test/g4.t
deleted file mode 100644
index ec618166cc3..00000000000
--- a/bin/ed/test/g4.t
+++ /dev/null
@@ -1,13 +0,0 @@
-g/./s/./x/\
-u\
-s/./y/\
-u\
-s/./z/\
-u
-u
-0a
-hello
-.
-$a
-world
-.
diff --git a/bin/ed/test/g5.d b/bin/ed/test/g5.d
deleted file mode 100644
index a92d664bc20..00000000000
--- a/bin/ed/test/g5.d
+++ /dev/null
@@ -1,3 +0,0 @@
-line 1
-line 2
-line 3
diff --git a/bin/ed/test/g5.r b/bin/ed/test/g5.r
deleted file mode 100644
index 15a26758bac..00000000000
--- a/bin/ed/test/g5.r
+++ /dev/null
@@ -1,9 +0,0 @@
-line 1
-line 2
-line 3
-line 2
-line 3
-line 1
-line 3
-line 1
-line 2
diff --git a/bin/ed/test/g5.t b/bin/ed/test/g5.t
deleted file mode 100644
index e213481d54c..00000000000
--- a/bin/ed/test/g5.t
+++ /dev/null
@@ -1,2 +0,0 @@
-g/./1,3t$\
-1d
diff --git a/bin/ed/test/h.err b/bin/ed/test/h.err
deleted file mode 100644
index a71e506f6dd..00000000000
--- a/bin/ed/test/h.err
+++ /dev/null
@@ -1 +0,0 @@
-.h
diff --git a/bin/ed/test/i.d b/bin/ed/test/i.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/i.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/i.r b/bin/ed/test/i.r
deleted file mode 100644
index 5f27af09c03..00000000000
--- a/bin/ed/test/i.r
+++ /dev/null
@@ -1,8 +0,0 @@
-hello world
-hello world!
-line 1
-line 2
-line 3
-line 4
-hello world!!
-line5
diff --git a/bin/ed/test/i.t b/bin/ed/test/i.t
deleted file mode 100644
index d1d98057d88..00000000000
--- a/bin/ed/test/i.t
+++ /dev/null
@@ -1,9 +0,0 @@
-1i
-hello world
-.
-2i
-hello world!
-.
-$i
-hello world!!
-.
diff --git a/bin/ed/test/i0.d b/bin/ed/test/i0.d
deleted file mode 100644
index a29bdeb434d..00000000000
--- a/bin/ed/test/i0.d
+++ /dev/null
@@ -1 +0,0 @@
-line1
diff --git a/bin/ed/test/i0.r b/bin/ed/test/i0.r
deleted file mode 100644
index 0134f398791..00000000000
--- a/bin/ed/test/i0.r
+++ /dev/null
@@ -1,2 +0,0 @@
-hello world
-line1
diff --git a/bin/ed/test/i0.t b/bin/ed/test/i0.t
deleted file mode 100644
index 6d200c8c97e..00000000000
--- a/bin/ed/test/i0.t
+++ /dev/null
@@ -1,3 +0,0 @@
-0i
-hello world
-.
diff --git a/bin/ed/test/i1.err b/bin/ed/test/i1.err
deleted file mode 100644
index aaddede2599..00000000000
--- a/bin/ed/test/i1.err
+++ /dev/null
@@ -1,3 +0,0 @@
-1,$i
-hello world
-.
diff --git a/bin/ed/test/i2.err b/bin/ed/test/i2.err
deleted file mode 100644
index b63f5ac507f..00000000000
--- a/bin/ed/test/i2.err
+++ /dev/null
@@ -1,3 +0,0 @@
-ii
-hello world
-.
diff --git a/bin/ed/test/j.d b/bin/ed/test/j.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/j.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/j.r b/bin/ed/test/j.r
deleted file mode 100644
index 66f36a8f8ab..00000000000
--- a/bin/ed/test/j.r
+++ /dev/null
@@ -1,4 +0,0 @@
-line 1
-line 2line 3
-line 4
-line5
diff --git a/bin/ed/test/j.t b/bin/ed/test/j.t
deleted file mode 100644
index 9b5d28ddf17..00000000000
--- a/bin/ed/test/j.t
+++ /dev/null
@@ -1,2 +0,0 @@
-1,1j
-2,3j
diff --git a/bin/ed/test/k.d b/bin/ed/test/k.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/k.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/k.r b/bin/ed/test/k.r
deleted file mode 100644
index eeb38db20c6..00000000000
--- a/bin/ed/test/k.r
+++ /dev/null
@@ -1,5 +0,0 @@
-line 3
-hello world
-line 4
-line5
-line 2
diff --git a/bin/ed/test/k.t b/bin/ed/test/k.t
deleted file mode 100644
index 53d588dd07a..00000000000
--- a/bin/ed/test/k.t
+++ /dev/null
@@ -1,10 +0,0 @@
-2ka
-1d
-'am$
-1ka
-0a
-hello world
-.
-'ad
-u
-'am0
diff --git a/bin/ed/test/k1.err b/bin/ed/test/k1.err
deleted file mode 100644
index eba1f3d8ff1..00000000000
--- a/bin/ed/test/k1.err
+++ /dev/null
@@ -1 +0,0 @@
-1,$ka
diff --git a/bin/ed/test/k2.err b/bin/ed/test/k2.err
deleted file mode 100644
index b34a18d5195..00000000000
--- a/bin/ed/test/k2.err
+++ /dev/null
@@ -1 +0,0 @@
-kA
diff --git a/bin/ed/test/k3.err b/bin/ed/test/k3.err
deleted file mode 100644
index 70190c473df..00000000000
--- a/bin/ed/test/k3.err
+++ /dev/null
@@ -1 +0,0 @@
-0ka
diff --git a/bin/ed/test/k4.err b/bin/ed/test/k4.err
deleted file mode 100644
index 34576422294..00000000000
--- a/bin/ed/test/k4.err
+++ /dev/null
@@ -1,6 +0,0 @@
-a
-hello
-.
-.ka
-'ad
-'ap
diff --git a/bin/ed/test/l.d b/bin/ed/test/l.d
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/l.r b/bin/ed/test/l.r
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/l.t b/bin/ed/test/l.t
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/m.d b/bin/ed/test/m.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/m.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/m.err b/bin/ed/test/m.err
deleted file mode 100644
index 3aec4c32c1f..00000000000
--- a/bin/ed/test/m.err
+++ /dev/null
@@ -1,4 +0,0 @@
-a
-hello world
-.
-1,$m1
diff --git a/bin/ed/test/m.r b/bin/ed/test/m.r
deleted file mode 100644
index 186cf5403b9..00000000000
--- a/bin/ed/test/m.r
+++ /dev/null
@@ -1,5 +0,0 @@
-line5
-line 1
-line 2
-line 3
-line 4
diff --git a/bin/ed/test/m.t b/bin/ed/test/m.t
deleted file mode 100644
index c39c0887245..00000000000
--- a/bin/ed/test/m.t
+++ /dev/null
@@ -1,7 +0,0 @@
-1,2m$
-1,2m$
-1,2m$
-$m0
-$m0
-2,3m1
-2,3m3
diff --git a/bin/ed/test/mkscripts.sh b/bin/ed/test/mkscripts.sh
deleted file mode 100644
index 2bf9b213235..00000000000
--- a/bin/ed/test/mkscripts.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh -
-#	$OpenBSD: mkscripts.sh,v 1.2 1996/06/23 14:20:08 deraadt Exp $
-#	$NetBSD: mkscripts.sh,v 1.10 1995/04/23 10:07:36 cgd Exp $
-#
-# This script generates ed test scripts (.ed) from .t files
-
-PATH="/bin:/usr/bin:/usr/local/bin/:."
-ED=$1
-[ ! -x $ED ] && { echo "$ED: cannot execute"; exit 1; }
-
-for i in *.t; do
-#	base=${i%.*}
-#	base=`echo $i | sed 's/\..*//'`
-#	base=`expr $i : '\([^.]*\)'`
-#	(
-#	echo "#!/bin/sh -"
-#	echo "$ED - <<\EOT"
-#	echo "r $base.d"
-#	cat $i
-#	echo "w $base.o"
-#	echo EOT
-#	) >$base.ed
-#	chmod +x $base.ed
-# The following is pretty ugly way of doing the above, and not appropriate 
-# use of ed  but the point is that it can be done...
-	base=`$ED - \!"echo $i" <<-EOF
-		s/\..*
-	EOF`
-	$ED - <<-EOF
-		a
-		#!/bin/sh -
-		$ED - <<\EOT
-		H
-		r $base.d
-		w $base.o
-		EOT
-		.
-		-2r $i
-		w $base.ed
-		!chmod +x $base.ed
-	EOF
-done
-
-for i in *.err; do
-#	base=${i%.*}
-#	base=`echo $i | sed 's/\..*//'`
-#	base=`expr $i : '\([^.]*\)'`
-#	(
-#	echo "#!/bin/sh -"
-#	echo "$ED - <<\EOT"
-#	echo H
-#	echo "r $base.err"
-#	cat $i
-#	echo "w $base.o"
-#	echo EOT
-#	) >$base-err.ed
-#	chmod +x $base-err.ed
-# The following is pretty ugly way of doing the above, and not appropriate 
-# use of ed  but the point is that it can be done...
-	base=`$ED - \!"echo $i" <<-EOF
-		s/\..*
-	EOF`
-	$ED - <<-EOF
-		a
-		#!/bin/sh -
-		$ED - <<\EOT
-		H
-		r $base.err
-		w $base.o
-		EOT
-		.
-		-2r $i
-		w ${base}.red
-		!chmod +x ${base}.red
-	EOF
-done
diff --git a/bin/ed/test/n.d b/bin/ed/test/n.d
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/n.r b/bin/ed/test/n.r
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/n.t b/bin/ed/test/n.t
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/nl1.d b/bin/ed/test/nl1.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/nl1.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/nl1.r b/bin/ed/test/nl1.r
deleted file mode 100644
index 9d8854cd04d..00000000000
--- a/bin/ed/test/nl1.r
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-hello world
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/nl1.t b/bin/ed/test/nl1.t
deleted file mode 100644
index ea192e9b829..00000000000
--- a/bin/ed/test/nl1.t
+++ /dev/null
@@ -1,8 +0,0 @@
-1
-
-
-0a
-
-
-hello world
-.
diff --git a/bin/ed/test/nl2.d b/bin/ed/test/nl2.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/nl2.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/nl2.r b/bin/ed/test/nl2.r
deleted file mode 100644
index fe99e416286..00000000000
--- a/bin/ed/test/nl2.r
+++ /dev/null
@@ -1,6 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
-hello world
diff --git a/bin/ed/test/nl2.t b/bin/ed/test/nl2.t
deleted file mode 100644
index 73fd27b7e23..00000000000
--- a/bin/ed/test/nl2.t
+++ /dev/null
@@ -1,4 +0,0 @@
-a
-hello world
-.
-0;/./
diff --git a/bin/ed/test/p.d b/bin/ed/test/p.d
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/p.r b/bin/ed/test/p.r
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/p.t b/bin/ed/test/p.t
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/q.d b/bin/ed/test/q.d
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/q.r b/bin/ed/test/q.r
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/q.t b/bin/ed/test/q.t
deleted file mode 100644
index 123a2c8e2cf..00000000000
--- a/bin/ed/test/q.t
+++ /dev/null
@@ -1,5 +0,0 @@
-w q.o
-a
-hello
-.
-q
diff --git a/bin/ed/test/q1.err b/bin/ed/test/q1.err
deleted file mode 100644
index 0a7e178d206..00000000000
--- a/bin/ed/test/q1.err
+++ /dev/null
@@ -1 +0,0 @@
-.q
diff --git a/bin/ed/test/r1.d b/bin/ed/test/r1.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/r1.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/r1.err b/bin/ed/test/r1.err
deleted file mode 100644
index 269aa7cbcb8..00000000000
--- a/bin/ed/test/r1.err
+++ /dev/null
@@ -1 +0,0 @@
-1,$r r1.err
diff --git a/bin/ed/test/r1.r b/bin/ed/test/r1.r
deleted file mode 100644
index a3ff506ec7c..00000000000
--- a/bin/ed/test/r1.r
+++ /dev/null
@@ -1,7 +0,0 @@
-line 1
-hello world
-line 2
-line 3
-line 4
-line5
-hello world
diff --git a/bin/ed/test/r1.t b/bin/ed/test/r1.t
deleted file mode 100644
index d787a923e3f..00000000000
--- a/bin/ed/test/r1.t
+++ /dev/null
@@ -1,3 +0,0 @@
-1;r !echo hello world
-1
-r !echo hello world
diff --git a/bin/ed/test/r2.d b/bin/ed/test/r2.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/r2.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/r2.err b/bin/ed/test/r2.err
deleted file mode 100644
index 1c44fa3ea9c..00000000000
--- a/bin/ed/test/r2.err
+++ /dev/null
@@ -1 +0,0 @@
-r a-good-book
diff --git a/bin/ed/test/r2.r b/bin/ed/test/r2.r
deleted file mode 100644
index ac152ba9d0a..00000000000
--- a/bin/ed/test/r2.r
+++ /dev/null
@@ -1,10 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/r2.t b/bin/ed/test/r2.t
deleted file mode 100644
index 4286f428e3b..00000000000
--- a/bin/ed/test/r2.t
+++ /dev/null
@@ -1 +0,0 @@
-r
diff --git a/bin/ed/test/r3.d b/bin/ed/test/r3.d
deleted file mode 100644
index 593eec6192b..00000000000
--- a/bin/ed/test/r3.d
+++ /dev/null
@@ -1 +0,0 @@
-r r3.t
diff --git a/bin/ed/test/r3.r b/bin/ed/test/r3.r
deleted file mode 100644
index 86d5f904fc1..00000000000
--- a/bin/ed/test/r3.r
+++ /dev/null
@@ -1,2 +0,0 @@
-r r3.t
-r r3.t
diff --git a/bin/ed/test/r3.t b/bin/ed/test/r3.t
deleted file mode 100644
index 593eec6192b..00000000000
--- a/bin/ed/test/r3.t
+++ /dev/null
@@ -1 +0,0 @@
-r r3.t
diff --git a/bin/ed/test/s1.d b/bin/ed/test/s1.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/s1.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/s1.err b/bin/ed/test/s1.err
deleted file mode 100644
index d7ca0cf480d..00000000000
--- a/bin/ed/test/s1.err
+++ /dev/null
@@ -1 +0,0 @@
-s . x
diff --git a/bin/ed/test/s1.r b/bin/ed/test/s1.r
deleted file mode 100644
index 4eb0980cfe7..00000000000
--- a/bin/ed/test/s1.r
+++ /dev/null
@@ -1,5 +0,0 @@
-liene 1
-(liene) (2)
-(liene) (3)
-liene (4)
-(()liene5)
diff --git a/bin/ed/test/s1.t b/bin/ed/test/s1.t
deleted file mode 100644
index b0028bb6c92..00000000000
--- a/bin/ed/test/s1.t
+++ /dev/null
@@ -1,6 +0,0 @@
-s/\([^ ][^ ]*\)/(\1)/g
-2s
-/3/s
-/\(4\)/sr
-/\(.\)/srg
-%s/i/&e/
diff --git a/bin/ed/test/s10.err b/bin/ed/test/s10.err
deleted file mode 100644
index 0d8d83de19a..00000000000
--- a/bin/ed/test/s10.err
+++ /dev/null
@@ -1,4 +0,0 @@
-a
-hello
-.
-s/[h[.]/x/
diff --git a/bin/ed/test/s2.d b/bin/ed/test/s2.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/s2.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/s2.r b/bin/ed/test/s2.r
deleted file mode 100644
index ca305c8d506..00000000000
--- a/bin/ed/test/s2.r
+++ /dev/null
@@ -1,5 +0,0 @@
-li(n)e 1
-i(n)e 200
-li(n)e 3
-li(n)e 4
-li(n)e500
diff --git a/bin/ed/test/s2.t b/bin/ed/test/s2.t
deleted file mode 100644
index f36584997c9..00000000000
--- a/bin/ed/test/s2.t
+++ /dev/null
@@ -1,4 +0,0 @@
-,s/./(&)/3
-s/$/00
-2s//%/g
-s/^l
diff --git a/bin/ed/test/s3.d b/bin/ed/test/s3.d
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/bin/ed/test/s3.err b/bin/ed/test/s3.err
deleted file mode 100644
index d68c7d07f99..00000000000
--- a/bin/ed/test/s3.err
+++ /dev/null
@@ -1 +0,0 @@
-s/[xyx/a/
diff --git a/bin/ed/test/s3.r b/bin/ed/test/s3.r
deleted file mode 100644
index d6cada2212f..00000000000
--- a/bin/ed/test/s3.r
+++ /dev/null
@@ -1 +0,0 @@
-hello   world
diff --git a/bin/ed/test/s3.t b/bin/ed/test/s3.t
deleted file mode 100644
index fbf880304b7..00000000000
--- a/bin/ed/test/s3.t
+++ /dev/null
@@ -1,6 +0,0 @@
-a
-hello/[]world
-.
-s/[/]/ /
-s/[[:digit:][]/ /
-s/[]]/ /
diff --git a/bin/ed/test/s4.d b/bin/ed/test/s4.d
deleted file mode 100644
index 78981922613..00000000000
--- a/bin/ed/test/s4.d
+++ /dev/null
@@ -1 +0,0 @@
-a
diff --git a/bin/ed/test/s4.err b/bin/ed/test/s4.err
deleted file mode 100644
index 35b609fc625..00000000000
--- a/bin/ed/test/s4.err
+++ /dev/null
@@ -1 +0,0 @@
-s/\a\b\c/xyz/
diff --git a/bin/ed/test/s4.r b/bin/ed/test/s4.r
deleted file mode 100644
index 86ae29c8445..00000000000
--- a/bin/ed/test/s4.r
+++ /dev/null
@@ -1 +0,0 @@
-ba
diff --git a/bin/ed/test/s4.t b/bin/ed/test/s4.t
deleted file mode 100644
index 5e4fe76385b..00000000000
--- a/bin/ed/test/s4.t
+++ /dev/null
@@ -1 +0,0 @@
-s/x*/b/g
diff --git a/bin/ed/test/s5.err b/bin/ed/test/s5.err
deleted file mode 100644
index 89104c55232..00000000000
--- a/bin/ed/test/s5.err
+++ /dev/null
@@ -1 +0,0 @@
-s//xyz/
diff --git a/bin/ed/test/s6.err b/bin/ed/test/s6.err
deleted file mode 100644
index b4785957bc9..00000000000
--- a/bin/ed/test/s6.err
+++ /dev/null
@@ -1 +0,0 @@
-s
diff --git a/bin/ed/test/s7.err b/bin/ed/test/s7.err
deleted file mode 100644
index 30ba4fded76..00000000000
--- a/bin/ed/test/s7.err
+++ /dev/null
@@ -1,5 +0,0 @@
-a
-hello world
-.
-/./
-sr
diff --git a/bin/ed/test/s8.err b/bin/ed/test/s8.err
deleted file mode 100644
index 5665767c3fa..00000000000
--- a/bin/ed/test/s8.err
+++ /dev/null
@@ -1,4 +0,0 @@
-a
-hello
-.
-s/[h[=]/x/
diff --git a/bin/ed/test/s9.err b/bin/ed/test/s9.err
deleted file mode 100644
index 1ff16dd8470..00000000000
--- a/bin/ed/test/s9.err
+++ /dev/null
@@ -1,4 +0,0 @@
-a
-hello
-.
-s/[h[:]/x/
diff --git a/bin/ed/test/t.d b/bin/ed/test/t.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/t.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/t.r b/bin/ed/test/t.r
deleted file mode 100644
index 2b2854758d5..00000000000
--- a/bin/ed/test/t.r
+++ /dev/null
@@ -1,16 +0,0 @@
-line 1
-line 1
-line 1
-line 2
-line 2
-line 3
-line 4
-line5
-line 1
-line 1
-line 1
-line 2
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/t.t b/bin/ed/test/t.t
deleted file mode 100644
index fcb1368bc29..00000000000
--- a/bin/ed/test/t.t
+++ /dev/null
@@ -1,3 +0,0 @@
-1t1
-2,3t2
-,t$
diff --git a/bin/ed/test/t1.d b/bin/ed/test/t1.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/t1.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/t1.err b/bin/ed/test/t1.err
deleted file mode 100644
index c49c556e0e4..00000000000
--- a/bin/ed/test/t1.err
+++ /dev/null
@@ -1 +0,0 @@
-tt
diff --git a/bin/ed/test/t1.r b/bin/ed/test/t1.r
deleted file mode 100644
index 2b2854758d5..00000000000
--- a/bin/ed/test/t1.r
+++ /dev/null
@@ -1,16 +0,0 @@
-line 1
-line 1
-line 1
-line 2
-line 2
-line 3
-line 4
-line5
-line 1
-line 1
-line 1
-line 2
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/t1.t b/bin/ed/test/t1.t
deleted file mode 100644
index 6b66163793a..00000000000
--- a/bin/ed/test/t1.t
+++ /dev/null
@@ -1,3 +0,0 @@
-1t0
-2,3t2
-,t$
diff --git a/bin/ed/test/t2.d b/bin/ed/test/t2.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/t2.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/t2.err b/bin/ed/test/t2.err
deleted file mode 100644
index c202051b7f1..00000000000
--- a/bin/ed/test/t2.err
+++ /dev/null
@@ -1 +0,0 @@
-t0;-1
diff --git a/bin/ed/test/t2.r b/bin/ed/test/t2.r
deleted file mode 100644
index 0c75ff554ca..00000000000
--- a/bin/ed/test/t2.r
+++ /dev/null
@@ -1,6 +0,0 @@
-line 1
-line5
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/t2.t b/bin/ed/test/t2.t
deleted file mode 100644
index 5175abdec90..00000000000
--- a/bin/ed/test/t2.t
+++ /dev/null
@@ -1 +0,0 @@
-t0;/./
diff --git a/bin/ed/test/u.d b/bin/ed/test/u.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/u.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/u.err b/bin/ed/test/u.err
deleted file mode 100644
index caa1ba11488..00000000000
--- a/bin/ed/test/u.err
+++ /dev/null
@@ -1 +0,0 @@
-.u
diff --git a/bin/ed/test/u.r b/bin/ed/test/u.r
deleted file mode 100644
index ad558d82d02..00000000000
--- a/bin/ed/test/u.r
+++ /dev/null
@@ -1,9 +0,0 @@
-line 1
-hello
-hello world!!
-line 2
-line 3
-line 4
-line5
-hello
-hello world!!
diff --git a/bin/ed/test/u.t b/bin/ed/test/u.t
deleted file mode 100644
index 131cb6e25c1..00000000000
--- a/bin/ed/test/u.t
+++ /dev/null
@@ -1,31 +0,0 @@
-1;r u.t
-u
-a
-hello
-world
-.
-g/./s//x/\
-a\
-hello\
-world
-u
-u
-u
-a
-hello world!
-.
-u
-1,$d
-u
-2,3d
-u
-c
-hello world!!
-.
-u
-u
--1;.,+1j
-u
-u
-u
-.,+1t$
diff --git a/bin/ed/test/v.d b/bin/ed/test/v.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/v.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/v.r b/bin/ed/test/v.r
deleted file mode 100644
index 714db63e357..00000000000
--- a/bin/ed/test/v.r
+++ /dev/null
@@ -1,11 +0,0 @@
-line5
-order
-hello world
-line 1
-order
-line 2
-order
-line 3
-order
-line 4
-order
diff --git a/bin/ed/test/v.t b/bin/ed/test/v.t
deleted file mode 100644
index 608a77fb6a4..00000000000
--- a/bin/ed/test/v.t
+++ /dev/null
@@ -1,6 +0,0 @@
-v/[ ]/m0
-v/[ ]/s/$/\
-hello world
-v/hello /s/lo/p!/\
-a\
-order
diff --git a/bin/ed/test/w.d b/bin/ed/test/w.d
deleted file mode 100644
index 92f337e977f..00000000000
--- a/bin/ed/test/w.d
+++ /dev/null
@@ -1,5 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/w.r b/bin/ed/test/w.r
deleted file mode 100644
index ac152ba9d0a..00000000000
--- a/bin/ed/test/w.r
+++ /dev/null
@@ -1,10 +0,0 @@
-line 1
-line 2
-line 3
-line 4
-line5
-line 1
-line 2
-line 3
-line 4
-line5
diff --git a/bin/ed/test/w.t b/bin/ed/test/w.t
deleted file mode 100644
index c2e18bd2f65..00000000000
--- a/bin/ed/test/w.t
+++ /dev/null
@@ -1,2 +0,0 @@
-w !cat >\!.z
-r \!.z
diff --git a/bin/ed/test/w1.err b/bin/ed/test/w1.err
deleted file mode 100644
index e2c8a603f7e..00000000000
--- a/bin/ed/test/w1.err
+++ /dev/null
@@ -1 +0,0 @@
-w /to/some/far-away/place
diff --git a/bin/ed/test/w2.err b/bin/ed/test/w2.err
deleted file mode 100644
index 9daf89cfa71..00000000000
--- a/bin/ed/test/w2.err
+++ /dev/null
@@ -1 +0,0 @@
-ww.o
diff --git a/bin/ed/test/w3.err b/bin/ed/test/w3.err
deleted file mode 100644
index 39bbf4c95b9..00000000000
--- a/bin/ed/test/w3.err
+++ /dev/null
@@ -1 +0,0 @@
-wqp w.o
diff --git a/bin/ed/test/x.err b/bin/ed/test/x.err
deleted file mode 100644
index 0953f01dd07..00000000000
--- a/bin/ed/test/x.err
+++ /dev/null
@@ -1 +0,0 @@
-.x
diff --git a/bin/ed/test/z.err b/bin/ed/test/z.err
deleted file mode 100644
index 6a51a2d5830..00000000000
--- a/bin/ed/test/z.err
+++ /dev/null
@@ -1,2 +0,0 @@
-z
-z
diff --git a/regress/bin/ed/Makefile b/regress/bin/ed/Makefile
index a4654d502da..b4c0230f1e5 100644
--- a/regress/bin/ed/Makefile
+++ b/regress/bin/ed/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.3 2020/12/17 00:51:11 bluhm Exp $
+# $OpenBSD: Makefile,v 1.4 2024/08/19 01:43:23 deraadt Exp $
 
 ED ?=		/bin/ed
-TESTDIR =	${.CURDIR}/../../../bin/ed/test
+TESTDIR =	${.CURDIR}
 
 TS !=		cd ${TESTDIR} && ls *.t
 ERRS !=		cd ${TESTDIR} && ls *.err
diff --git a/regress/bin/ed/README b/regress/bin/ed/README
new file mode 100644
index 00000000000..aba7599c53e
--- /dev/null
+++ b/regress/bin/ed/README
@@ -0,0 +1,33 @@
+$OpenBSD: README,v 1.1 2024/08/19 01:43:23 deraadt Exp $
+$NetBSD: README,v 1.8 1995/03/21 09:05:18 cgd Exp $
+
+The files in this directory with suffixes `.t', `.d', `.r' and `.err' are
+used for testing ed.  To run the tests, set the ED variable in the Makefile
+for the path name of the program to be tested (e.g., /bin/ed), and type
+`make'.  The tests do not exhaustively verify POSIX compliance nor do
+they verify correct 8-bit or long line support.
+
+The test file suffixes have the following meanings:
+.t    Template - a list of ed commands from which an ed script is
+      constructed
+.d    Data - read by an ed script
+.r    Result - the expected output after processing data via an ed
+      script.
+.err  Error - invalid ed commands that should generate an error
+
+The output of the tests is written to the two files err.o and scripts.o.
+At the end of the tests, these files are grep'ed for error messages,
+which look like:
+	*** The script u.ed exited abnormally ***
+or:
+	*** Output u.o of script u.ed is incorrect ***
+
+The POSIX requirement that an address range not be used where at most
+a single address is expected has been relaxed in this version of ed.
+Therefore, the  following scripts  which test for compliance with this
+POSIX rule exit abnormally:
+a1-err.ed
+eq-err.ed
+i1-err.ed
+k1-err.ed
+r1-err.ed
diff --git a/regress/bin/ed/TODO b/regress/bin/ed/TODO
new file mode 100644
index 00000000000..cb566f64155
--- /dev/null
+++ b/regress/bin/ed/TODO
@@ -0,0 +1,18 @@
+$OpenBSD: TODO,v 1.1 2024/08/19 01:43:23 deraadt Exp $
+$NetBSD: TODO,v 1.3 1995/03/21 09:05:20 cgd Exp $
+
+Some missing tests:
+0) g/./s^@^@	- okay: NULs in commands
+1) g/./s/^@/	- okay: NULs in patterns
+2) a
+   hello^V^Jworld	
+   .		- okay: embedded newlines in insert mode
+3) ed ""	- error: invalid filename
+4) red ..	- error: restricted
+5) red /	- error: restricted
+5) red !xx	- error: restricted
+6) ed -x 	- verify: 8-bit clean
+7) ed		- verify: long-line support
+8) ed		- verify: interactive/help mode
+9) G/pat/	- verify: global interactive command
+10) V/pat/	- verify: global interactive command
diff --git a/regress/bin/ed/a.d b/regress/bin/ed/a.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/a.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/a.r b/regress/bin/ed/a.r
new file mode 100644
index 00000000000..26257bd3b3c
--- /dev/null
+++ b/regress/bin/ed/a.r
@@ -0,0 +1,8 @@
+hello world
+line 1
+hello world!
+line 2
+line 3
+line 4
+line5
+hello world!!
diff --git a/regress/bin/ed/a.t b/regress/bin/ed/a.t
new file mode 100644
index 00000000000..ac98c40d085
--- /dev/null
+++ b/regress/bin/ed/a.t
@@ -0,0 +1,9 @@
+0a
+hello world
+.
+2a
+hello world!
+.
+$a
+hello world!!
+.
diff --git a/regress/bin/ed/a1.err b/regress/bin/ed/a1.err
new file mode 100644
index 00000000000..e80815ff50d
--- /dev/null
+++ b/regress/bin/ed/a1.err
@@ -0,0 +1,3 @@
+1,$a
+hello world
+.
diff --git a/regress/bin/ed/a2.err b/regress/bin/ed/a2.err
new file mode 100644
index 00000000000..ec4b00b40c4
--- /dev/null
+++ b/regress/bin/ed/a2.err
@@ -0,0 +1,3 @@
+aa
+hello world
+.
diff --git a/regress/bin/ed/addr.d b/regress/bin/ed/addr.d
new file mode 100644
index 00000000000..8f7ba1b5d35
--- /dev/null
+++ b/regress/bin/ed/addr.d
@@ -0,0 +1,9 @@
+line 1
+line 2
+line 3
+line 4
+line5
+1ine6
+line7
+line8
+line9
diff --git a/regress/bin/ed/addr.r b/regress/bin/ed/addr.r
new file mode 100644
index 00000000000..04caf17f422
--- /dev/null
+++ b/regress/bin/ed/addr.r
@@ -0,0 +1,2 @@
+line 2
+line9
diff --git a/regress/bin/ed/addr.t b/regress/bin/ed/addr.t
new file mode 100644
index 00000000000..750b224ed88
--- /dev/null
+++ b/regress/bin/ed/addr.t
@@ -0,0 +1,5 @@
+1 d
+1 1 d
+1,2,d
+1;+ + ,d
+1,2;., + 2d
diff --git a/regress/bin/ed/addr1.err b/regress/bin/ed/addr1.err
new file mode 100644
index 00000000000..29d6383b52c
--- /dev/null
+++ b/regress/bin/ed/addr1.err
@@ -0,0 +1 @@
+100
diff --git a/regress/bin/ed/addr2.err b/regress/bin/ed/addr2.err
new file mode 100644
index 00000000000..e96acb9254b
--- /dev/null
+++ b/regress/bin/ed/addr2.err
@@ -0,0 +1 @@
+-100
diff --git a/regress/bin/ed/ascii.d b/regress/bin/ed/ascii.d
new file mode 100644
index 00000000000..c86626638e0
Binary files /dev/null and b/regress/bin/ed/ascii.d differ
diff --git a/regress/bin/ed/ascii.r b/regress/bin/ed/ascii.r
new file mode 100644
index 00000000000..c86626638e0
Binary files /dev/null and b/regress/bin/ed/ascii.r differ
diff --git a/regress/bin/ed/ascii.t b/regress/bin/ed/ascii.t
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/bang1.d b/regress/bin/ed/bang1.d
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/bang1.err b/regress/bin/ed/bang1.err
new file mode 100644
index 00000000000..630af9011c9
--- /dev/null
+++ b/regress/bin/ed/bang1.err
@@ -0,0 +1 @@
+.!date
diff --git a/regress/bin/ed/bang1.r b/regress/bin/ed/bang1.r
new file mode 100644
index 00000000000..dcf02b2fb6b
--- /dev/null
+++ b/regress/bin/ed/bang1.r
@@ -0,0 +1 @@
+okay
diff --git a/regress/bin/ed/bang1.t b/regress/bin/ed/bang1.t
new file mode 100644
index 00000000000..d7b1fea1f7f
--- /dev/null
+++ b/regress/bin/ed/bang1.t
@@ -0,0 +1,5 @@
+!read one
+hello, world
+a
+okay
+.
diff --git a/regress/bin/ed/bang2.err b/regress/bin/ed/bang2.err
new file mode 100644
index 00000000000..79d89568222
--- /dev/null
+++ b/regress/bin/ed/bang2.err
@@ -0,0 +1 @@
+!!
diff --git a/regress/bin/ed/c.d b/regress/bin/ed/c.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/c.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/c.r b/regress/bin/ed/c.r
new file mode 100644
index 00000000000..0fb3e4fffc0
--- /dev/null
+++ b/regress/bin/ed/c.r
@@ -0,0 +1,4 @@
+at the top
+between top/middle
+in the middle
+at the bottom
diff --git a/regress/bin/ed/c.t b/regress/bin/ed/c.t
new file mode 100644
index 00000000000..ebdd536f817
--- /dev/null
+++ b/regress/bin/ed/c.t
@@ -0,0 +1,12 @@
+1c
+at the top
+.
+4c
+in the middle
+.
+$c
+at the bottom
+.
+2,3c
+between top/middle
+.
diff --git a/regress/bin/ed/c1.err b/regress/bin/ed/c1.err
new file mode 100644
index 00000000000..658ec38b464
--- /dev/null
+++ b/regress/bin/ed/c1.err
@@ -0,0 +1,3 @@
+cc
+hello world
+.
diff --git a/regress/bin/ed/c2.err b/regress/bin/ed/c2.err
new file mode 100644
index 00000000000..24b322776a6
--- /dev/null
+++ b/regress/bin/ed/c2.err
@@ -0,0 +1,3 @@
+0c
+hello world
+.
diff --git a/regress/bin/ed/ckscripts.sh b/regress/bin/ed/ckscripts.sh
new file mode 100644
index 00000000000..a8ee9e7b73b
--- /dev/null
+++ b/regress/bin/ed/ckscripts.sh
@@ -0,0 +1,38 @@
+#!/bin/sh -
+#	$OpenBSD: ckscripts.sh,v 1.1 2024/08/19 01:43:23 deraadt Exp $
+#	$NetBSD: ckscripts.sh,v 1.9 1995/04/23 10:07:34 cgd Exp $
+#
+# This script runs the .ed scripts generated by mkscripts.sh
+# and compares their output against the .r files, which contain
+# the correct output
+
+PATH="/bin:/usr/bin:/usr/local/bin/:."
+ED=$1
+[ ! -x $ED ] && { echo "$ED: cannot execute"; exit 1; }
+
+# Run the *.red scripts first, since these don't generate output;
+# they exit with non-zero status
+for i in *.red; do
+	echo $i
+	if $i; then
+		echo "*** The script $i exited abnormally  ***"
+	fi
+done >errs.o 2>&1
+
+# Run the remaining scripts; they exit with zero status
+for i in *.ed; do
+#	base=`expr $i : '\([^.]*\)'`
+#	base=`echo $i | sed 's/\..*//'`
+	base=`$ED - \!"echo $i" <<-EOF
+		s/\..*
+	EOF`
+	if $base.ed; then
+		if cmp -s $base.o $base.r; then :; else
+			echo "*** Output $base.o of script $i is incorrect ***"
+		fi
+	else
+		echo "*** The script $i exited abnormally ***"
+	fi
+done >scripts.o 2>&1
+
+grep -h '\*\*\*' errs.o scripts.o
diff --git a/regress/bin/ed/d.d b/regress/bin/ed/d.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/d.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/d.err b/regress/bin/ed/d.err
new file mode 100644
index 00000000000..f03f6945fbf
--- /dev/null
+++ b/regress/bin/ed/d.err
@@ -0,0 +1 @@
+dd
diff --git a/regress/bin/ed/d.r b/regress/bin/ed/d.r
new file mode 100644
index 00000000000..b7e242c00cd
--- /dev/null
+++ b/regress/bin/ed/d.r
@@ -0,0 +1 @@
+line 2
diff --git a/regress/bin/ed/d.t b/regress/bin/ed/d.t
new file mode 100644
index 00000000000..c7c473febdf
--- /dev/null
+++ b/regress/bin/ed/d.t
@@ -0,0 +1,3 @@
+1d
+2;+1d
+$d
diff --git a/regress/bin/ed/d0.d b/regress/bin/ed/d0.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/d0.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/d0.r b/regress/bin/ed/d0.r
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/d0.t b/regress/bin/ed/d0.t
new file mode 100644
index 00000000000..5725f1046d0
--- /dev/null
+++ b/regress/bin/ed/d0.t
@@ -0,0 +1 @@
+,d
diff --git a/regress/bin/ed/d1.d b/regress/bin/ed/d1.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/d1.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/d1.r b/regress/bin/ed/d1.r
new file mode 100644
index 00000000000..071c8f373dd
--- /dev/null
+++ b/regress/bin/ed/d1.r
@@ -0,0 +1,2 @@
+line 4
+line5
diff --git a/regress/bin/ed/d1.t b/regress/bin/ed/d1.t
new file mode 100644
index 00000000000..0bdfc29e1f2
--- /dev/null
+++ b/regress/bin/ed/d1.t
@@ -0,0 +1 @@
+,3d
diff --git a/regress/bin/ed/d2.d b/regress/bin/ed/d2.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/d2.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/d2.r b/regress/bin/ed/d2.r
new file mode 100644
index 00000000000..c29a1e3b9d8
--- /dev/null
+++ b/regress/bin/ed/d2.r
@@ -0,0 +1,4 @@
+line 1
+line 2
+line 4
+line5
diff --git a/regress/bin/ed/d2.t b/regress/bin/ed/d2.t
new file mode 100644
index 00000000000..34a3f8d0e42
--- /dev/null
+++ b/regress/bin/ed/d2.t
@@ -0,0 +1 @@
+3,d
diff --git a/regress/bin/ed/d3.d b/regress/bin/ed/d3.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/d3.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/d3.r b/regress/bin/ed/d3.r
new file mode 100644
index 00000000000..89b24ecec50
--- /dev/null
+++ b/regress/bin/ed/d3.r
@@ -0,0 +1 @@
+line 1
diff --git a/regress/bin/ed/d3.t b/regress/bin/ed/d3.t
new file mode 100644
index 00000000000..50996be51db
--- /dev/null
+++ b/regress/bin/ed/d3.t
@@ -0,0 +1,2 @@
+2
+;d
diff --git a/regress/bin/ed/d4.d b/regress/bin/ed/d4.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/d4.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/d4.r b/regress/bin/ed/d4.r
new file mode 100644
index 00000000000..0d1bbcfdc85
--- /dev/null
+++ b/regress/bin/ed/d4.r
@@ -0,0 +1,3 @@
+line 1
+line 4
+line5
diff --git a/regress/bin/ed/d4.t b/regress/bin/ed/d4.t
new file mode 100644
index 00000000000..9ebddc6a110
--- /dev/null
+++ b/regress/bin/ed/d4.t
@@ -0,0 +1,2 @@
+2
+;3d
diff --git a/regress/bin/ed/d5.d b/regress/bin/ed/d5.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/d5.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/d5.r b/regress/bin/ed/d5.r
new file mode 100644
index 00000000000..c29a1e3b9d8
--- /dev/null
+++ b/regress/bin/ed/d5.r
@@ -0,0 +1,4 @@
+line 1
+line 2
+line 4
+line5
diff --git a/regress/bin/ed/d5.t b/regress/bin/ed/d5.t
new file mode 100644
index 00000000000..ef303a6e3ff
--- /dev/null
+++ b/regress/bin/ed/d5.t
@@ -0,0 +1,2 @@
+4
+3;d
diff --git a/regress/bin/ed/e1.d b/regress/bin/ed/e1.d
new file mode 100644
index 00000000000..3b18e512dba
--- /dev/null
+++ b/regress/bin/ed/e1.d
@@ -0,0 +1 @@
+hello world
diff --git a/regress/bin/ed/e1.err b/regress/bin/ed/e1.err
new file mode 100644
index 00000000000..827cc292b6b
--- /dev/null
+++ b/regress/bin/ed/e1.err
@@ -0,0 +1 @@
+ee e1.err
diff --git a/regress/bin/ed/e1.r b/regress/bin/ed/e1.r
new file mode 100644
index 00000000000..e656728bab2
--- /dev/null
+++ b/regress/bin/ed/e1.r
@@ -0,0 +1 @@
+E e1.t
diff --git a/regress/bin/ed/e1.t b/regress/bin/ed/e1.t
new file mode 100644
index 00000000000..e656728bab2
--- /dev/null
+++ b/regress/bin/ed/e1.t
@@ -0,0 +1 @@
+E e1.t
diff --git a/regress/bin/ed/e2.d b/regress/bin/ed/e2.d
new file mode 100644
index 00000000000..aa44630d22a
--- /dev/null
+++ b/regress/bin/ed/e2.d
@@ -0,0 +1 @@
+E !echo hello world-
diff --git a/regress/bin/ed/e2.err b/regress/bin/ed/e2.err
new file mode 100644
index 00000000000..779a64b54ff
--- /dev/null
+++ b/regress/bin/ed/e2.err
@@ -0,0 +1 @@
+.e e2.err
diff --git a/regress/bin/ed/e2.r b/regress/bin/ed/e2.r
new file mode 100644
index 00000000000..59ebf11fd09
--- /dev/null
+++ b/regress/bin/ed/e2.r
@@ -0,0 +1 @@
+hello world-
diff --git a/regress/bin/ed/e2.t b/regress/bin/ed/e2.t
new file mode 100644
index 00000000000..aa44630d22a
--- /dev/null
+++ b/regress/bin/ed/e2.t
@@ -0,0 +1 @@
+E !echo hello world-
diff --git a/regress/bin/ed/e3.d b/regress/bin/ed/e3.d
new file mode 100644
index 00000000000..aa44630d22a
--- /dev/null
+++ b/regress/bin/ed/e3.d
@@ -0,0 +1 @@
+E !echo hello world-
diff --git a/regress/bin/ed/e3.err b/regress/bin/ed/e3.err
new file mode 100644
index 00000000000..80a7fdcf92e
--- /dev/null
+++ b/regress/bin/ed/e3.err
@@ -0,0 +1 @@
+ee.err
diff --git a/regress/bin/ed/e3.r b/regress/bin/ed/e3.r
new file mode 100644
index 00000000000..aa44630d22a
--- /dev/null
+++ b/regress/bin/ed/e3.r
@@ -0,0 +1 @@
+E !echo hello world-
diff --git a/regress/bin/ed/e3.t b/regress/bin/ed/e3.t
new file mode 100644
index 00000000000..1c507261389
--- /dev/null
+++ b/regress/bin/ed/e3.t
@@ -0,0 +1 @@
+E
diff --git a/regress/bin/ed/e4.d b/regress/bin/ed/e4.d
new file mode 100644
index 00000000000..aa44630d22a
--- /dev/null
+++ b/regress/bin/ed/e4.d
@@ -0,0 +1 @@
+E !echo hello world-
diff --git a/regress/bin/ed/e4.r b/regress/bin/ed/e4.r
new file mode 100644
index 00000000000..aa44630d22a
--- /dev/null
+++ b/regress/bin/ed/e4.r
@@ -0,0 +1 @@
+E !echo hello world-
diff --git a/regress/bin/ed/e4.t b/regress/bin/ed/e4.t
new file mode 100644
index 00000000000..d905d9da82c
--- /dev/null
+++ b/regress/bin/ed/e4.t
@@ -0,0 +1 @@
+e
diff --git a/regress/bin/ed/eq.err b/regress/bin/ed/eq.err
new file mode 100644
index 00000000000..6a6055955b1
--- /dev/null
+++ b/regress/bin/ed/eq.err
@@ -0,0 +1 @@
+1,$=
diff --git a/regress/bin/ed/f1.err b/regress/bin/ed/f1.err
new file mode 100644
index 00000000000..e60975adabb
--- /dev/null
+++ b/regress/bin/ed/f1.err
@@ -0,0 +1 @@
+.f f1.err
diff --git a/regress/bin/ed/f2.err b/regress/bin/ed/f2.err
new file mode 100644
index 00000000000..26d1c5e3a75
--- /dev/null
+++ b/regress/bin/ed/f2.err
@@ -0,0 +1 @@
+ff1.err
diff --git a/regress/bin/ed/g1.d b/regress/bin/ed/g1.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/g1.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/g1.err b/regress/bin/ed/g1.err
new file mode 100644
index 00000000000..f95ea22232c
--- /dev/null
+++ b/regress/bin/ed/g1.err
@@ -0,0 +1 @@
+g/./s //x/
diff --git a/regress/bin/ed/g1.r b/regress/bin/ed/g1.r
new file mode 100644
index 00000000000..578a44b6b21
--- /dev/null
+++ b/regress/bin/ed/g1.r
@@ -0,0 +1,15 @@
+line5
+help! world
+order
+line 4
+help! world
+order
+line 3
+help! world
+order
+line 2
+help! world
+order
+line 1
+help! world
+order
diff --git a/regress/bin/ed/g1.t b/regress/bin/ed/g1.t
new file mode 100644
index 00000000000..2d0b54f35ad
--- /dev/null
+++ b/regress/bin/ed/g1.t
@@ -0,0 +1,6 @@
+g/./m0
+g/./s/$/\
+hello world
+g/hello /s/lo/p!/\
+a\
+order
diff --git a/regress/bin/ed/g2.d b/regress/bin/ed/g2.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/g2.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/g2.err b/regress/bin/ed/g2.err
new file mode 100644
index 00000000000..0ff6a5a601d
--- /dev/null
+++ b/regress/bin/ed/g2.err
@@ -0,0 +1 @@
+g//s/./x/
diff --git a/regress/bin/ed/g2.r b/regress/bin/ed/g2.r
new file mode 100644
index 00000000000..3b18e512dba
--- /dev/null
+++ b/regress/bin/ed/g2.r
@@ -0,0 +1 @@
+hello world
diff --git a/regress/bin/ed/g2.t b/regress/bin/ed/g2.t
new file mode 100644
index 00000000000..831ee8367bc
--- /dev/null
+++ b/regress/bin/ed/g2.t
@@ -0,0 +1,2 @@
+g/[2-4]/-1,+1c\
+hello world
diff --git a/regress/bin/ed/g3.d b/regress/bin/ed/g3.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/g3.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/g3.err b/regress/bin/ed/g3.err
new file mode 100644
index 00000000000..01058d844a9
--- /dev/null
+++ b/regress/bin/ed/g3.err
@@ -0,0 +1 @@
+g
diff --git a/regress/bin/ed/g3.r b/regress/bin/ed/g3.r
new file mode 100644
index 00000000000..cc6fbddec23
--- /dev/null
+++ b/regress/bin/ed/g3.r
@@ -0,0 +1,5 @@
+linc 3
+xine 1
+xine 2
+xinc 4
+xinc5
diff --git a/regress/bin/ed/g3.t b/regress/bin/ed/g3.t
new file mode 100644
index 00000000000..2d052a6e840
--- /dev/null
+++ b/regress/bin/ed/g3.t
@@ -0,0 +1,4 @@
+g/./s//x/\
+3m0
+g/./s/e/c/\
+2,3m1
diff --git a/regress/bin/ed/g4.d b/regress/bin/ed/g4.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/g4.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/g4.r b/regress/bin/ed/g4.r
new file mode 100644
index 00000000000..350882d8237
--- /dev/null
+++ b/regress/bin/ed/g4.r
@@ -0,0 +1,7 @@
+hello
+zine 1
+line 2
+line 3
+line 4
+line5
+world
diff --git a/regress/bin/ed/g4.t b/regress/bin/ed/g4.t
new file mode 100644
index 00000000000..ec618166cc3
--- /dev/null
+++ b/regress/bin/ed/g4.t
@@ -0,0 +1,13 @@
+g/./s/./x/\
+u\
+s/./y/\
+u\
+s/./z/\
+u
+u
+0a
+hello
+.
+$a
+world
+.
diff --git a/regress/bin/ed/g5.d b/regress/bin/ed/g5.d
new file mode 100644
index 00000000000..a92d664bc20
--- /dev/null
+++ b/regress/bin/ed/g5.d
@@ -0,0 +1,3 @@
+line 1
+line 2
+line 3
diff --git a/regress/bin/ed/g5.r b/regress/bin/ed/g5.r
new file mode 100644
index 00000000000..15a26758bac
--- /dev/null
+++ b/regress/bin/ed/g5.r
@@ -0,0 +1,9 @@
+line 1
+line 2
+line 3
+line 2
+line 3
+line 1
+line 3
+line 1
+line 2
diff --git a/regress/bin/ed/g5.t b/regress/bin/ed/g5.t
new file mode 100644
index 00000000000..e213481d54c
--- /dev/null
+++ b/regress/bin/ed/g5.t
@@ -0,0 +1,2 @@
+g/./1,3t$\
+1d
diff --git a/regress/bin/ed/h.err b/regress/bin/ed/h.err
new file mode 100644
index 00000000000..a71e506f6dd
--- /dev/null
+++ b/regress/bin/ed/h.err
@@ -0,0 +1 @@
+.h
diff --git a/regress/bin/ed/i.d b/regress/bin/ed/i.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/i.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/i.r b/regress/bin/ed/i.r
new file mode 100644
index 00000000000..5f27af09c03
--- /dev/null
+++ b/regress/bin/ed/i.r
@@ -0,0 +1,8 @@
+hello world
+hello world!
+line 1
+line 2
+line 3
+line 4
+hello world!!
+line5
diff --git a/regress/bin/ed/i.t b/regress/bin/ed/i.t
new file mode 100644
index 00000000000..d1d98057d88
--- /dev/null
+++ b/regress/bin/ed/i.t
@@ -0,0 +1,9 @@
+1i
+hello world
+.
+2i
+hello world!
+.
+$i
+hello world!!
+.
diff --git a/regress/bin/ed/i0.d b/regress/bin/ed/i0.d
new file mode 100644
index 00000000000..a29bdeb434d
--- /dev/null
+++ b/regress/bin/ed/i0.d
@@ -0,0 +1 @@
+line1
diff --git a/regress/bin/ed/i0.r b/regress/bin/ed/i0.r
new file mode 100644
index 00000000000..0134f398791
--- /dev/null
+++ b/regress/bin/ed/i0.r
@@ -0,0 +1,2 @@
+hello world
+line1
diff --git a/regress/bin/ed/i0.t b/regress/bin/ed/i0.t
new file mode 100644
index 00000000000..6d200c8c97e
--- /dev/null
+++ b/regress/bin/ed/i0.t
@@ -0,0 +1,3 @@
+0i
+hello world
+.
diff --git a/regress/bin/ed/i1.err b/regress/bin/ed/i1.err
new file mode 100644
index 00000000000..aaddede2599
--- /dev/null
+++ b/regress/bin/ed/i1.err
@@ -0,0 +1,3 @@
+1,$i
+hello world
+.
diff --git a/regress/bin/ed/i2.err b/regress/bin/ed/i2.err
new file mode 100644
index 00000000000..b63f5ac507f
--- /dev/null
+++ b/regress/bin/ed/i2.err
@@ -0,0 +1,3 @@
+ii
+hello world
+.
diff --git a/regress/bin/ed/j.d b/regress/bin/ed/j.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/j.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/j.r b/regress/bin/ed/j.r
new file mode 100644
index 00000000000..66f36a8f8ab
--- /dev/null
+++ b/regress/bin/ed/j.r
@@ -0,0 +1,4 @@
+line 1
+line 2line 3
+line 4
+line5
diff --git a/regress/bin/ed/j.t b/regress/bin/ed/j.t
new file mode 100644
index 00000000000..9b5d28ddf17
--- /dev/null
+++ b/regress/bin/ed/j.t
@@ -0,0 +1,2 @@
+1,1j
+2,3j
diff --git a/regress/bin/ed/k.d b/regress/bin/ed/k.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/k.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/k.r b/regress/bin/ed/k.r
new file mode 100644
index 00000000000..eeb38db20c6
--- /dev/null
+++ b/regress/bin/ed/k.r
@@ -0,0 +1,5 @@
+line 3
+hello world
+line 4
+line5
+line 2
diff --git a/regress/bin/ed/k.t b/regress/bin/ed/k.t
new file mode 100644
index 00000000000..53d588dd07a
--- /dev/null
+++ b/regress/bin/ed/k.t
@@ -0,0 +1,10 @@
+2ka
+1d
+'am$
+1ka
+0a
+hello world
+.
+'ad
+u
+'am0
diff --git a/regress/bin/ed/k1.err b/regress/bin/ed/k1.err
new file mode 100644
index 00000000000..eba1f3d8ff1
--- /dev/null
+++ b/regress/bin/ed/k1.err
@@ -0,0 +1 @@
+1,$ka
diff --git a/regress/bin/ed/k2.err b/regress/bin/ed/k2.err
new file mode 100644
index 00000000000..b34a18d5195
--- /dev/null
+++ b/regress/bin/ed/k2.err
@@ -0,0 +1 @@
+kA
diff --git a/regress/bin/ed/k3.err b/regress/bin/ed/k3.err
new file mode 100644
index 00000000000..70190c473df
--- /dev/null
+++ b/regress/bin/ed/k3.err
@@ -0,0 +1 @@
+0ka
diff --git a/regress/bin/ed/k4.err b/regress/bin/ed/k4.err
new file mode 100644
index 00000000000..34576422294
--- /dev/null
+++ b/regress/bin/ed/k4.err
@@ -0,0 +1,6 @@
+a
+hello
+.
+.ka
+'ad
+'ap
diff --git a/regress/bin/ed/l.d b/regress/bin/ed/l.d
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/l.r b/regress/bin/ed/l.r
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/l.t b/regress/bin/ed/l.t
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/m.d b/regress/bin/ed/m.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/m.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/m.err b/regress/bin/ed/m.err
new file mode 100644
index 00000000000..3aec4c32c1f
--- /dev/null
+++ b/regress/bin/ed/m.err
@@ -0,0 +1,4 @@
+a
+hello world
+.
+1,$m1
diff --git a/regress/bin/ed/m.r b/regress/bin/ed/m.r
new file mode 100644
index 00000000000..186cf5403b9
--- /dev/null
+++ b/regress/bin/ed/m.r
@@ -0,0 +1,5 @@
+line5
+line 1
+line 2
+line 3
+line 4
diff --git a/regress/bin/ed/m.t b/regress/bin/ed/m.t
new file mode 100644
index 00000000000..c39c0887245
--- /dev/null
+++ b/regress/bin/ed/m.t
@@ -0,0 +1,7 @@
+1,2m$
+1,2m$
+1,2m$
+$m0
+$m0
+2,3m1
+2,3m3
diff --git a/regress/bin/ed/mkscripts.sh b/regress/bin/ed/mkscripts.sh
new file mode 100644
index 00000000000..25c0a0a2401
--- /dev/null
+++ b/regress/bin/ed/mkscripts.sh
@@ -0,0 +1,76 @@
+#!/bin/sh -
+#	$OpenBSD: mkscripts.sh,v 1.1 2024/08/19 01:43:23 deraadt Exp $
+#	$NetBSD: mkscripts.sh,v 1.10 1995/04/23 10:07:36 cgd Exp $
+#
+# This script generates ed test scripts (.ed) from .t files
+
+PATH="/bin:/usr/bin:/usr/local/bin/:."
+ED=$1
+[ ! -x $ED ] && { echo "$ED: cannot execute"; exit 1; }
+
+for i in *.t; do
+#	base=${i%.*}
+#	base=`echo $i | sed 's/\..*//'`
+#	base=`expr $i : '\([^.]*\)'`
+#	(
+#	echo "#!/bin/sh -"
+#	echo "$ED - <<\EOT"
+#	echo "r $base.d"
+#	cat $i
+#	echo "w $base.o"
+#	echo EOT
+#	) >$base.ed
+#	chmod +x $base.ed
+# The following is pretty ugly way of doing the above, and not appropriate 
+# use of ed  but the point is that it can be done...
+	base=`$ED - \!"echo $i" <<-EOF
+		s/\..*
+	EOF`
+	$ED - <<-EOF
+		a
+		#!/bin/sh -
+		$ED - <<\EOT
+		H
+		r $base.d
+		w $base.o
+		EOT
+		.
+		-2r $i
+		w $base.ed
+		!chmod +x $base.ed
+	EOF
+done
+
+for i in *.err; do
+#	base=${i%.*}
+#	base=`echo $i | sed 's/\..*//'`
+#	base=`expr $i : '\([^.]*\)'`
+#	(
+#	echo "#!/bin/sh -"
+#	echo "$ED - <<\EOT"
+#	echo H
+#	echo "r $base.err"
+#	cat $i
+#	echo "w $base.o"
+#	echo EOT
+#	) >$base-err.ed
+#	chmod +x $base-err.ed
+# The following is pretty ugly way of doing the above, and not appropriate 
+# use of ed  but the point is that it can be done...
+	base=`$ED - \!"echo $i" <<-EOF
+		s/\..*
+	EOF`
+	$ED - <<-EOF
+		a
+		#!/bin/sh -
+		$ED - <<\EOT
+		H
+		r $base.err
+		w $base.o
+		EOT
+		.
+		-2r $i
+		w ${base}.red
+		!chmod +x ${base}.red
+	EOF
+done
diff --git a/regress/bin/ed/n.d b/regress/bin/ed/n.d
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/n.r b/regress/bin/ed/n.r
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/n.t b/regress/bin/ed/n.t
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/nl1.d b/regress/bin/ed/nl1.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/nl1.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/nl1.r b/regress/bin/ed/nl1.r
new file mode 100644
index 00000000000..9d8854cd04d
--- /dev/null
+++ b/regress/bin/ed/nl1.r
@@ -0,0 +1,8 @@
+
+
+hello world
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/nl1.t b/regress/bin/ed/nl1.t
new file mode 100644
index 00000000000..ea192e9b829
--- /dev/null
+++ b/regress/bin/ed/nl1.t
@@ -0,0 +1,8 @@
+1
+
+
+0a
+
+
+hello world
+.
diff --git a/regress/bin/ed/nl2.d b/regress/bin/ed/nl2.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/nl2.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/nl2.r b/regress/bin/ed/nl2.r
new file mode 100644
index 00000000000..fe99e416286
--- /dev/null
+++ b/regress/bin/ed/nl2.r
@@ -0,0 +1,6 @@
+line 1
+line 2
+line 3
+line 4
+line5
+hello world
diff --git a/regress/bin/ed/nl2.t b/regress/bin/ed/nl2.t
new file mode 100644
index 00000000000..73fd27b7e23
--- /dev/null
+++ b/regress/bin/ed/nl2.t
@@ -0,0 +1,4 @@
+a
+hello world
+.
+0;/./
diff --git a/regress/bin/ed/p.d b/regress/bin/ed/p.d
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/p.r b/regress/bin/ed/p.r
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/p.t b/regress/bin/ed/p.t
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/q.d b/regress/bin/ed/q.d
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/q.r b/regress/bin/ed/q.r
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/q.t b/regress/bin/ed/q.t
new file mode 100644
index 00000000000..123a2c8e2cf
--- /dev/null
+++ b/regress/bin/ed/q.t
@@ -0,0 +1,5 @@
+w q.o
+a
+hello
+.
+q
diff --git a/regress/bin/ed/q1.err b/regress/bin/ed/q1.err
new file mode 100644
index 00000000000..0a7e178d206
--- /dev/null
+++ b/regress/bin/ed/q1.err
@@ -0,0 +1 @@
+.q
diff --git a/regress/bin/ed/r1.d b/regress/bin/ed/r1.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/r1.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/r1.err b/regress/bin/ed/r1.err
new file mode 100644
index 00000000000..269aa7cbcb8
--- /dev/null
+++ b/regress/bin/ed/r1.err
@@ -0,0 +1 @@
+1,$r r1.err
diff --git a/regress/bin/ed/r1.r b/regress/bin/ed/r1.r
new file mode 100644
index 00000000000..a3ff506ec7c
--- /dev/null
+++ b/regress/bin/ed/r1.r
@@ -0,0 +1,7 @@
+line 1
+hello world
+line 2
+line 3
+line 4
+line5
+hello world
diff --git a/regress/bin/ed/r1.t b/regress/bin/ed/r1.t
new file mode 100644
index 00000000000..d787a923e3f
--- /dev/null
+++ b/regress/bin/ed/r1.t
@@ -0,0 +1,3 @@
+1;r !echo hello world
+1
+r !echo hello world
diff --git a/regress/bin/ed/r2.d b/regress/bin/ed/r2.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/r2.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/r2.err b/regress/bin/ed/r2.err
new file mode 100644
index 00000000000..1c44fa3ea9c
--- /dev/null
+++ b/regress/bin/ed/r2.err
@@ -0,0 +1 @@
+r a-good-book
diff --git a/regress/bin/ed/r2.r b/regress/bin/ed/r2.r
new file mode 100644
index 00000000000..ac152ba9d0a
--- /dev/null
+++ b/regress/bin/ed/r2.r
@@ -0,0 +1,10 @@
+line 1
+line 2
+line 3
+line 4
+line5
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/r2.t b/regress/bin/ed/r2.t
new file mode 100644
index 00000000000..4286f428e3b
--- /dev/null
+++ b/regress/bin/ed/r2.t
@@ -0,0 +1 @@
+r
diff --git a/regress/bin/ed/r3.d b/regress/bin/ed/r3.d
new file mode 100644
index 00000000000..593eec6192b
--- /dev/null
+++ b/regress/bin/ed/r3.d
@@ -0,0 +1 @@
+r r3.t
diff --git a/regress/bin/ed/r3.r b/regress/bin/ed/r3.r
new file mode 100644
index 00000000000..86d5f904fc1
--- /dev/null
+++ b/regress/bin/ed/r3.r
@@ -0,0 +1,2 @@
+r r3.t
+r r3.t
diff --git a/regress/bin/ed/r3.t b/regress/bin/ed/r3.t
new file mode 100644
index 00000000000..593eec6192b
--- /dev/null
+++ b/regress/bin/ed/r3.t
@@ -0,0 +1 @@
+r r3.t
diff --git a/regress/bin/ed/s1.d b/regress/bin/ed/s1.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/s1.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/s1.err b/regress/bin/ed/s1.err
new file mode 100644
index 00000000000..d7ca0cf480d
--- /dev/null
+++ b/regress/bin/ed/s1.err
@@ -0,0 +1 @@
+s . x
diff --git a/regress/bin/ed/s1.r b/regress/bin/ed/s1.r
new file mode 100644
index 00000000000..4eb0980cfe7
--- /dev/null
+++ b/regress/bin/ed/s1.r
@@ -0,0 +1,5 @@
+liene 1
+(liene) (2)
+(liene) (3)
+liene (4)
+(()liene5)
diff --git a/regress/bin/ed/s1.t b/regress/bin/ed/s1.t
new file mode 100644
index 00000000000..b0028bb6c92
--- /dev/null
+++ b/regress/bin/ed/s1.t
@@ -0,0 +1,6 @@
+s/\([^ ][^ ]*\)/(\1)/g
+2s
+/3/s
+/\(4\)/sr
+/\(.\)/srg
+%s/i/&e/
diff --git a/regress/bin/ed/s10.err b/regress/bin/ed/s10.err
new file mode 100644
index 00000000000..0d8d83de19a
--- /dev/null
+++ b/regress/bin/ed/s10.err
@@ -0,0 +1,4 @@
+a
+hello
+.
+s/[h[.]/x/
diff --git a/regress/bin/ed/s2.d b/regress/bin/ed/s2.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/s2.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/s2.r b/regress/bin/ed/s2.r
new file mode 100644
index 00000000000..ca305c8d506
--- /dev/null
+++ b/regress/bin/ed/s2.r
@@ -0,0 +1,5 @@
+li(n)e 1
+i(n)e 200
+li(n)e 3
+li(n)e 4
+li(n)e500
diff --git a/regress/bin/ed/s2.t b/regress/bin/ed/s2.t
new file mode 100644
index 00000000000..f36584997c9
--- /dev/null
+++ b/regress/bin/ed/s2.t
@@ -0,0 +1,4 @@
+,s/./(&)/3
+s/$/00
+2s//%/g
+s/^l
diff --git a/regress/bin/ed/s3.d b/regress/bin/ed/s3.d
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/regress/bin/ed/s3.err b/regress/bin/ed/s3.err
new file mode 100644
index 00000000000..d68c7d07f99
--- /dev/null
+++ b/regress/bin/ed/s3.err
@@ -0,0 +1 @@
+s/[xyx/a/
diff --git a/regress/bin/ed/s3.r b/regress/bin/ed/s3.r
new file mode 100644
index 00000000000..d6cada2212f
--- /dev/null
+++ b/regress/bin/ed/s3.r
@@ -0,0 +1 @@
+hello   world
diff --git a/regress/bin/ed/s3.t b/regress/bin/ed/s3.t
new file mode 100644
index 00000000000..fbf880304b7
--- /dev/null
+++ b/regress/bin/ed/s3.t
@@ -0,0 +1,6 @@
+a
+hello/[]world
+.
+s/[/]/ /
+s/[[:digit:][]/ /
+s/[]]/ /
diff --git a/regress/bin/ed/s4.d b/regress/bin/ed/s4.d
new file mode 100644
index 00000000000..78981922613
--- /dev/null
+++ b/regress/bin/ed/s4.d
@@ -0,0 +1 @@
+a
diff --git a/regress/bin/ed/s4.err b/regress/bin/ed/s4.err
new file mode 100644
index 00000000000..35b609fc625
--- /dev/null
+++ b/regress/bin/ed/s4.err
@@ -0,0 +1 @@
+s/\a\b\c/xyz/
diff --git a/regress/bin/ed/s4.r b/regress/bin/ed/s4.r
new file mode 100644
index 00000000000..86ae29c8445
--- /dev/null
+++ b/regress/bin/ed/s4.r
@@ -0,0 +1 @@
+ba
diff --git a/regress/bin/ed/s4.t b/regress/bin/ed/s4.t
new file mode 100644
index 00000000000..5e4fe76385b
--- /dev/null
+++ b/regress/bin/ed/s4.t
@@ -0,0 +1 @@
+s/x*/b/g
diff --git a/regress/bin/ed/s5.err b/regress/bin/ed/s5.err
new file mode 100644
index 00000000000..89104c55232
--- /dev/null
+++ b/regress/bin/ed/s5.err
@@ -0,0 +1 @@
+s//xyz/
diff --git a/regress/bin/ed/s6.err b/regress/bin/ed/s6.err
new file mode 100644
index 00000000000..b4785957bc9
--- /dev/null
+++ b/regress/bin/ed/s6.err
@@ -0,0 +1 @@
+s
diff --git a/regress/bin/ed/s7.err b/regress/bin/ed/s7.err
new file mode 100644
index 00000000000..30ba4fded76
--- /dev/null
+++ b/regress/bin/ed/s7.err
@@ -0,0 +1,5 @@
+a
+hello world
+.
+/./
+sr
diff --git a/regress/bin/ed/s8.err b/regress/bin/ed/s8.err
new file mode 100644
index 00000000000..5665767c3fa
--- /dev/null
+++ b/regress/bin/ed/s8.err
@@ -0,0 +1,4 @@
+a
+hello
+.
+s/[h[=]/x/
diff --git a/regress/bin/ed/s9.err b/regress/bin/ed/s9.err
new file mode 100644
index 00000000000..1ff16dd8470
--- /dev/null
+++ b/regress/bin/ed/s9.err
@@ -0,0 +1,4 @@
+a
+hello
+.
+s/[h[:]/x/
diff --git a/regress/bin/ed/t.d b/regress/bin/ed/t.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/t.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/t.r b/regress/bin/ed/t.r
new file mode 100644
index 00000000000..2b2854758d5
--- /dev/null
+++ b/regress/bin/ed/t.r
@@ -0,0 +1,16 @@
+line 1
+line 1
+line 1
+line 2
+line 2
+line 3
+line 4
+line5
+line 1
+line 1
+line 1
+line 2
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/t.t b/regress/bin/ed/t.t
new file mode 100644
index 00000000000..fcb1368bc29
--- /dev/null
+++ b/regress/bin/ed/t.t
@@ -0,0 +1,3 @@
+1t1
+2,3t2
+,t$
diff --git a/regress/bin/ed/t1.d b/regress/bin/ed/t1.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/t1.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/t1.err b/regress/bin/ed/t1.err
new file mode 100644
index 00000000000..c49c556e0e4
--- /dev/null
+++ b/regress/bin/ed/t1.err
@@ -0,0 +1 @@
+tt
diff --git a/regress/bin/ed/t1.r b/regress/bin/ed/t1.r
new file mode 100644
index 00000000000..2b2854758d5
--- /dev/null
+++ b/regress/bin/ed/t1.r
@@ -0,0 +1,16 @@
+line 1
+line 1
+line 1
+line 2
+line 2
+line 3
+line 4
+line5
+line 1
+line 1
+line 1
+line 2
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/t1.t b/regress/bin/ed/t1.t
new file mode 100644
index 00000000000..6b66163793a
--- /dev/null
+++ b/regress/bin/ed/t1.t
@@ -0,0 +1,3 @@
+1t0
+2,3t2
+,t$
diff --git a/regress/bin/ed/t2.d b/regress/bin/ed/t2.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/t2.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/t2.err b/regress/bin/ed/t2.err
new file mode 100644
index 00000000000..c202051b7f1
--- /dev/null
+++ b/regress/bin/ed/t2.err
@@ -0,0 +1 @@
+t0;-1
diff --git a/regress/bin/ed/t2.r b/regress/bin/ed/t2.r
new file mode 100644
index 00000000000..0c75ff554ca
--- /dev/null
+++ b/regress/bin/ed/t2.r
@@ -0,0 +1,6 @@
+line 1
+line5
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/t2.t b/regress/bin/ed/t2.t
new file mode 100644
index 00000000000..5175abdec90
--- /dev/null
+++ b/regress/bin/ed/t2.t
@@ -0,0 +1 @@
+t0;/./
diff --git a/regress/bin/ed/u.d b/regress/bin/ed/u.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/u.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/u.err b/regress/bin/ed/u.err
new file mode 100644
index 00000000000..caa1ba11488
--- /dev/null
+++ b/regress/bin/ed/u.err
@@ -0,0 +1 @@
+.u
diff --git a/regress/bin/ed/u.r b/regress/bin/ed/u.r
new file mode 100644
index 00000000000..ad558d82d02
--- /dev/null
+++ b/regress/bin/ed/u.r
@@ -0,0 +1,9 @@
+line 1
+hello
+hello world!!
+line 2
+line 3
+line 4
+line5
+hello
+hello world!!
diff --git a/regress/bin/ed/u.t b/regress/bin/ed/u.t
new file mode 100644
index 00000000000..131cb6e25c1
--- /dev/null
+++ b/regress/bin/ed/u.t
@@ -0,0 +1,31 @@
+1;r u.t
+u
+a
+hello
+world
+.
+g/./s//x/\
+a\
+hello\
+world
+u
+u
+u
+a
+hello world!
+.
+u
+1,$d
+u
+2,3d
+u
+c
+hello world!!
+.
+u
+u
+-1;.,+1j
+u
+u
+u
+.,+1t$
diff --git a/regress/bin/ed/v.d b/regress/bin/ed/v.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/v.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/v.r b/regress/bin/ed/v.r
new file mode 100644
index 00000000000..714db63e357
--- /dev/null
+++ b/regress/bin/ed/v.r
@@ -0,0 +1,11 @@
+line5
+order
+hello world
+line 1
+order
+line 2
+order
+line 3
+order
+line 4
+order
diff --git a/regress/bin/ed/v.t b/regress/bin/ed/v.t
new file mode 100644
index 00000000000..608a77fb6a4
--- /dev/null
+++ b/regress/bin/ed/v.t
@@ -0,0 +1,6 @@
+v/[ ]/m0
+v/[ ]/s/$/\
+hello world
+v/hello /s/lo/p!/\
+a\
+order
diff --git a/regress/bin/ed/w.d b/regress/bin/ed/w.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/regress/bin/ed/w.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/w.r b/regress/bin/ed/w.r
new file mode 100644
index 00000000000..ac152ba9d0a
--- /dev/null
+++ b/regress/bin/ed/w.r
@@ -0,0 +1,10 @@
+line 1
+line 2
+line 3
+line 4
+line5
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/regress/bin/ed/w.t b/regress/bin/ed/w.t
new file mode 100644
index 00000000000..c2e18bd2f65
--- /dev/null
+++ b/regress/bin/ed/w.t
@@ -0,0 +1,2 @@
+w !cat >\!.z
+r \!.z
diff --git a/regress/bin/ed/w1.err b/regress/bin/ed/w1.err
new file mode 100644
index 00000000000..e2c8a603f7e
--- /dev/null
+++ b/regress/bin/ed/w1.err
@@ -0,0 +1 @@
+w /to/some/far-away/place
diff --git a/regress/bin/ed/w2.err b/regress/bin/ed/w2.err
new file mode 100644
index 00000000000..9daf89cfa71
--- /dev/null
+++ b/regress/bin/ed/w2.err
@@ -0,0 +1 @@
+ww.o
diff --git a/regress/bin/ed/w3.err b/regress/bin/ed/w3.err
new file mode 100644
index 00000000000..39bbf4c95b9
--- /dev/null
+++ b/regress/bin/ed/w3.err
@@ -0,0 +1 @@
+wqp w.o
diff --git a/regress/bin/ed/x.err b/regress/bin/ed/x.err
new file mode 100644
index 00000000000..0953f01dd07
--- /dev/null
+++ b/regress/bin/ed/x.err
@@ -0,0 +1 @@
+.x
diff --git a/regress/bin/ed/z.err b/regress/bin/ed/z.err
new file mode 100644
index 00000000000..6a51a2d5830
--- /dev/null
+++ b/regress/bin/ed/z.err
@@ -0,0 +1,2 @@
+z
+z