initial import of NetBSD tree

177 files changed, 5548 insertions, 0 deletions

diff --git a/bin/ed/Makefile b/bin/ed/Makefile
new file mode 100644
index 00000000000..f8647dc0df5
--- /dev/null
+++ b/bin/ed/Makefile
@@ -0,0 +1,13 @@
+#	$NetBSD: Makefile,v 1.24 1995/03/21 09:04:30 cgd Exp $
+
+PROG=	ed
+CFLAGS+=-DBACKWARDS  #-DDES
+SRCS=	 buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
+
+LDADD+= -lcrypt
+DPADD+= ${LIBCRYPT}
+
+#LINKS=  ${BINDIR}/ed ${BINDIR}/red
+#MLINKS= ed.1 red.1
+
+.include <bsd.prog.mk>
diff --git a/bin/ed/POSIX b/bin/ed/POSIX
new file mode 100644
index 00000000000..f88def98356
--- /dev/null
+++ b/bin/ed/POSIX
@@ -0,0 +1,103 @@
+$NetBSD: POSIX,v 1.9 1995/03/21 09:04:32 cgd Exp $
+
+This version of ed(1) is not strictly POSIX compliant, as described in
+the POSIX 1003.2 document.  The following is a summary of the omissions,
+extensions and possible deviations from POSIX 1003.2.
+
+OMISSIONS
+---------
+1) Locale(3) is not supported yet.
+
+2) For backwards compatibility, the POSIX rule that says a range of
+   addresses cannot be used where only a single address is expected has
+   been relaxed.
+
+3) To support the BSD `s' command (see extension [1] below),
+   substitution patterns cannot be delimited by numbers or the characters
+   `r', `g' and `p'.  In contrast, POSIX specifies any character expect
+   space or newline can used as a delimiter.
+
+EXTENSIONS
+----------
+1) BSD commands have been implemented wherever they do not conflict with
+   the POSIX standard.  The BSD-ism's included are:
+	i) `s' (i.e., s[n][rgp]*) to repeat a previous substitution,
+	ii) `W' for appending text to an existing file,
+	iii) `wq' for exiting after a write,
+	iv) `z' for scrolling through the buffer, and
+	v) BSD line addressing syntax (i.e., `^' and `%')  is recognized.
+
+2) If crypt(3) is available, files can be read and written using DES
+   encryption.  The `x' command prompts the user to enter a key used for
+   encrypting/ decrypting subsequent reads and writes.  If only a newline
+   is entered as the key, then encryption is disabled.  Otherwise, a key
+   is read in the same manner as a password entry.  The key remains in
+   effect until encryption is disabled.  For more information on the
+   encryption algorithm, see the bdes(1) man page.  Encryption/decryption
+   should be fully compatible with SunOS des(1).
+
+3) The POSIX interactive global commands `G' and `V' are extended to 
+   support multiple commands, including `a', `i' and `c'.  The command
+   format is the same as for the global commands `g' and `v', i.e., one
+   command per line with each line, except for the last, ending in a
+   backslash (\).
+
+4) An extension to the POSIX file commands `E', `e', `r', `W' and `w' is
+   that <file> arguments are processed for backslash escapes, i.e.,  any
+   character preceded by a backslash is interpreted literally.  If the
+   first unescaped character of a <file> argument is a bang (!), then the
+   rest of the line is interpreted as a shell command, and no escape
+   processing is performed by ed.
+
+5) For SunOS ed(1) compatibility, ed runs in restricted mode if invoked
+   as red.  This limits editing of files in the local directory only and
+   prohibits shell commands.
+
+DEVIATIONS
+----------
+1) Though ed is not a stream editor, it can be used to edit binary files.
+   To assist in binary editing, when a file containing at least one ASCII
+   NUL character is written, a newline is not appended if it did not
+   already contain one upon reading.  In particular, reading /dev/null
+   prior to writing prevents appending a newline to a binary file.
+
+   For example, to create a file with ed containing a single NUL character:
+      $ ed file
+      a
+      ^@
+      .
+      r /dev/null
+      wq
+
+    Similarly, to remove a newline from the end of binary `file':
+      $ ed file
+      r /dev/null
+      wq
+
+2) Since the behavior of `u' (undo) within a `g' (global) command list is
+   not specified by POSIX, it follows the behavior of the SunOS ed:
+   undo forces a global command list to be executed only once, rather than
+   for each line matching a global pattern.  In addtion, each instance of
+   `u' within a global command undoes all previous commands (including
+   undo's) in the command list.  This seems the best way, since the
+   alternatives are either too complicated to implement or too confusing
+   to use.  
+
+   The global/undo combination is useful for masking errors that
+   would otherwise cause a script to fail.  For instance, an ed script
+   to remove any occurences of either `censor1' or `censor2' might be
+   written as:
+   	ed - file <<EOF
+	1g/.*/u\
+	,s/censor1//g\
+	,s/censor2//g
+	...
+
+3) The `m' (move) command within a `g' command list also follows the SunOS
+   ed implementation: any moved lines are removed from the global command's
+   `active' list.
+
+4) If ed is invoked with a name argument prefixed by a bang (!), then the
+   remainder of the argument is interpreted as a shell command.  To invoke
+   ed on a file whose name starts with bang, prefix the name with a
+   backslash.
diff --git a/bin/ed/README b/bin/ed/README
new file mode 100644
index 00000000000..285bc13d0ff
--- /dev/null
+++ b/bin/ed/README
@@ -0,0 +1,24 @@
+$NetBSD: README,v 1.9 1995/03/21 09:04:33 cgd Exp $
+
+ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
+any regular expression package that conforms to the POSIX interface
+standard, such as GNU regex(3).
+
+If reliable signals are supported (e.g., POSIX sigaction(2)), it should
+compile with little trouble.  Otherwise, the macros SPL1() and SPL0()
+should be redefined to disable interrupts.
+
+The following compiler directives are recognized:
+DES		- to add encryption support (requires crypt(3))
+NO_REALLOC_NULL	- if realloc(3) does not accept a NULL pointer
+BACKWARDS	- for backwards compatibility
+NEED_INSQUE	- if insque(3) is missing
+
+The file `POSIX' describes extensions to and deviations from the POSIX
+standard.
+
+The ./test directory contains regression tests for ed. The README
+file in that directory explains how to run these.
+
+For a description of the ed algorithm, see Kernighan and Plauger's book
+"Software Tools in Pascal," Addison-Wesley, 1981.
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
new file mode 100644
index 00000000000..f90bc4f7fde
--- /dev/null
+++ b/bin/ed/buf.c
@@ -0,0 +1,293 @@
+/*	$NetBSD: buf.c,v 1.15 1995/04/23 10:07:28 cgd Exp $	*/
+
+/* buf.c: This file contains the scratch-file buffer rountines for the
+   ed line editor. */
+/*-
+ * Copyright (c) 1993 Andrew Moore, Talke Studio.
+ * 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.
+ */
+
+#ifndef lint
+#if 0
+static char *rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
+#else
+static char rcsid[] = "$NetBSD: buf.c,v 1.15 1995/04/23 10:07:28 cgd Exp $";
+#endif
+#endif /* not lint */
+
+#include <sys/file.h>
+#include <sys/stat.h>
+
+#include "ed.h"
+
+
+FILE *sfp;				/* scratch file pointer */
+off_t sfseek;				/* scratch file position */
+int seek_write;				/* seek before writing */
+line_t buffer_head;			/* incore buffer */
+
+/* get_sbuf_line: get a line of text from the scratch file; return pointer
+   to the text */
+char *
+get_sbuf_line(lp)
+	line_t *lp;
+{
+	static char *sfbuf = NULL;	/* buffer */
+	static int sfbufsz = 0;		/* buffer size */
+
+	int len, ct;
+
+	if (lp == &buffer_head)
+		return NULL;
+	seek_write = 1;				/* force seek on write */
+	/* out of position */
+	if (sfseek != lp->seek) {
+		sfseek = lp->seek;
+		if (fseek(sfp, sfseek, SEEK_SET) < 0) {
+			fprintf(stderr, "%s\n", strerror(errno));
+			sprintf(errmsg, "cannot seek temp file");
+			return NULL;
+		}
+	}
+	len = lp->len;
+	REALLOC(sfbuf, sfbufsz, len + 1, NULL);
+	if ((ct = fread(sfbuf, sizeof(char), len, sfp)) <  0 || ct != len) {
+		fprintf(stderr, "%s\n", strerror(errno));
+		sprintf(errmsg, "cannot read temp file");
+		return NULL;
+	}
+	sfseek += len;				/* update file position */
+	sfbuf[len] = '\0';
+	return sfbuf;
+}
+
+
+/* put_sbuf_line: write a line of text to the scratch file and add a line node
+   to the editor buffer;  return a pointer to the end of the text */
+char *
+put_sbuf_line(cs)
+	char *cs;
+{
+	line_t *lp;
+	int len, ct;
+	char *s;
+
+	if ((lp = (line_t *) malloc(sizeof(line_t))) == NULL) {
+		fprintf(stderr, "%s\n", strerror(errno));
+		sprintf(errmsg, "out of memory");
+		return NULL;
+	}
+	/* assert: cs is '\n' terminated */
+	for (s = cs; *s != '\n'; s++)
+		;
+	if (s - cs >= LINECHARS) {
+		sprintf(errmsg, "line too long");
+		return NULL;
+	}
+	len = s - cs;
+	/* out of position */
+	if (seek_write) {
+		if (fseek(sfp, 0L, SEEK_END) < 0) {
+			fprintf(stderr, "%s\n", strerror(errno));
+			sprintf(errmsg, "cannot seek temp file");
+			return NULL;
+		}
+		sfseek = ftell(sfp);
+		seek_write = 0;
+	}
+	/* assert: SPL1() */
+	if ((ct = fwrite(cs, sizeof(char), len, sfp)) < 0 || ct != len) {
+		sfseek = -1;
+		fprintf(stderr, "%s\n", strerror(errno));
+		sprintf(errmsg, "cannot write temp file");
+		return NULL;
+	}
+	lp->len = len;
+	lp->seek  = sfseek;
+	add_line_node(lp);
+	sfseek += len;			/* update file position */
+	return ++s;
+}
+
+
+/* add_line_node: add a line node in the editor buffer after the current line */
+void
+add_line_node(lp)
+	line_t *lp;
+{
+	line_t *cp;
+
+	cp = get_addressed_line_node(current_addr);				/* this get_addressed_line_node last! */
+	INSQUE(lp, cp);
+	addr_last++;
+	current_addr++;
+}
+
+
+/* get_line_node_addr: return line number of pointer */
+long
+get_line_node_addr(lp)
+	line_t *lp;
+{
+	line_t *cp = &buffer_head;
+	long n = 0;
+
+	while (cp != lp && (cp = cp->q_forw) != &buffer_head)
+		n++;
+	if (n && cp == &buffer_head) {
+		sprintf(errmsg, "invalid address");
+		return ERR;
+	 }
+	 return n;
+}
+
+
+/* get_addressed_line_node: return pointer to a line node in the editor buffer */
+line_t *
+get_addressed_line_node(n)
+	long n;
+{
+	static line_t *lp = &buffer_head;
+	static long on = 0;
+
+	SPL1();
+	if (n > on)
+		if (n <= (on + addr_last) >> 1)
+			for (; on < n; on++)
+				lp = lp->q_forw;
+		else {
+			lp = buffer_head.q_back;
+			for (on = addr_last; on > n; on--)
+				lp = lp->q_back;
+		}
+	else
+		if (n >= on >> 1)
+			for (; on > n; on--)
+				lp = lp->q_back;
+		else {
+			lp = &buffer_head;
+			for (on = 0; on < n; on++)
+				lp = lp->q_forw;
+		}
+	SPL0();
+	return lp;
+}
+
+
+extern int newline_added;
+
+char sfn[15] = "";				/* scratch file name */
+
+/* open_sbuf: open scratch file */
+int
+open_sbuf()
+{
+	int u;
+
+	isbinary = newline_added = 0;
+	u = umask(077);
+	strcpy(sfn, "/tmp/ed.XXXXXX");
+	if (mktemp(sfn) == NULL || (sfp = fopen(sfn, "w+")) == NULL) {
+		fprintf(stderr, "%s: %s\n", sfn, strerror(errno));
+		sprintf(errmsg, "cannot open temp file");
+		umask(u);
+		return ERR;
+	}
+	umask(u);
+	return 0;
+}
+
+
+/* close_sbuf: close scratch file */
+int
+close_sbuf()
+{
+	if (sfp) {
+		if (fclose(sfp) < 0) {
+			fprintf(stderr, "%s: %s\n", sfn, strerror(errno));
+			sprintf(errmsg, "cannot close temp file");
+			return ERR;
+		}
+		sfp = NULL;
+		unlink(sfn);
+	}
+	sfseek = seek_write = 0;
+	return 0;
+}
+
+
+/* quit: remove_lines scratch file and exit */
+void
+quit(n)
+	int n;
+{
+	if (sfp) {
+		fclose(sfp);
+		unlink(sfn);
+	}
+	exit(n);
+}
+
+
+unsigned char ctab[256];		/* character translation table */
+
+/* init_buffers: open scratch buffer; initialize line queue */
+void
+init_buffers()
+{
+	int i = 0;
+
+	/* Read stdin one character at a time to avoid i/o contention 
+	   with shell escapes invoked by nonterminal input, e.g.,
+	   ed - <<EOF
+	   !cat
+	   hello, world
+	   EOF */
+	setbuffer(stdin, stdinbuf, 1);
+	if (open_sbuf() < 0)
+		quit(2);
+	REQUE(&buffer_head, &buffer_head);
+	for (i = 0; i < 256; i++)
+		ctab[i] = i;
+}
+
+
+/* translit_text: translate characters in a string */
+char *
+translit_text(s, len, from, to)
+	char *s;
+	int len;
+	int from;
+	int to;
+{
+	static int i = 0;
+
+	unsigned char *us;
+
+	ctab[i] = i;			/* restore table to initial state */
+	ctab[i = from] = to;
+	for (us = (unsigned char *) s; len-- > 0; us++)
+		*us = ctab[*us];
+	return s;
+}
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
new file mode 100644
index 00000000000..da8dfdf13c9
--- /dev/null
+++ b/bin/ed/cbc.c
@@ -0,0 +1,427 @@
+/*	$NetBSD: cbc.c,v 1.9 1995/03/21 09:04:36 cgd Exp $	*/
+
+/* cbc.c: This file contains the encryption routines for the ed line editor */
+/*-
+ * Copyright (c) 1993 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Copyright (c) 1993 Andrew Moore, Talke Studio.
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *	from: @(#)bdes.c	5.5 (Berkeley) 6/27/91
+ */
+
+#ifndef lint
+#if 0
+static char *rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
+#else
+static char rcsid[] = "$NetBSD: cbc.c,v 1.9 1995/03/21 09:04:36 cgd Exp $";
+#endif
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <ctype.h>
+#include <errno.h>
+#include <pwd.h>
+
+#include "ed.h"
+
+
+/*
+ * Define a divisor for rand() that yields a uniform distribution in the
+ * range 0-255.
+ */
+#define	RAND_DIV (((unsigned) RAND_MAX + 1) >> 8)
+
+/*
+ * BSD and System V systems offer special library calls that do
+ * block move_liness and fills, so if possible we take advantage of them
+ */
+#define	MEMCPY(dest,src,len)	memcpy((dest),(src),(len))
+#define	MEMZERO(dest,len)	memset((dest), 0, (len))
+
+/* Hide the calls to the primitive encryption routines. */
+#define	DES_KEY(buf) \
+	if (des_setkey(buf)) \
+		des_error("des_setkey");
+#define	DES_XFORM(buf) \
+	if (des_cipher(buf, buf, 0L, (inverse ? -1 : 1))) \
+		des_error("des_cipher");
+
+/*
+ * read/write - no error checking
+ */
+#define	READ(buf, n, fp)	fread(buf, sizeof(char), n, fp)
+#define WRITE(buf, n, fp)	fwrite(buf, sizeof(char), n, fp)
+
+/*
+ * some things to make references easier
+ */
+typedef char Desbuf[8];
+#define	CHAR(x,i)	(x[i])
+#define	UCHAR(x,i)	(x[i])
+#define	BUFFER(x)	(x)
+#define	UBUFFER(x)	(x)
+
+/*
+ * global variables and related macros
+ */
+
+enum { 					/* encrypt, decrypt, authenticate */
+	MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE
+} mode = MODE_ENCRYPT;
+
+Desbuf ivec;				/* initialization vector */
+Desbuf pvec;				/* padding vector */
+char bits[] = {				/* used to extract bits from a char */
+	'\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001'
+};
+int pflag;				/* 1 to preserve parity bits */
+
+unsigned char des_buf[8];	/* shared buffer for get_des_char/put_des_char */
+int des_ct = 0;			/* count for get_des_char/put_des_char */
+int des_n = 0;			/* index for put_des_char/get_des_char */
+
+
+/* init_des_cipher: initialize DES */
+void
+init_des_cipher()
+{
+#ifdef DES
+	int i;
+
+	des_ct = des_n = 0;
+
+	/* initialize the initialization vctor */
+	MEMZERO(ivec, 8);
+
+	/* intialize the padding vector */
+	srand((unsigned) time((time_t *) 0));
+	for (i = 0; i < 8; i++)
+		CHAR(pvec, i) = (char) (rand()/RAND_DIV);
+#endif
+}
+
+
+/* get_des_char: return next char in an encrypted file */
+int
+get_des_char(fp)
+	FILE *fp;
+{
+#ifdef DES
+	if (des_n >= des_ct) {
+		des_n = 0;
+		des_ct = cbc_decode(des_buf, fp);
+	}
+	return (des_ct > 0) ? des_buf[des_n++] : EOF;
+#endif
+}
+
+
+/* put_des_char: write a char to an encrypted file; return char written */
+int
+put_des_char(c, fp)
+	int c;
+	FILE *fp;
+{
+#ifdef DES
+	if (des_n == sizeof des_buf) {
+		des_ct = cbc_encode(des_buf, des_n, fp);
+		des_n = 0;
+	}
+	return (des_ct >= 0) ? (des_buf[des_n++] = c) : EOF;
+#endif
+}
+
+
+/* flush_des_file: flush an encrypted file's output; return status */
+int
+flush_des_file(fp)
+	FILE *fp;
+{
+#ifdef DES
+	if (des_n == sizeof des_buf) {
+		des_ct = cbc_encode(des_buf, des_n, fp);
+		des_n = 0;
+	}
+	return (des_ct >= 0 && cbc_encode(des_buf, des_n, fp) >= 0) ? 0 : EOF;
+#endif
+}
+
+#ifdef DES
+/*
+ * get keyword from tty or stdin
+ */
+int
+get_keyword()
+{
+	register char *p;		/* used to obtain the key */
+	Desbuf msgbuf;			/* I/O buffer */
+
+	/*
+	 * get the key
+	 */
+	if (*(p = getpass("Enter key: "))) {
+
+		/*
+		 * copy it, nul-padded, into the key area
+		 */
+		expand_des_key(BUFFER(msgbuf), p);
+		MEMZERO(p, _PASSWORD_LEN);
+		set_des_key(msgbuf);
+		MEMZERO(msgbuf, sizeof msgbuf);
+		return 1;
+	}
+	return 0;
+}
+
+
+/*
+ * print a warning message and, possibly, terminate
+ */
+void
+des_error(s)
+	char *s;		/* the message */
+{
+	(void)sprintf(errmsg, "%s", s ? s : strerror(errno));
+}
+
+/*
+ * map a hex character to an integer
+ */
+int
+hex_to_binary(c, radix)
+	int c;			/* char to be converted */
+	int radix;		/* base (2 to 16) */
+{
+	switch(c) {
+	case '0':		return(0x0);
+	case '1':		return(0x1);
+	case '2':		return(radix > 2 ? 0x2 : -1);
+	case '3':		return(radix > 3 ? 0x3 : -1);
+	case '4':		return(radix > 4 ? 0x4 : -1);
+	case '5':		return(radix > 5 ? 0x5 : -1);
+	case '6':		return(radix > 6 ? 0x6 : -1);
+	case '7':		return(radix > 7 ? 0x7 : -1);
+	case '8':		return(radix > 8 ? 0x8 : -1);
+	case '9':		return(radix > 9 ? 0x9 : -1);
+	case 'A': case 'a':	return(radix > 10 ? 0xa : -1);
+	case 'B': case 'b':	return(radix > 11 ? 0xb : -1);
+	case 'C': case 'c':	return(radix > 12 ? 0xc : -1);
+	case 'D': case 'd':	return(radix > 13 ? 0xd : -1);
+	case 'E': case 'e':	return(radix > 14 ? 0xe : -1);
+	case 'F': case 'f':	return(radix > 15 ? 0xf : -1);
+	}
+	/*
+	 * invalid character
+	 */
+	return(-1);
+}
+
+/*
+ * convert the key to a bit pattern
+ */
+void
+expand_des_key(obuf, ibuf)
+	char *obuf;			/* bit pattern */
+	char *ibuf;			/* the key itself */
+{
+	register int i, j;		/* counter in a for loop */
+	int nbuf[64];			/* used for hex/key translation */
+
+	/*
+	 * leading '0x' or '0X' == hex key
+	 */
+	if (ibuf[0] == '0' && (ibuf[1] == 'x' || ibuf[1] == 'X')) {
+		ibuf = &ibuf[2];
+		/*
+		 * now translate it, bombing on any illegal hex digit
+		 */
+		for (i = 0; ibuf[i] && i < 16; i++)
+			if ((nbuf[i] = hex_to_binary((int) ibuf[i], 16)) == -1)
+				des_error("bad hex digit in key");
+		while (i < 16)
+			nbuf[i++] = 0;
+		for (i = 0; i < 8; i++)
+			obuf[i] =
+			    ((nbuf[2*i]&0xf)<<4) | (nbuf[2*i+1]&0xf);
+		/* preserve parity bits */
+		pflag = 1;
+		return;
+	}
+	/*
+	 * leading '0b' or '0B' == binary key
+	 */
+	if (ibuf[0] == '0' && (ibuf[1] == 'b' || ibuf[1] == 'B')) {
+		ibuf = &ibuf[2];
+		/*
+		 * now translate it, bombing on any illegal binary digit
+		 */
+		for (i = 0; ibuf[i] && i < 16; i++)
+			if ((nbuf[i] = hex_to_binary((int) ibuf[i], 2)) == -1)
+				des_error("bad binary digit in key");
+		while (i < 64)
+			nbuf[i++] = 0;
+		for (i = 0; i < 8; i++)
+			for (j = 0; j < 8; j++)
+				obuf[i] = (obuf[i]<<1)|nbuf[8*i+j];
+		/* preserve parity bits */
+		pflag = 1;
+		return;
+	}
+	/*
+	 * no special leader -- ASCII
+	 */
+	(void)strncpy(obuf, ibuf, 8);
+}
+
+/*****************
+ * DES FUNCTIONS *
+ *****************/
+/*
+ * This sets the DES key and (if you're using the deszip version)
+ * the direction of the transformation.  This uses the Sun
+ * to map the 64-bit key onto the 56 bits that the key schedule
+ * generation routines use: the old way, which just uses the user-
+ * supplied 64 bits as is, and the new way, which resets the parity
+ * bit to be the same as the low-order bit in each character.  The
+ * new way generates a greater variety of key schedules, since many
+ * systems set the parity (high) bit of each character to 0, and the
+ * DES ignores the low order bit of each character.
+ */
+void
+set_des_key(buf)
+	Desbuf buf;				/* key block */
+{
+	register int i, j;			/* counter in a for loop */
+	register int par;			/* parity counter */
+
+	/*
+	 * if the parity is not preserved, flip it
+	 */
+	if (!pflag) {
+		for (i = 0; i < 8; i++) {
+			par = 0;
+			for (j = 1; j < 8; j++)
+				if ((bits[j]&UCHAR(buf, i)) != 0)
+					par++;
+			if ((par&01) == 01)
+				UCHAR(buf, i) = UCHAR(buf, i)&0177;
+			else
+				UCHAR(buf, i) = (UCHAR(buf, i)&0177)|0200;
+		}
+	}
+
+	DES_KEY(UBUFFER(buf));
+}
+
+
+/*
+ * This encrypts using the Cipher Block Chaining mode of DES
+ */
+int
+cbc_encode(msgbuf, n, fp)
+	char *msgbuf;
+	int n;
+	FILE *fp;
+{
+	int inverse = 0;	/* 0 to encrypt, 1 to decrypt */
+
+	/*
+	 * do the transformation
+	 */
+	if (n == 8) {
+		for (n = 0; n < 8; n++)
+			CHAR(msgbuf, n) ^= CHAR(ivec, n);
+		DES_XFORM(UBUFFER(msgbuf));
+		MEMCPY(BUFFER(ivec), BUFFER(msgbuf), 8);
+		return WRITE(BUFFER(msgbuf), 8, fp);
+	}
+	/*
+	 * at EOF or last block -- in either case, the last byte contains
+	 * the character representation of the number of bytes in it
+	 */
+/*
+	MEMZERO(msgbuf +  n, 8 - n);
+*/
+	/*
+	 *  Pad the last block randomly
+	 */
+	(void)MEMCPY(BUFFER(msgbuf + n), BUFFER(pvec), 8 - n);
+	CHAR(msgbuf, 7) = n;
+	for (n = 0; n < 8; n++)
+		CHAR(msgbuf, n) ^= CHAR(ivec, n);
+	DES_XFORM(UBUFFER(msgbuf));
+	return WRITE(BUFFER(msgbuf), 8, fp);
+}
+
+/*
+ * This decrypts using the Cipher Block Chaining mode of DES
+ */
+int
+cbc_decode(msgbuf, fp)
+	char *msgbuf;		/* I/O buffer */
+	FILE *fp;			/* input file descriptor */
+{
+	Desbuf ibuf;	/* temp buffer for initialization vector */
+	register int n;		/* number of bytes actually read */
+	register int c;		/* used to test for EOF */
+	int inverse = 1;	/* 0 to encrypt, 1 to decrypt */
+
+	if ((n = READ(BUFFER(msgbuf), 8, fp)) == 8) {
+		/*
+		 * do the transformation
+		 */
+		MEMCPY(BUFFER(ibuf), BUFFER(msgbuf), 8);
+		DES_XFORM(UBUFFER(msgbuf));
+		for (c = 0; c < 8; c++)
+			UCHAR(msgbuf, c) ^= UCHAR(ivec, c);
+		MEMCPY(BUFFER(ivec), BUFFER(ibuf), 8);
+		/*
+		 * if the last one, handle it specially
+		 */
+		if ((c = fgetc(fp)) == EOF) {
+			n = CHAR(msgbuf, 7);
+			if (n < 0 || n > 7) {
+				des_error("decryption failed (block corrupted)");
+				return EOF;
+			}
+		} else
+			(void)ungetc(c, fp);
+		return n;
+	}
+	if (n > 0)
+		des_error("decryption failed (incomplete block)");
+	else if (n < 0)
+		des_error("cannot read file");
+	return EOF;
+}
+#endif	/* DES */
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
new file mode 100644
index 00000000000..95ca8eeaf1d
--- /dev/null
+++ b/bin/ed/ed.1
@@ -0,0 +1,1002 @@
+.\"	$NetBSD: ed.1,v 1.13 1995/03/21 09:04:38 cgd Exp $
+.\"
+.TH ED 1 "21 May 1993"
+.SH NAME
+.\" ed, red \- text editor
+ed \- text editor
+.SH SYNOPSIS
+ed [-] [-sx] [-p \fIstring\fR] [\fIfile\fR]
+.\" .LP
+.\" red [-] [-sx] [-p \fIstring\fR] [\fIfile\fR]
+.SH DESCRIPTION
+.B ed
+is a line-oriented text editor.
+It is used to create, display, modify and otherwise manipulate text
+files.
+.\" .B red
+.\" is a restricted
+.\" .BR ed :
+.\" it can only edit files in the current
+.\" directory and cannot execute shell commands.
+
+If invoked with a
+.I file
+argument, then a copy of
+.I file
+is read into the editor's buffer.
+Changes are made to this copy and not directly to
+.I file
+itself.
+Upon quitting
+.BR ed ,
+any changes not explicitly saved  with a
+.I `w'
+command are lost.
+
+Editing is done in two distinct modes:
+.I command
+and
+.IR input .
+When first invoked,
+.B ed
+is in command mode.
+In this mode commands are read from the standard input and
+executed to manipulate the contents of the editor buffer.
+A typical command might look like:
+.sp
+.RS
+,s/\fIold\fR/\fInew\fR/g
+.RE
+.sp
+which replaces all occurences of the string
+.I old
+with
+.IR new .
+
+When an input command, such as
+.I `a'
+(append),
+.I `i'
+(insert) or
+.I `c'
+(change), is given,
+.B ed
+enters input mode.  This is the primary means
+of adding text to a file.
+In this mode, no commands are available;
+instead, the standard input is written
+directly to the editor buffer.  Lines consist of text up to and
+including a
+.IR newline
+character.
+Input mode is terminated by
+entering a single period  (\fI.\fR) on a line.
+
+All
+.B ed
+commands operate on whole lines or ranges of lines; e.g.,
+the
+.I `d'
+command deletes lines; the
+.I `m'
+command moves lines, and so on.
+It is possible to modify only a portion of a line by means of replacement,
+as in the example above.  However even here, the
+.I `s'
+command is applied to whole lines at a time.
+
+In general,
+.B ed
+commands consist of zero or more line addresses, followed by a single
+character command and possibly additional parameters; i.e.,
+commands have the structure:
+.sp
+.RS
+.I [address [,address]]command[parameters]
+.RE
+.sp
+The address(es) indicate the line or range of lines to be affected by the
+command.  If fewer addresses are given than the command accepts, then
+default addresses are supplied.
+
+.SS OPTIONS
+.TP 8
+-s
+Suppresses diagnostics. This should be used if
+.BR ed 's
+standard input is from a script.
+
+.TP 8
+-x
+Prompts for an encryption key to be used in subsequent reads and writes
+(see the
+.I `x'
+command).
+
+.TP 8
+.RI \-p \ string
+Specifies a command prompt.  This may be toggled on and off with the
+.I `P'
+command.
+
+.TP 8
+.I file
+Specifies the name of a file to read.  If
+.I file
+is prefixed with a
+bang (!), then it is interpreted as a shell command.  In this case,
+what is read is
+the standard output of
+.I file
+executed via
+.IR sh (1).
+To read a file whose name begins with a bang, prefix the
+name with a backslash (\\).
+The default filename is set to
+.I file
+only if it is not prefixed with a bang.
+
+.SS LINE ADDRESSING
+An address represents the number of a line in the buffer.
+.B ed
+maintains a
+.I current address
+which is
+typically supplied to commands as the default address when none is specified.
+When a file is first read,  the current address is set to the last line
+of the file.  In general, the current address is set to the last line
+affected by a command.
+
+A line address is
+constructed from one of the bases in the list below, optionally followed
+by a numeric offset.  The offset may include any combination
+of digits, operators (i.e.,
+.IR + ,
+.I -
+and
+.IR ^ )
+and whitespace.
+Addresses are read from left to right, and their values are computed
+relative to the current address.
+
+One exception to the rule that addresses represent line numbers is the
+address
+.I 0
+(zero).
+This means "before the first line,"
+and is legal wherever it makes sense.
+
+An address range is two addresses separated either by a comma or
+semi-colon. The value of the first address in a range cannot exceed the
+value of the the second.  If only one address is given in a range, then
+the second address is set to the given address.  If an
+.IR n- tuple
+of addresses is given where
+.I n > 2,
+then the corresponding range is determined by the last two addresses in
+the
+.IR n- tuple.
+If only one address is expected, then the last address is used.
+
+Each address in a comma-delimited range is interpreted relative to the
+current address.  In a semi-colon-delimited range, the first address is
+used to set the current address, and the second address is interpreted
+relative to the first.
+
+
+The following address symbols are recognized.
+
+.TP 8
+\&.
+The current line (address) in the buffer.
+
+.TP 8
+$
+The last line in the buffer.
+
+.TP 8
+n
+The
+.IR n th,
+line in the buffer
+where
+.I n
+is a number in the range
+.I [0,$].
+
+.TP 8
+- or ^
+The previous line.
+This is equivalent to
+.I -1
+and may be repeated with cumulative effect.
+
+.TP 8
+-\fIn\fR or ^\fIn\fR
+The
+.IR n th
+previous line, where
+.I n
+is a non-negative number.
+
+.TP 8
++
+The
+next line.
+This is equivalent to
+.I +1
+and may be repeated with cumulative effect.
+
+.TP 8
++\fIn\fR or whitespace\fIn\fR
+The
+.IR n th
+next line, where
+.I n
+is a non-negative number.
+.I whitespace
+followed by a number
+.I n
+is interpreted as
+.IR +n .
+
+.TP 8
+, \fRor\fB %
+The first through last lines in the buffer.  This is equivalent to
+the address range
+.I 1,$.
+
+.TP 8
+;
+The
+current through last lines in the buffer.  This is equivalent to
+the address range
+.I .,$.
+
+.TP 8
+.RI / re/
+The
+next line containing the regular expression
+.IR re .
+The search wraps to the beginning of the buffer and continues down to the
+current line, if necessary.
+// repeats the last search.
+
+.TP 8
+.RI ? re?
+The
+previous line containing the regular expression
+.IR re .
+The search wraps to the end of the buffer and continues up to the
+current line, if necessary.
+?? repeats the last search.
+
+.TP 8
+.RI \' lc
+The
+line previously marked by a
+.I `k'
+(mark) command, where
+.I lc
+is a lower case letter.
+
+.SS REGULAR EXPRESSIONS
+Regular expressions are patterns used in selecting text.
+For example, the
+.B ed
+command
+.sp
+.RS
+g/\fIstring\fR/
+.RE
+.sp
+prints all lines containing
+.IR string .
+Regular expressions are also
+used by the
+.I `s'
+command for selecting old text to be replaced with new.
+
+In addition to a specifying string literals, regular expressions can
+represent
+classes of strings.  Strings thus represented are said to be matched
+by the corresponding regular expression.
+If it is possible for a regular expression
+to match several strings in a line, then the left-most longest match is
+the one selected.
+
+The following symbols are used in constructing regular expressions:
+
+.TP 8
+c
+Any character
+.I c
+not listed below, including `{', '}', `(', `)', `<' and `>',
+matches itself.
+
+.TP 8
+\fR\e\fIc\fR
+Any backslash-escaped character
+.IR c ,
+except for `{', '}', `(', `)', `<' and `>',
+matches itself.
+
+.TP 8
+\fR.\fR
+Matches any single character.
+
+.TP 8
+.I [char-class]
+Matches any single character in
+.IR char-class .
+To include a  `]'
+in
+.IR char-class ,
+it must be the first character.
+A range of characters may be specified by separating the end characters
+of the range with a `-', e.g., `a-z' specifies the lower case characters.
+The following literal expressions can also be used in
+.I char-class
+to specify sets of characters:
+.sp
+\ \ [:alnum:]\ \ [:cntrl:]\ \ [:lower:]\ \ [:space:]
+.PD 0
+\ \ [:alpha:]\ \ [:digit:]\ \ [:print:]\ \ [:upper:]
+.PD 0
+\ \ [:blank:]\ \ [:graph:]\ \ [:punct:]\ \ [:xdigit:]
+.sp
+If `-' appears as the first or last
+character of
+.IR char-class ,
+then it matches itself.
+All other characters in
+.I char-class
+match themselves.
+.sp
+Patterns in
+.I char-class
+of the form:
+.sp
+\ \ [.\fIcol-elm\fR.] or,
+.PD 0
+\ \ [=\fIcol-elm\fR=]
+.sp
+where
+.I col-elm
+is a
+.I collating element
+are interpreted according to
+.IR locale (5)
+(not currently supported).
+See
+.IR regex (3)
+for an explanation of these constructs.
+
+.TP 8
+[^\fIchar-class\fR]
+Matches any single character, other than newline, not in
+.IR char-class .
+.IR char-class
+is defined
+as above.
+
+.TP 8
+^
+If `^' is the first character of a regular expression, then it
+anchors the regular expression to the beginning of a line.
+Otherwise, it matches itself.
+
+.TP 8
+$
+If `$' is the last character of a regular expression, it
+anchors the regular expression to the end of a line.
+Otherwise, it matches itself.
+
+.TP 8
+\fR\e<\fR
+Anchors the single character regular expression or subexpression
+immediately following it to the beginning of a word.
+(This may not be available)
+
+.TP 8
+\fR\e>\fR
+Anchors the single character regular expression or subexpression
+immediately following it to the end of a word.
+(This may not be available)
+
+.TP 8
+\fR\e(\fIre\fR\e)\fR
+Defines a subexpression
+.IR re .
+Subexpressions may be nested.
+A subsequent backreference of the form \fI`\en'\fR, where
+.I n
+is a number in the range [1,9], expands to the text matched by the
+.IR n th
+subexpression.
+For example, the regular expression `\e(.*\e)\e1' matches any string
+consisting of identical adjacent substrings.
+Subexpressions are ordered relative to
+their left delimiter.
+
+.TP 8
+*
+Matches the single character regular expression or subexpression
+immediately preceding it zero or more times.  If '*' is the first
+character of a regular expression or subexpression, then it matches
+itself.  The `*' operator sometimes yields unexpected results.
+For example, the regular expression `b*' matches the beginning of
+the string `abbb' (as opposed to the substring `bbb'), since a null match
+is the only left-most match.
+
+.TP 8
+\fR\e{\fIn,m\fR\e}\fR or \fR\e{\fIn,\fR\e}\fR or \fR\e{\fIn\fR\e}\fR
+Matches the single character regular expression or subexpression
+immediately preceding it at least
+.I n
+and at most
+.I m
+times.
+If
+.I m
+is omitted, then it matches at least
+.I n
+times.
+If the comma is also omitted, then it matches exactly
+.I n
+times.
+
+.LP
+Additional regular expression operators may be defined depending on the
+particular
+.IR regex (3)
+implementation.
+
+.SS COMMANDS
+All
+.B ed
+commands are single characters, though some require additonal parameters.
+If a command's parameters extend over several lines, then
+each line except for the last
+must be terminated with a backslash (\\).
+
+In general, at most one command is allowed per line.
+However, most commands accept a print suffix, which is any of
+.I `p'
+(print),
+.I `l'
+(list) ,
+or
+.I `n'
+(enumerate),
+to print the last line affected by the command.
+
+An interrupt (typically ^C) has the effect of aborting the current command
+and returning the editor to command mode.
+
+.B ed
+recognizes the following commands.  The commands are shown together with
+the default address or address range supplied if none is
+specified (in parenthesis).
+
+.TP 8
+(.)a
+Appends text to the buffer after the addressed line.
+Text is entered in input mode.
+The current address is set to last line entered.
+
+.TP 8
+(.,.)c
+Changes lines in the buffer.  The addressed lines are deleted
+from the buffer, and text is appended in their place.
+Text is entered in input mode.
+The current address is set to last line entered.
+
+.TP 8
+(.,.)d
+Deletes the addressed lines from the buffer.
+If there is a line after the deleted range, then the current address is set
+to this line. Otherwise the current address is set to the line
+before the deleted range.
+
+.TP 8
+.RI e \ file
+Edits
+.IR file ,
+and sets the default filename.
+If
+.I file
+is not specified, then the  default filename is used.
+Any lines in the buffer are deleted before
+the new file is read.
+The current address is set to the last line read.
+
+.TP 8
+.RI e \ !command
+Edits the standard output of
+.IR `!command' ,
+(see
+.RI ! command
+below).
+The default filename is unchanged.
+Any lines in the buffer are deleted before the output of
+.I command
+is read.
+The current address is set to the last line read.
+
+.TP 8
+.RI E \ file
+Edits
+.I file
+unconditionally.
+This is similar to the
+.I e
+command,
+except that unwritten changes are discarded without warning.
+The current address is set to the last line read.
+
+.TP 8
+.RI f \ file
+Sets the default filename to
+.IR file .
+If
+.I file
+is not specified, then the default unescaped filename is printed.
+
+.TP 8
+.RI (1,$)g /re/command-list
+Applies
+.I command-list
+to each of the addressed lines matching a regular expression
+.IR re .
+The current address is set to the
+line currently matched before
+.I command-list
+is executed.
+At the end of the
+.I `g'
+command, the current address is set to the last line affected by
+.IR command-list .
+
+Each command in
+.I command-list
+must be on a separate line,
+and every line except for the last must be terminated by a backslash
+(\\).
+Any commands are allowed, except for
+.IR `g' ,
+.IR `G' ,
+.IR `v' ,
+and
+.IR `V' .
+A newline alone in
+.I command-list
+is equivalent to a 
+.I `p'
+command.
+
+.TP 8
+.RI (1,$)G /re/
+Interactively edits the addressed lines matching a regular expression
+.IR re.
+For each matching line,
+the line is printed,
+the current address is set,
+and the user is prompted to enter a 
+.IR command-list .
+At the end of the
+.I `G'
+command, the current address
+is set to the last line affected by (the last)
+.IR command-list .
+
+The format of
+.I command-list
+is the same as that of the
+.I `g'
+command.  A newline alone acts as a null command list.
+A single `&' repeats the last non-null command list.
+
+.TP 8
+H
+Toggles the printing of error explanations.
+By default, explanations are not printed.
+It is recommended that ed scripts begin with this command to
+aid in debugging.
+
+.TP 8
+h
+Prints an explanation of the last error.
+
+.TP 8
+(.)i
+Inserts text in the buffer before the current line.
+Text is entered in input mode.
+The current address is set to the last line entered.
+
+.TP 8
+(.,.+1)j
+Joins the addressed lines.  The addressed lines are
+deleted from the buffer and replaced by a single
+line containing their joined text.
+The current address is set to the resultant line.
+
+.TP 8
+.RI (.)k lc
+Marks a line with a lower case letter
+.IR lc .
+The  line can then be addressed as
+.I 'lc
+(i.e., a single quote followed by
+.I lc
+) in subsequent commands.  The mark is not cleared until the line is
+deleted or otherwise modified.
+
+.TP 8
+(.,.)l
+Prints the addressed lines unambiguously.
+If a single line fills for than one screen (as might be the case
+when viewing a binary file, for instance), a `--More--' 
+prompt is printed on the last line. 
+.B ed
+waits until the RETURN key is pressed
+before displaying the next screen. 
+The current address is set to the last line
+printed.
+
+.TP 8
+(.,.)m(.)
+Moves lines in the buffer.  The addressed lines are moved to after the
+right-hand destination address, which may be the address
+.IR 0
+(zero).
+The current address is set to the
+last line moved.
+
+.TP 8
+(.,.)n
+Prints the addressed lines along with
+their line numbers.  The current address is set to the last line
+printed.
+
+.TP 8
+(.,.)p
+Prints the addressed lines. The current address is set to the last line
+printed.
+
+.TP 8
+P
+Toggles the command prompt on and off.
+Unless a prompt was specified by with command-line option
+\fI-p string\fR, the command prompt is by default turned off.
+
+.TP 8
+q
+Quits ed.
+
+.TP 8
+Q
+Quits ed unconditionally.
+This is similar to the
+.I q
+command,
+except that unwritten changes are discarded without warning.
+
+.TP 8
+.RI ($)r \ file
+Reads
+.I file
+to after the addressed line.  If
+.I file
+is not specified, then the default
+filename is used.  If there was no default filename prior to the command,
+then the default filename is set to
+.IR file .
+Otherwise, the default filename is unchanged.
+The current address is set to the last line read.
+
+.TP 8
+.RI ($)r \ !command
+Reads
+to after the addressed line
+the standard output of
+.IR `!command' ,
+(see the
+.RI ! command
+below).
+The default filename is unchanged.
+The current address is set to the last line read.
+
+.HP
+.RI (.,.)s /re/replacement/
+.PD 0
+.HP
+.RI (.,.)s  /re/replacement/\fRg\fR
+.HP
+.RI (.,.)s  /re/replacement/n
+.br
+Replaces text in the addressed lines
+matching a regular expression
+.I re
+with
+.IR replacement .
+By default, only the first match in each line is replaced.
+If the
+.I `g'
+(global) suffix is given, then every match to be replaced.
+The
+.I `n'
+suffix, where
+.I n
+is a postive number, causes only the
+.IR n th
+match to be replaced.
+It is an error if no substitutions are performed on any of the addressed
+lines.
+The current address is set the last line affected.
+
+.I re
+and
+.I replacement
+may be delimited by any character other than space and newline
+(see the
+.I `s'
+command below).
+If one or two of the last delimiters is omitted, then the last line
+affected is printed as though the print suffix
+.I `p'
+were specified.
+
+
+An unescaped `&' in
+.I replacement
+is replaced by the currently matched text.
+The character sequence
+\fI`\em'\fR,
+where
+.I m
+is a number in the range [1,9], is replaced by the
+.IR m th
+backreference expression of the matched text.
+If
+.I replacement
+consists of a single `%', then
+.I replacement
+from the last substitution is used.
+Newlines may be embedded in
+.I replacement
+if they are escaped with a backslash (\\).
+
+.TP 8
+(.,.)s
+Repeats the last substitution.
+This form of the
+.I `s'
+command accepts a count suffix
+.IR `n' ,
+or any combination of the characters
+.IR `r' ,
+.IR `g' ,
+and
+.IR `p' .
+If a count suffix
+.I `n'
+is given, then only the
+.IR n th
+match is replaced.
+The
+.I `r'
+suffix causes
+the regular expression of the last search to be used instead of the
+that of the last substitution.
+The
+.I `g'
+suffix toggles the global suffix of the last substitution.
+The
+.I `p'
+suffix toggles the print suffix of the last substitution
+The current address is set to the last line affected.
+
+.TP 8
+(.,.)t(.)
+Copies (i.e., transfers) the addressed lines to after the right-hand
+destination address, which may be the address
+.IR 0
+(zero).
+The current address is set to the last line
+copied.
+
+.TP 8
+u
+Undoes the last command and restores the current address
+to what it was before the command.
+The global commands
+.IR `g' ,
+.IR `G' ,
+.IR `v' ,
+and
+.IR `V' .
+are treated as a single command by undo.
+.I `u'
+is its own inverse.
+
+.TP 8
+.RI (1,$)v /pat/command-list
+Applies
+.I command-list
+to each of the addressed lines not matching a regular expression
+.IR re .
+This is similar to the
+.I `g'
+command.
+
+.TP 8
+.RI (1,$)V /re/
+Interactively edits the addressed lines not matching a regular expression
+.IR re.
+This is similar to the
+.I `G'
+command.
+
+.TP 8
+.RI (1,$)w \ file
+Writes the addressed lines to
+.IR file .
+Any previous contents of
+.I file
+is lost without warning.
+If there is no default filename, then the default filename is set to
+.IR file,
+otherwise it is unchanged.  If no filename is specified, then the default
+filename is used.
+The current address is unchanged.
+
+.TP 8
+.RI (1,$)wq \ file
+Writes the addressed lines to
+.IR file ,
+and then executes a
+.I `q'
+command.
+
+.TP 8
+.RI (1,$)w \ !command
+Writes the addressed lines to the standard input of
+.IR `!command' ,
+(see the
+.RI ! command
+below).
+The default filename and current address are unchanged.
+
+.TP 8
+.RI (1,$)W \ file
+Appends the addressed lines to the end of
+.IR file .
+This is similar to the
+.I `w'
+command, expect that the previous contents of file is not clobbered.
+The current address is unchanged.
+
+.TP 8
+x
+Prompts for an encryption key which is used in subsequent reads and
+writes.  If a newline alone is entered as the key, then encryption is
+turned off.  Otherwise, echoing is disabled while a key is read.
+Encryption/decryption is done using the bdes(1) algorithm.
+
+.TP 8
+.RI (.+1)z n
+Scrolls
+.I n
+lines at a time starting at addressed line.  If
+.I n
+is not specified, then the current window size is used.
+The current address is set to the last line printed.
+
+.TP 8
+.RI ! command
+Executes
+.I command
+via
+.IR sh (1).
+If the first character of
+.I command
+is `!', then it is replaced by text of the
+previous
+.IR `!command' .
+.B ed
+does not process
+.I command
+for backslash (\\) escapes.
+However, an unescaped
+.I `%'
+is replaced by the default filename.
+When the shell returns from execution, a `!'
+is printed to the standard output.
+The current line is unchanged.
+
+.TP 8
+($)=
+Prints the line number of the addressed line.
+
+.TP 8
+(.+1)newline
+Prints the addressed line, and sets the current address to
+that line.
+
+.SH FILES
+.TP 20
+/tmp/ed.*
+Buffer file
+.PD 0
+.TP 20
+ed.hup
+The file to which
+.B ed
+attempts to write the  buffer if the terminal hangs up.
+
+.SH SEE ALSO
+
+.IR vi (1),
+.IR sed (1),
+.IR regex (3),
+.IR bdes (1),
+.IR sh (1).
+
+USD:12-13
+
+B. W. Kernighan and P. J. Plauger,
+.I Software Tools in Pascal ,
+Addison-Wesley, 1981.
+
+.SH LIMITATIONS
+.B ed
+processes
+.I file
+arguments for backslash escapes, i.e.,  in a filename,
+any characters preceded by a backslash (\\) are
+interpreted literally.
+
+If a text (non-binary) file is not terminated by a newline character,
+then
+.B ed
+appends one on reading/writing it.  In the case of a binary file,
+.B ed
+does not append a newline on reading/writing.
+
+per line overhead: 4 ints
+
+.SH DIAGNOSTICS
+When an error occurs,
+.B ed
+prints a `?' and either returns to command mode
+or exits if its input is from a script.
+An explanation of the last error can be
+printed with the
+.I `h'
+(help) command.
+
+Since the 
+.I `g'
+(global) command  masks any errors from failed searches and substitutions,
+it can be used to perform conditional operations in scripts; e.g.,
+.sp
+.RS
+g/\fIold\fR/s//\fInew\fR/
+.RE
+.sp
+replaces any occurrences of
+.I old
+with
+.IR new .
+If the
+.I `u'
+(undo) command occurs in a global command list, then
+the command list is executed only once.
+
+If diagnostics are not disabled, attempting to quit
+.B ed
+or edit another file before writing a modified buffer
+results in an error.
+If the command is entered a second time, it succeeds,
+but any changes to the buffer are lost.
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
new file mode 100644
index 00000000000..6ae2ed2d398
--- /dev/null
+++ b/bin/ed/ed.h
@@ -0,0 +1,297 @@
+/*	$NetBSD: ed.h,v 1.23 1995/03/21 09:04:40 cgd Exp $	*/
+
+/* ed.h: type and constant definitions for the ed editor. */
+/*
+ * Copyright (c) 1993 Andrew Moore
+ * 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 REGENTS 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 REGENTS 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.
+ *
+ *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
+ */
+
+#include <sys/types.h>
+#if defined(BSD) && BSD >= 199103 || defined(__386BSD__)
+# include <sys/param.h>		/* for MAXPATHLEN */
+#endif
+#include <errno.h>
+#if defined(sun) || defined(__NetBSD__)
+# include <limits.h>
+#endif
+#include <regex.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define ERR		(-2)
+#define EMOD		(-3)
+#define FATAL		(-4)
+
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 255		/* _POSIX_PATH_MAX */
+#endif
+
+#define MINBUFSZ 512		/* minimum buffer size - must be > 0 */
+#define SE_MAX 30		/* max subexpressions in a regular expression */
+#ifdef INT_MAX
+# define LINECHARS INT_MAX	/* max chars per line */
+#else
+# define LINECHARS MAXINT	/* max chars per line */
+#endif
+
+/* gflags */
+#define GLB 001		/* global command */
+#define GPR 002		/* print after command */
+#define GLS 004		/* list after command */
+#define GNP 010		/* enumerate after command */
+#define GSG 020		/* global substitute */
+
+typedef regex_t pattern_t;
+
+/* Line node */
+typedef struct	line {
+	struct line	*q_forw;
+	struct line	*q_back;
+	off_t		seek;		/* address of line in scratch buffer */
+	int		len;		/* length of line */
+} line_t;
+
+
+typedef struct undo {
+
+/* type of undo nodes */
+#define UADD	0
+#define UDEL 	1
+#define UMOV	2
+#define VMOV	3
+
+	int type;			/* command type */
+	line_t	*h;			/* head of list */
+	line_t  *t;			/* tail of list */
+} undo_t;
+
+#ifndef max
+# define max(a,b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef min
+# define min(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+#define INC_MOD(l, k)	((l) + 1 > (k) ? 0 : (l) + 1)
+#define DEC_MOD(l, k)	((l) - 1 < 0 ? (k) : (l) - 1)
+
+/* SPL1: disable some interrupts (requires reliable signals) */
+#define SPL1() mutex++
+
+/* SPL0: enable all interrupts; check sigflags (requires reliable signals) */
+#define SPL0() \
+if (--mutex == 0) { \
+	if (sigflags & (1 << (SIGHUP - 1))) handle_hup(SIGHUP); \
+	if (sigflags & (1 << (SIGINT - 1))) handle_int(SIGINT); \
+}
+
+/* STRTOL: convert a string to long */
+#define STRTOL(i, p) { \
+	if (((i = strtol(p, &p, 10)) == LONG_MIN || i == LONG_MAX) && \
+	    errno == ERANGE) { \
+		sprintf(errmsg, "number out of range"); \
+	    	i = 0; \
+		return ERR; \
+	} \
+}
+
+#if defined(sun) || defined(NO_REALLOC_NULL)
+/* REALLOC: assure at least a minimum size for buffer b */
+#define REALLOC(b,n,i,err) \
+if ((i) > (n)) { \
+	int ti = (n); \
+	char *ts; \
+	SPL1(); \
+	if ((b) != NULL) { \
+		if ((ts = (char *) realloc((b), ti += max((i), MINBUFSZ))) == NULL) { \
+			fprintf(stderr, "%s\n", strerror(errno)); \
+			sprintf(errmsg, "out of memory"); \
+			SPL0(); \
+			return err; \
+		} \
+	} else { \
+		if ((ts = (char *) malloc(ti += max((i), MINBUFSZ))) == NULL) { \
+			fprintf(stderr, "%s\n", strerror(errno)); \
+			sprintf(errmsg, "out of memory"); \
+			SPL0(); \
+			return err; \
+		} \
+	} \
+	(n) = ti; \
+	(b) = ts; \
+	SPL0(); \
+}
+#else /* NO_REALLOC_NULL */
+/* REALLOC: assure at least a minimum size for buffer b */
+#define REALLOC(b,n,i,err) \
+if ((i) > (n)) { \
+	int ti = (n); \
+	char *ts; \
+	SPL1(); \
+	if ((ts = (char *) realloc((b), ti += max((i), MINBUFSZ))) == NULL) { \
+		fprintf(stderr, "%s\n", strerror(errno)); \
+		sprintf(errmsg, "out of memory"); \
+		SPL0(); \
+		return err; \
+	} \
+	(n) = ti; \
+	(b) = ts; \
+	SPL0(); \
+}
+#endif /* NO_REALLOC_NULL */
+
+/* REQUE: link pred before succ */
+#define REQUE(pred, succ) (pred)->q_forw = (succ), (succ)->q_back = (pred)
+
+/* INSQUE: insert elem in circular queue after pred */
+#define INSQUE(elem, pred) \
+{ \
+	REQUE((elem), (pred)->q_forw); \
+	REQUE((pred), elem); \
+}
+
+/* remque: remove_lines elem from circular queue */
+#define REMQUE(elem) REQUE((elem)->q_back, (elem)->q_forw);
+
+/* NUL_TO_NEWLINE: overwrite ASCII NULs with newlines */
+#define NUL_TO_NEWLINE(s, l) translit_text(s, l, '\0', '\n')
+
+/* NEWLINE_TO_NUL: overwrite newlines with ASCII NULs */
+#define NEWLINE_TO_NUL(s, l) translit_text(s, l, '\n', '\0')
+
+#ifdef sun
+# define strerror(n) sys_errlist[n]
+#endif
+
+#ifndef __P
+# ifndef __STDC__
+#  define __P(proto) ()
+# else
+#  define __P(proto) proto
+# endif
+#endif
+
+/* Local Function Declarations */
+void add_line_node __P((line_t *));
+int append_lines __P((long));
+int apply_subst_template __P((char *, regmatch_t *, int, int));
+int build_active_list __P((int));
+int cbc_decode __P((char *, FILE *));
+int cbc_encode __P((char *, int, FILE *));
+int check_addr_range __P((long, long));
+void clear_active_list __P((void));
+void clear_undo_stack __P((void));
+int close_sbuf __P((void));
+int copy_lines __P((long));
+int delete_lines __P((long, long));
+void des_error __P((char *));
+int display_lines __P((long, long, int));
+line_t *dup_line_node __P((line_t *));
+int exec_command __P((void));
+long exec_global __P((int, int));
+void expand_des_key __P((char *, char *));
+int extract_addr_range __P((void));
+char *extract_pattern __P((int));
+int extract_subst_tail __P((int *, long *));
+char *extract_subst_template __P((void));
+int filter_lines __P((long, long, char *));
+int flush_des_file __P((FILE *));
+line_t *get_addressed_line_node __P((long));
+pattern_t *get_compiled_pattern __P((void));
+int get_des_char __P((FILE *));
+char *get_extended_line __P((int *, int));
+char *get_filename __P((void));
+int get_keyword __P((void));
+long get_line_node_addr __P((line_t *));
+long get_matching_node_addr __P((pattern_t *, int));
+long get_marked_node_addr __P((int));
+char *get_sbuf_line __P((line_t *));
+int get_shell_command __P((void));
+int get_stream_line __P((FILE *));
+int get_tty_line __P((void));
+void handle_hup __P((int));
+void handle_int __P((int));
+void handle_winch __P((int));
+int has_trailing_escape __P((char *, char *));
+int hex_to_binary __P((int, int));
+void init_buffers __P((void));
+void init_des_cipher __P((void));
+int is_legal_filename __P((char *));
+int join_lines __P((long, long));
+int mark_line_node __P((line_t *, int));
+int move_lines __P((long));
+line_t *next_active_node __P(());
+long next_addr __P((void));
+int open_sbuf __P((void));
+char *parse_char_class __P((char *));
+int pop_undo_stack __P((void));
+undo_t *push_undo_stack __P((int, long, long));
+int put_des_char __P((int, FILE *));
+char *put_sbuf_line __P((char *));
+int put_stream_line __P((FILE *, char *, int));
+int put_tty_line __P((char *, int, long, int));
+void quit __P((int));
+long read_file __P((char *, long));
+long read_stream __P((FILE *, long));
+int search_and_replace __P((pattern_t *, int, int));
+int set_active_node __P((line_t *));
+void set_des_key __P((char *));
+void signal_hup __P((int));
+void signal_int __P((int));
+char *strip_escapes __P((char *));
+int substitute_matching_text __P((pattern_t *, line_t *, int, int));
+char *translit_text __P((char *, int, int, int));
+void unmark_line_node __P((line_t *));
+void unset_active_nodes __P((line_t *, line_t *));
+long write_file __P((char *, char *, long, long));
+long write_stream __P((FILE *, long, long));
+
+/* global buffers */
+extern char stdinbuf[];
+extern char *ibuf;
+extern char *ibufp;
+extern int ibufsz;
+
+/* global flags */
+extern int isbinary;
+extern int isglobal;
+extern int modified;
+extern int mutex;
+extern int sigflags;
+
+/* global vars */
+extern long addr_last;
+extern long current_addr;
+extern char errmsg[];
+extern long first_addr;
+extern int lineno;
+extern long second_addr;
+#ifdef sun
+extern char *sys_errlist[];
+#endif
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
new file mode 100644
index 00000000000..f0d0857c6ac
--- /dev/null
+++ b/bin/ed/glbl.c
@@ -0,0 +1,229 @@
+/*	$NetBSD: glbl.c,v 1.2 1995/03/21 09:04:41 cgd Exp $	*/
+
+/* glob.c: This file contains the global command routines for the ed line
+   editor */
+/*-
+ * Copyright (c) 1993 Andrew Moore, Talke Studio.
+ * 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.
+ */
+
+#ifndef lint
+#if 0
+static char *rcsid = "@(#)glob.c,v 1.1 1994/02/01 00:34:40 alm Exp";
+#else
+static char rcsid[] = "$NetBSD: glbl.c,v 1.2 1995/03/21 09:04:41 cgd Exp $";
+#endif
+#endif /* not lint */
+
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+
+#include "ed.h"
+
+
+/* build_active_list:  add line matching a pattern to the global-active list */
+int
+build_active_list(isgcmd)
+	int isgcmd;
+{
+	pattern_t *pat;
+	line_t *lp;
+	long n;
+	char *s;
+	char delimiter;
+
+	if ((delimiter = *ibufp) == ' ' || delimiter == '\n') {
+		sprintf(errmsg, "invalid pattern delimiter");
+		return ERR;
+	} else if ((pat = get_compiled_pattern()) == NULL)
+		return ERR;
+	else if (*ibufp == delimiter)
+		ibufp++;
+	clear_active_list();
+	lp = get_addressed_line_node(first_addr);
+	for (n = first_addr; n <= second_addr; n++, lp = lp->q_forw) {
+		if ((s = get_sbuf_line(lp)) == NULL)
+			return ERR;
+		if (isbinary)
+			NUL_TO_NEWLINE(s, lp->len);
+		if (!regexec(pat, s, 0, NULL, 0) == isgcmd &&
+		    set_active_node(lp) < 0)
+			return ERR;
+	}
+	return 0;
+}
+
+
+/* exec_global: apply command list in the command buffer to the active
+   lines in a range; return command status */
+long
+exec_global(interact, gflag)
+	int interact;
+	int gflag;
+{
+	static char *ocmd = NULL;
+	static int ocmdsz = 0;
+
+	line_t *lp = NULL;
+	int status;
+	int n;
+	char *cmd = NULL;
+
+#ifdef BACKWARDS
+	if (!interact)
+		if (!strcmp(ibufp, "\n"))
+			cmd = "p\n";		/* null cmd-list == `p' */
+		else if ((cmd = get_extended_line(&n, 0)) == NULL)
+			return ERR;
+#else
+	if (!interact && (cmd = get_extended_line(&n, 0)) == NULL)
+		return ERR;
+#endif
+	clear_undo_stack();
+	while ((lp = next_active_node()) != NULL) {
+		if ((current_addr = get_line_node_addr(lp)) < 0)
+			return ERR;
+		if (interact) {
+			/* print current_addr; get a command in global syntax */
+			if (display_lines(current_addr, current_addr, gflag) < 0)
+				return ERR;
+			while ((n = get_tty_line()) > 0 &&
+			    ibuf[n - 1] != '\n')
+				clearerr(stdin);
+			if (n < 0)
+				return ERR;
+			else if (n == 0) {
+				sprintf(errmsg, "unexpected end-of-file");
+				return ERR;
+			} else if (n == 1 && !strcmp(ibuf, "\n"))
+				continue;
+			else if (n == 2 && !strcmp(ibuf, "&\n")) {
+				if (cmd == NULL) {
+					sprintf(errmsg, "no previous command");
+					return ERR;
+				} else cmd = ocmd;
+			} else if ((cmd = get_extended_line(&n, 0)) == NULL)
+				return ERR;
+			else {
+				REALLOC(ocmd, ocmdsz, n + 1, ERR);
+				memcpy(ocmd, cmd, n + 1);
+				cmd = ocmd;
+			}
+
+		}
+		ibufp = cmd;
+		for (; *ibufp;)
+			if ((status = extract_addr_range()) < 0 ||
+			    (status = exec_command()) < 0 ||
+			    status > 0 && (status = display_lines(
+			    current_addr, current_addr, status)) < 0)
+				return status;
+	}
+	return 0;
+}
+
+
+line_t **active_list;		/* list of lines active in a global command */
+long active_last;		/* index of last active line in active_list */
+long active_size;		/* size of active_list */
+long active_ptr;		/* active_list index (non-decreasing) */
+long active_ndx;		/* active_list index (modulo active_last) */
+
+/* set_active_node: add a line node to the global-active list */
+int
+set_active_node(lp)
+	line_t *lp;
+{
+	if (active_last + 1 > active_size) {
+		int ti = active_size;
+		line_t **ts;
+		SPL1();
+#if defined(sun) || defined(NO_REALLOC_NULL)
+		if (active_list != NULL) {
+#endif
+			if ((ts = (line_t **) realloc(active_list, 
+			    (ti += MINBUFSZ) * sizeof(line_t **))) == NULL) {
+				fprintf(stderr, "%s\n", strerror(errno));
+				sprintf(errmsg, "out of memory");
+				SPL0();
+				return ERR;
+			}
+#if defined(sun) || defined(NO_REALLOC_NULL)
+		} else {
+			if ((ts = (line_t **) malloc((ti += MINBUFSZ) * 
+			    sizeof(line_t **))) == NULL) {
+				fprintf(stderr, "%s\n", strerror(errno));
+				sprintf(errmsg, "out of memory");
+				SPL0();
+				return ERR;
+			}
+		}
+#endif
+		active_size = ti;
+		active_list = ts;
+		SPL0();
+	}
+	active_list[active_last++] = lp;
+	return 0;
+}
+
+
+/* unset_active_nodes: remove a range of lines from the global-active list */
+void
+unset_active_nodes(np, mp)
+	line_t *np, *mp;
+{
+	line_t *lp;
+	long i;
+
+	for (lp = np; lp != mp; lp = lp->q_forw)
+		for (i = 0; i < active_last; i++)
+			if (active_list[active_ndx] == lp) {
+				active_list[active_ndx] = NULL;
+				active_ndx = INC_MOD(active_ndx, active_last - 1);
+				break;
+			} else	active_ndx = INC_MOD(active_ndx, active_last - 1);
+}
+
+
+/* next_active_node: return the next global-active line node */
+line_t *
+next_active_node()
+{
+	while (active_ptr < active_last && active_list[active_ptr] == NULL)
+		active_ptr++;
+	return (active_ptr < active_last) ? active_list[active_ptr++] : NULL;
+}
+
+
+/* clear_active_list: clear the global-active list */
+void
+clear_active_list()
+{
+	SPL1();
+	active_size = active_last = active_ptr = active_ndx = 0;
+	free(active_list);
+	active_list = NULL;
+	SPL0();
+}
diff --git a/bin/ed/io.c b/bin/ed/io.c
new file mode 100644
index 00000000000..597ddc74c23
--- /dev/null
+++ b/bin/ed/io.c
@@ -0,0 +1,381 @@
+/*	$NetBSD: io.c,v 1.2 1995/03/21 09:04:43 cgd Exp $	*/
+
+/* io.c: This file contains the i/o routines for the ed line editor */
+/*-
+ * Copyright (c) 1993 Andrew Moore, Talke Studio.
+ * 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.
+ */
+
+#ifndef lint
+#if 0
+static char *rcsid = "@(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp";
+#else
+static char rcsid[] = "$NetBSD: io.c,v 1.2 1995/03/21 09:04:43 cgd Exp $";
+#endif
+#endif /* not lint */
+
+#include "ed.h"
+
+
+extern int scripted;
+
+/* read_file: read a named file/pipe into the buffer; return line count */
+long
+read_file(fn, n)
+	char *fn;
+	long n;
+{
+	FILE *fp;
+	long size;
+
+
+	fp = (*fn == '!') ? popen(fn + 1, "r") : fopen(strip_escapes(fn), "r");
+	if (fp == NULL) {
+		fprintf(stderr, "%s: %s\n", fn, strerror(errno));
+		sprintf(errmsg, "cannot open input file");
+		return ERR;
+	} else if ((size = read_stream(fp, n)) < 0)
+		return ERR;
+	 else if (((*fn == '!') ?  pclose(fp) : fclose(fp)) < 0) {
+		fprintf(stderr, "%s: %s\n", fn, strerror(errno));
+		sprintf(errmsg, "cannot close input file");
+		return ERR;
+	}
+	fprintf(stderr, !scripted ? "%lu\n" : "", size);
+	return current_addr - n;
+}
+
+
+extern int des;
+
+char *sbuf;			/* file i/o buffer */
+int sbufsz;			/* file i/o buffer size */
+int newline_added;		/* if set, newline appended to input file */
+
+/* read_stream: read a stream into the editor buffer; return status */
+long
+read_stream(fp, n)
+	FILE *fp;
+	long n;
+{
+	line_t *lp = get_addressed_line_node(n);
+	undo_t *up = NULL;
+	unsigned long size = 0;
+	int o_newline_added = newline_added;
+	int o_isbinary = isbinary;
+	int appended = (n == addr_last);
+	int len;
+
+	isbinary = newline_added = 0;
+	if (des)
+		init_des_cipher();
+	for (current_addr = n; (len = get_stream_line(fp)) > 0; size += len) {
+		SPL1();
+		if (put_sbuf_line(sbuf) == NULL) {
+			SPL0();
+			return ERR;
+		}
+		lp = lp->q_forw;
+		if (up)
+			up->t = lp;
+		else if ((up = push_undo_stack(UADD, current_addr,
+		    current_addr)) == NULL) {
+			SPL0();
+			return ERR;
+		}
+		SPL0();
+	}
+	if (len < 0)
+		return ERR;
+	if (appended && size && o_isbinary && o_newline_added)
+		fputs("newline inserted\n", stderr);
+	else if (newline_added && (!appended || !isbinary && !o_isbinary))
+		fputs("newline appended\n", stderr);
+	if (isbinary && newline_added && !appended)
+	    	size += 1;
+	if (!size)
+		newline_added = 1;
+	newline_added = appended ? newline_added : o_newline_added;
+	isbinary = isbinary | o_isbinary;
+	if (des)
+		size += 8 - size % 8;			/* adjust DES size */
+	return size;
+}
+
+
+/* get_stream_line: read a line of text from a stream; return line length */
+int
+get_stream_line(fp)
+	FILE *fp;
+{
+	register int c;
+	register int i = 0;
+
+	while (((c = des ? get_des_char(fp) : getc(fp)) != EOF || !feof(fp) &&
+	    !ferror(fp)) && c != '\n') {
+		REALLOC(sbuf, sbufsz, i + 1, ERR);
+		if (!(sbuf[i++] = c))
+			isbinary = 1;
+	}
+	REALLOC(sbuf, sbufsz, i + 2, ERR);
+	if (c == '\n')
+		sbuf[i++] = c;
+	else if (ferror(fp)) {
+		fprintf(stderr, "%s\n", strerror(errno));
+		sprintf(errmsg, "cannot read input file");
+		return ERR;
+	} else if (i) {
+		sbuf[i++] = '\n';
+		newline_added = 1;
+	}
+	sbuf[i] = '\0';
+	return (isbinary && newline_added && i) ? --i : i;
+}
+
+
+/* write_file: write a range of lines to a named file/pipe; return line count */
+long
+write_file(fn, mode, n, m)
+	char *fn;
+	char *mode;
+	long n;
+	long m;
+{
+	FILE *fp;
+	long size;
+
+	fp = (*fn == '!') ? popen(fn+1, "w") : fopen(strip_escapes(fn), mode);
+	if (fp == NULL) {
+		fprintf(stderr, "%s: %s\n", fn, strerror(errno));
+		sprintf(errmsg, "cannot open output file");
+		return ERR;
+	} else if ((size = write_stream(fp, n, m)) < 0)
+		return ERR;
+	 else if (((*fn == '!') ?  pclose(fp) : fclose(fp)) < 0) {
+		fprintf(stderr, "%s: %s\n", fn, strerror(errno));
+		sprintf(errmsg, "cannot close output file");
+		return ERR;
+	}
+	fprintf(stderr, !scripted ? "%lu\n" : "", size);
+	return n ? m - n + 1 : 0;
+}
+
+
+/* write_stream: write a range of lines to a stream; return status */
+long
+write_stream(fp, n, m)
+	FILE *fp;
+	long n;
+	long m;
+{
+	line_t *lp = get_addressed_line_node(n);
+	unsigned long size = 0;
+	char *s;
+	int len;
+
+	if (des)
+		init_des_cipher();
+	for (; n && n <= m; n++, lp = lp->q_forw) {
+		if ((s = get_sbuf_line(lp)) == NULL)
+			return ERR;
+		len = lp->len;
+		if (n != addr_last || !isbinary || !newline_added)
+			s[len++] = '\n';
+		if (put_stream_line(fp, s, len) < 0)
+			return ERR;
+		size += len;
+	}
+	if (des) {
+		flush_des_file(fp);			/* flush buffer */
+		size += 8 - size % 8;			/* adjust DES size */
+	}
+	return size;
+}
+
+
+/* put_stream_line: write a line of text to a stream; return status */
+int
+put_stream_line(fp, s, len)
+	FILE *fp;
+	char *s;
+	int len;
+{
+	while (len--)
+		if ((des ? put_des_char(*s++, fp) : fputc(*s++, fp)) < 0) {
+			fprintf(stderr, "%s\n", strerror(errno));
+			sprintf(errmsg, "cannot write file");
+			return ERR;
+		}
+	return 0;
+}
+
+/* get_extended_line: get a an extended line from stdin */
+char *
+get_extended_line(sizep, nonl)
+	int *sizep;
+	int nonl;
+{
+	static char *cvbuf = NULL;		/* buffer */
+	static int cvbufsz = 0;			/* buffer size */
+
+	int l, n;
+	char *t = ibufp;
+
+	while (*t++ != '\n')
+		;
+	if ((l = t - ibufp) < 2 || !has_trailing_escape(ibufp, ibufp + l - 1)) {
+		*sizep = l;
+		return ibufp;
+	}
+	*sizep = -1;
+	REALLOC(cvbuf, cvbufsz, l, NULL);
+	memcpy(cvbuf, ibufp, l);
+	*(cvbuf + --l - 1) = '\n'; 	/* strip trailing esc */
+	if (nonl) l--; 			/* strip newline */
+	for (;;) {
+		if ((n = get_tty_line()) < 0)
+			return NULL;
+		else if (n == 0 || ibuf[n - 1] != '\n') {
+			sprintf(errmsg, "unexpected end-of-file");
+			return NULL;
+		}
+		REALLOC(cvbuf, cvbufsz, l + n, NULL);
+		memcpy(cvbuf + l, ibuf, n);
+		l += n;
+		if (n < 2 || !has_trailing_escape(cvbuf, cvbuf + l - 1))
+			break;
+		*(cvbuf + --l - 1) = '\n'; 	/* strip trailing esc */
+		if (nonl) l--; 			/* strip newline */
+	}
+	REALLOC(cvbuf, cvbufsz, l + 1, NULL);
+	cvbuf[l] = '\0';
+	*sizep = l;
+	return cvbuf;
+}
+
+
+/* get_tty_line: read a line of text from stdin; return line length */
+int
+get_tty_line()
+{
+	register int oi = 0;
+	register int i = 0;
+	int c;
+
+	for (;;)
+		switch (c = getchar()) {
+		default:
+			oi = 0;
+			REALLOC(ibuf, ibufsz, i + 2, ERR);
+			if (!(ibuf[i++] = c)) isbinary = 1;
+			if (c != '\n')
+				continue;
+			lineno++;
+			ibuf[i] = '\0';
+			ibufp = ibuf;
+			return i;
+		case EOF:
+			if (ferror(stdin)) {
+				fprintf(stderr, "stdin: %s\n", strerror(errno));
+				sprintf(errmsg, "cannot read stdin");
+				clearerr(stdin);
+				ibufp = NULL;
+				return ERR;
+			} else {
+				clearerr(stdin);
+				if (i != oi) {
+					oi = i;
+					continue;
+				} else if (i)
+					ibuf[i] = '\0';
+				ibufp = ibuf;
+				return i;
+			}
+		}
+}
+
+
+
+#define ESCAPES "\a\b\f\n\r\t\v\\"
+#define ESCCHARS "abfnrtv\\"
+
+extern int rows;
+extern int cols;
+
+/* put_tty_line: print text to stdout */
+int
+put_tty_line(s, l, n, gflag)
+	char *s;
+	int l;
+	long n;
+	int gflag;
+{
+	int col = 0;
+	int lc = 0;
+	char *cp;
+
+	if (gflag & GNP) {
+		printf("%ld\t", n);
+		col = 8;
+	}
+	for (; l--; s++) {
+		if ((gflag & GLS) && ++col > cols) {
+			fputs("\\\n", stdout);
+			col = 1;
+#ifndef BACKWARDS
+			if (!scripted && !isglobal && ++lc > rows) {
+				lc = 0;
+				fputs("Press <RETURN> to continue... ", stdout);
+				fflush(stdout);
+				if (get_tty_line() < 0)
+					return ERR;
+			}
+#endif
+		}
+		if (gflag & GLS) {
+			if (31 < *s && *s < 127 && *s != '\\')
+				putchar(*s);
+			else {
+				putchar('\\');
+				col++;
+				if (*s && (cp = strchr(ESCAPES, *s)) != NULL)
+					putchar(ESCCHARS[cp - ESCAPES]);
+				else {
+					putchar((((unsigned char) *s & 0300) >> 6) + '0');
+					putchar((((unsigned char) *s & 070) >> 3) + '0');
+					putchar(((unsigned char) *s & 07) + '0');
+					col += 2;
+				}
+			}
+
+		} else
+			putchar(*s);
+	}
+#ifndef BACKWARDS
+	if (gflag & GLS)
+		putchar('$');
+#endif
+	putchar('\n');
+	return 0;
+}
diff --git a/bin/ed/main.c b/bin/ed/main.c
new file mode 100644
index 00000000000..d7c527357a2
--- /dev/null
+++ b/bin/ed/main.c
@@ -0,0 +1,1438 @@
+/*	$NetBSD: main.c,v 1.3 1995/03/21 09:04:44 cgd Exp $	*/
+
+/* main.c: This file contains the main control and user-interface routines
+   for the ed line editor. */
+/*-
+ * Copyright (c) 1993 Andrew Moore, Talke Studio.
+ * 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.
+ */
+
+#ifndef lint
+char *copyright =
+"@(#) Copyright (c) 1993 Andrew Moore, Talke Studio. \n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+#if 0
+static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
+#else
+static char rcsid[] = "$NetBSD: main.c,v 1.3 1995/03/21 09:04:44 cgd Exp $";
+#endif
+#endif /* not lint */
+
+/*
+ * CREDITS
+ *
+ *	This program is based on the editor algorithm described in
+ *	Brian W. Kernighan and P. J. Plauger's book "Software Tools 
+ *	in Pascal," Addison-Wesley, 1981.
+ *
+ *	The buffering algorithm is attributed to Rodney Ruddock of
+ *	the University of Guelph, Guelph, Ontario.
+ *
+ *	The cbc.c encryption code is adapted from
+ *	the bdes program by Matt Bishop of Dartmouth College,
+ *	Hanover, NH.
+ *
+ */
+
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+#include <ctype.h>
+#include <setjmp.h>
+#include <pwd.h>
+
+#include "ed.h"
+
+
+#ifdef _POSIX_SOURCE
+sigjmp_buf env;
+#else
+jmp_buf env;
+#endif
+
+/* static buffers */
+char stdinbuf[1];		/* stdin buffer */
+char *shcmd;			/* shell command buffer */
+int shcmdsz;			/* shell command buffer size */
+int shcmdi;			/* shell command buffer index */
+char *ibuf;			/* ed command-line buffer */
+int ibufsz;			/* ed command-line buffer size */
+char *ibufp;			/* pointer to ed command-line buffer */
+
+/* global flags */
+int des = 0;			/* if set, use crypt(3) for i/o */
+int garrulous = 0;		/* if set, print all error messages */
+int isbinary;			/* if set, buffer contains ASCII NULs */
+int isglobal;			/* if set, doing a global command */
+int modified;			/* if set, buffer modified since last write */
+int mutex = 0;			/* if set, signals set "sigflags" */
+int red = 0;			/* if set, restrict shell/directory access */
+int scripted = 0;		/* if set, suppress diagnostics */
+int sigflags = 0;		/* if set, signals received while mutex set */
+int sigactive = 0;		/* if set, signal handlers are enabled */
+
+char old_filename[MAXPATHLEN + 1] = "";	/* default filename */
+long current_addr;		/* current address in editor buffer */
+long addr_last;			/* last address in editor buffer */
+int lineno;			/* script line number */
+char *prompt;			/* command-line prompt */
+char *dps = "*";		/* default command-line prompt */
+
+char *usage = "usage: %s [-] [-sx] [-p string] [name]\n";
+
+extern char errmsg[];
+extern int optind;
+extern char *optarg;
+
+/* ed: line editor */
+int
+main(argc, argv)
+	int argc;
+	char **argv;
+{
+	int c, n;
+	long status = 0;
+
+	red = (n = strlen(argv[0])) > 2 && argv[0][n - 3] == 'r';
+top:
+	while ((c = getopt(argc, argv, "p:sx")) != EOF)
+		switch(c) {
+		case 'p':				/* set prompt */
+			prompt = optarg;
+			break;
+		case 's':				/* run script */
+			scripted = 1;
+			break;
+		case 'x':				/* use crypt */
+#ifdef DES
+			des = get_keyword();
+#else
+			fprintf(stderr, "crypt unavailable\n?\n");
+#endif
+			break;
+
+		default:
+			fprintf(stderr, usage, argv[0]);
+			exit(1);
+		}
+	argv += optind;
+	argc -= optind;
+	if (argc && **argv == '-') {
+		scripted = 1;
+		if (argc > 1) {
+			optind = 1;
+			goto top;
+		}
+		argv++;
+		argc--;
+	}
+	/* assert: reliable signals! */
+#ifdef SIGWINCH
+	handle_winch(SIGWINCH);
+	if (isatty(0)) signal(SIGWINCH, handle_winch);
+#endif
+	signal(SIGHUP, signal_hup);
+	signal(SIGQUIT, SIG_IGN);
+	signal(SIGINT, signal_int);
+#ifdef _POSIX_SOURCE
+	if (status = sigsetjmp(env, 1))
+#else
+	if (status = setjmp(env))
+#endif
+	{
+		fputs("\n?\n", stderr);
+		sprintf(errmsg, "interrupt");
+	} else {
+		init_buffers();
+		sigactive = 1;			/* enable signal handlers */
+		if (argc && **argv && is_legal_filename(*argv)) {
+			if (read_file(*argv, 0) < 0 && !isatty(0))
+				quit(2);
+			else if (**argv != '!')
+				strcpy(old_filename, *argv);
+		} else if (argc) {
+			fputs("?\n", stderr);
+			if (**argv == '\0')
+				sprintf(errmsg, "invalid filename");
+			if (!isatty(0))
+				quit(2);
+		}
+	}
+	for (;;) {
+		if (status < 0 && garrulous)
+			fprintf(stderr, "%s\n", errmsg);
+		if (prompt) {
+			printf("%s", prompt);
+			fflush(stdout);
+		}
+		if ((n = get_tty_line()) < 0) {
+			status = ERR;
+			continue;
+		} else if (n == 0) {
+			if (modified && !scripted) {
+				fputs("?\n", stderr);
+				sprintf(errmsg, "warning: file modified");
+				if (!isatty(0)) {
+					fprintf(stderr, garrulous ? 
+					    "script, line %d: %s\n" :
+					    "", lineno, errmsg);
+					quit(2);
+				}
+				clearerr(stdin);
+				modified = 0;
+				status = EMOD;
+				continue;
+			} else
+				quit(0);
+		} else if (ibuf[n - 1] != '\n') {
+			/* discard line */
+			sprintf(errmsg, "unexpected end-of-file");
+			clearerr(stdin);
+			status = ERR;
+			continue;
+		}
+		isglobal = 0;
+		if ((status = extract_addr_range()) >= 0 &&
+		    (status = exec_command()) >= 0)
+			if (!status || status &&
+			    (status = display_lines(current_addr, current_addr,
+			        status)) >= 0)
+				continue;
+		switch (status) {
+		case EOF:
+			quit(0);
+		case EMOD:
+			modified = 0;
+			fputs("?\n", stderr);		/* give warning */
+			sprintf(errmsg, "warning: file modified");
+			if (!isatty(0)) {
+				fprintf(stderr, garrulous ? 
+				    "script, line %d: %s\n" : 
+				    "", lineno, errmsg);
+				quit(2);
+			}
+			break;
+		case FATAL:
+			if (!isatty(0))
+				fprintf(stderr, garrulous ? 
+				    "script, line %d: %s\n" : "", 
+				    lineno, errmsg);
+			else
+				fprintf(stderr, garrulous ? "%s\n" : "",
+				    errmsg);
+			quit(3);
+		default:
+			fputs("?\n", stderr);
+			if (!isatty(0)) {
+				fprintf(stderr, garrulous ? 
+				    "script, line %d: %s\n" : "",
+				    lineno, errmsg);
+				quit(2);
+			}
+			break;
+		}
+	}
+	/*NOTREACHED*/
+}
+
+long first_addr, second_addr, addr_cnt;
+
+/* extract_addr_range: get line addresses from the command buffer until an 
+   illegal address is seen; return status */
+int
+extract_addr_range()
+{
+	long addr;
+
+	addr_cnt = 0;
+	first_addr = second_addr = current_addr;
+	while ((addr = next_addr()) >= 0) {
+		addr_cnt++;
+		first_addr = second_addr;
+		second_addr = addr;
+		if (*ibufp != ',' && *ibufp != ';')
+			break;
+		else if (*ibufp++ == ';')
+			current_addr = addr;
+	}
+	if ((addr_cnt = min(addr_cnt, 2)) == 1 || second_addr != addr)
+		first_addr = second_addr;
+	return (addr == ERR) ? ERR : 0;
+}
+
+
+#define	SKIP_BLANKS() while (isspace(*ibufp) && *ibufp != '\n') ibufp++
+
+#define MUST_BE_FIRST() \
+	if (!first) { sprintf(errmsg, "invalid address"); return ERR; }
+
+/*  next_addr: return the next line address in the command buffer */
+long
+next_addr()
+{
+	char *hd;
+	long addr = current_addr;
+	long n;
+	int first = 1;
+	int c;
+
+	SKIP_BLANKS();
+	for (hd = ibufp;; first = 0)
+		switch (c = *ibufp) {
+		case '+':
+		case '\t':
+		case ' ':
+		case '-':
+		case '^':
+			ibufp++;
+			SKIP_BLANKS();
+			if (isdigit(*ibufp)) {
+				STRTOL(n, ibufp);
+				addr += (c == '-' || c == '^') ? -n : n;
+			} else if (!isspace(c))
+				addr += (c == '-' || c == '^') ? -1 : 1;
+			break;
+		case '0': case '1': case '2':
+		case '3': case '4': case '5':
+		case '6': case '7': case '8': case '9':
+			MUST_BE_FIRST();
+			STRTOL(addr, ibufp);
+			break;
+		case '.':
+		case '$':
+			MUST_BE_FIRST();
+			ibufp++;
+			addr = (c == '.') ? current_addr : addr_last;
+			break;
+		case '/':
+		case '?':
+			MUST_BE_FIRST();
+			if ((addr = get_matching_node_addr(
+			    get_compiled_pattern(), c == '/')) < 0)
+				return ERR;
+			else if (c == *ibufp)
+				ibufp++;
+			break;
+		case '\'':
+			MUST_BE_FIRST();
+			ibufp++;
+			if ((addr = get_marked_node_addr(*ibufp++)) < 0)
+				return ERR;
+			break;
+		case '%':
+		case ',':
+		case ';':
+			if (first) {
+				ibufp++;
+				addr_cnt++;
+				second_addr = (c == ';') ? current_addr : 1;
+				addr = addr_last;
+				break;
+			}
+			/* FALL THROUGH */
+		default:
+			if (ibufp == hd)
+				return EOF;
+			else if (addr < 0 || addr_last < addr) {
+				sprintf(errmsg, "invalid address");
+				return ERR;
+			} else
+				return addr;
+		}
+	/* NOTREACHED */
+}
+
+
+#ifdef BACKWARDS
+/* GET_THIRD_ADDR: get a legal address from the command buffer */
+#define GET_THIRD_ADDR(addr) \
+{ \
+	long ol1, ol2; \
+\
+	ol1 = first_addr, ol2 = second_addr; \
+	if (extract_addr_range() < 0) \
+		return ERR; \
+	else if (addr_cnt == 0) { \
+		sprintf(errmsg, "destination expected"); \
+		return ERR; \
+	} else if (second_addr < 0 || addr_last < second_addr) { \
+		sprintf(errmsg, "invalid address"); \
+		return ERR; \
+	} \
+	addr = second_addr; \
+	first_addr = ol1, second_addr = ol2; \
+}
+#else	/* BACKWARDS */
+/* GET_THIRD_ADDR: get a legal address from the command buffer */
+#define GET_THIRD_ADDR(addr) \
+{ \
+	long ol1, ol2; \
+\
+	ol1 = first_addr, ol2 = second_addr; \
+	if (extract_addr_range() < 0) \
+		return ERR; \
+	if (second_addr < 0 || addr_last < second_addr) { \
+		sprintf(errmsg, "invalid address"); \
+		return ERR; \
+	} \
+	addr = second_addr; \
+	first_addr = ol1, second_addr = ol2; \
+}
+#endif
+
+
+/* GET_COMMAND_SUFFIX: verify the command suffix in the command buffer */
+#define GET_COMMAND_SUFFIX() { \
+	int done = 0; \
+	do { \
+		switch(*ibufp) { \
+		case 'p': \
+			gflag |= GPR, ibufp++; \
+			break; \
+		case 'l': \
+			gflag |= GLS, ibufp++; \
+			break; \
+		case 'n': \
+			gflag |= GNP, ibufp++; \
+			break; \
+		default: \
+			done++; \
+		} \
+	} while (!done); \
+	if (*ibufp++ != '\n') { \
+		sprintf(errmsg, "invalid command suffix"); \
+		return ERR; \
+	} \
+}
+
+
+/* sflags */
+#define SGG 001		/* complement previous global substitute suffix */
+#define SGP 002		/* complement previous print suffix */
+#define SGR 004		/* use last regex instead of last pat */
+#define SGF 010		/* repeat last substitution */
+
+int patlock = 0;	/* if set, pattern not freed by get_compiled_pattern() */
+
+long rows = 22;		/* scroll length: ws_row - 2 */
+
+/* exec_command: execute the next command in command buffer; return print
+   request, if any */
+int
+exec_command()
+{
+	extern long u_current_addr;
+	extern long u_addr_last;
+
+	static pattern_t *pat = NULL;
+	static int sgflag = 0;
+	static long sgnum = 0;
+
+	pattern_t *tpat;
+	char *fnp;
+	int gflag = 0;
+	int sflags = 0;
+	long addr = 0;
+	int n = 0;
+	int c;
+
+	SKIP_BLANKS();
+	switch(c = *ibufp++) {
+	case 'a':
+		GET_COMMAND_SUFFIX();
+		if (!isglobal) clear_undo_stack();
+		if (append_lines(second_addr) < 0)
+			return ERR;
+		break;
+	case 'c':
+		if (check_addr_range(current_addr, current_addr) < 0)
+			return ERR;
+		GET_COMMAND_SUFFIX();
+		if (!isglobal) clear_undo_stack();
+		if (delete_lines(first_addr, second_addr) < 0 ||
+		    append_lines(current_addr) < 0)
+			return ERR;
+		break;
+	case 'd':
+		if (check_addr_range(current_addr, current_addr) < 0)
+			return ERR;
+		GET_COMMAND_SUFFIX();
+		if (!isglobal) clear_undo_stack();
+		if (delete_lines(first_addr, second_addr) < 0)
+			return ERR;
+		else if ((addr = INC_MOD(current_addr, addr_last)) != 0)
+			current_addr = addr;
+		break;
+	case 'e':
+		if (modified && !scripted)
+			return EMOD;
+		/* fall through */
+	case 'E':
+		if (addr_cnt > 0) {
+			sprintf(errmsg, "unexpected address");
+			return ERR;
+		} else if (!isspace(*ibufp)) {
+			sprintf(errmsg, "unexpected command suffix");
+			return ERR;
+		} else if ((fnp = get_filename()) == NULL)
+			return ERR;
+		GET_COMMAND_SUFFIX();
+		if (delete_lines(1, addr_last) < 0)
+			return ERR;
+		clear_undo_stack();
+		if (close_sbuf() < 0)
+			return ERR;
+		else if (open_sbuf() < 0)
+			return FATAL;
+		if (*fnp && *fnp != '!') strcpy(old_filename, fnp);
+#ifdef BACKWARDS
+		if (*fnp == '\0' && *old_filename == '\0') {
+			sprintf(errmsg, "no current filename");
+			return ERR;
+		}
+#endif
+		if (read_file(*fnp ? fnp : old_filename, 0) < 0)
+			return ERR;
+		clear_undo_stack();
+		modified = 0;
+		u_current_addr = u_addr_last = -1;
+		break;
+	case 'f':
+		if (addr_cnt > 0) {
+			sprintf(errmsg, "unexpected address");
+			return ERR;
+		} else if (!isspace(*ibufp)) {
+			sprintf(errmsg, "unexpected command suffix");
+			return ERR;
+		} else if ((fnp = get_filename()) == NULL)
+			return ERR;
+		else if (*fnp == '!') {
+			sprintf(errmsg, "invalid redirection");
+			return ERR;
+		}
+		GET_COMMAND_SUFFIX();
+		if (*fnp) strcpy(old_filename, fnp);
+		printf("%s\n", strip_escapes(old_filename));
+		break;
+	case 'g':
+	case 'v':
+	case 'G':
+	case 'V':
+		if (isglobal) {
+			sprintf(errmsg, "cannot nest global commands");
+			return ERR;
+		} else if (check_addr_range(1, addr_last) < 0)
+			return ERR;
+		else if (build_active_list(c == 'g' || c == 'G') < 0)
+			return ERR;
+		else if (n = (c == 'G' || c == 'V'))
+			GET_COMMAND_SUFFIX();
+		isglobal++;
+		if (exec_global(n, gflag) < 0)
+			return ERR; 
+		break;
+	case 'h':
+		if (addr_cnt > 0) {
+			sprintf(errmsg, "unexpected address");
+			return ERR;
+		}
+		GET_COMMAND_SUFFIX();
+		if (*errmsg) fprintf(stderr, "%s\n", errmsg);
+		break;
+	case 'H':
+		if (addr_cnt > 0) {
+			sprintf(errmsg, "unexpected address");
+			return ERR;
+		}
+		GET_COMMAND_SUFFIX();
+		if ((garrulous = 1 - garrulous) && *errmsg)
+			fprintf(stderr, "%s\n", errmsg);
+		break;
+	case 'i':
+		if (second_addr == 0) {
+			sprintf(errmsg, "invalid address");
+			return ERR;
+		}
+		GET_COMMAND_SUFFIX();
+		if (!isglobal) clear_undo_stack();
+		if (append_lines(second_addr - 1) < 0)
+			return ERR;
+		break;
+	case 'j':
+		if (check_addr_range(current_addr, current_addr + 1) < 0)
+			return ERR;
+		GET_COMMAND_SUFFIX();
+		if (!isglobal) clear_undo_stack();
+		if (first_addr != second_addr &&
+		    join_lines(first_addr, second_addr) < 0)
+			return ERR;
+		break;
+	case 'k':
+		c = *ibufp++;
+		if (second_addr == 0) {
+			sprintf(errmsg, "invalid address");
+			return ERR;
+		}
+		GET_COMMAND_SUFFIX();
+		if (mark_line_node(get_addressed_line_node(second_addr), c) < 0)
+			return ERR;
+		break;
+	case 'l':
+		if (check_addr_range(current_addr, current_addr) < 0)
+			return ERR;
+		GET_COMMAND_SUFFIX();
+		if (display_lines(first_addr, second_addr, gflag | GLS) < 0)
+			return ERR;
+		gflag = 0;
+		break;
+	case 'm':
+		if (check_addr_range(current_addr, current_addr) < 0)
+			return ERR;
+		GET_THIRD_ADDR(addr);
+		if (first_addr <= addr && addr < second_addr) {
+			sprintf(errmsg, "invalid destination");
+			return ERR;
+		}
+		GET_COMMAND_SUFFIX();
+		if (!isglobal) clear_undo_stack();
+		if (move_lines(addr) < 0)
+			return ERR;
+		break;
+	case 'n':
+		if (check_addr_range(current_addr, current_addr) < 0)
+			return ERR;
+		GET_COMMAND_SUFFIX();
+		if (display_lines(first_addr, second_addr, gflag | GNP) < 0)
+			return ERR;
+		gflag = 0;
+		break;
+	case 'p':
+		if (check_addr_range(current_addr, current_addr) < 0)
+			return ERR;
+		GET_COMMAND_SUFFIX();
+		if (display_lines(first_addr, second_addr, gflag | GPR) < 0)
+			return ERR;
+		gflag = 0;
+		break;
+	case 'P':
+		if (addr_cnt > 0) {
+			sprintf(errmsg, "unexpected address");
+			return ERR;
+		}
+		GET_COMMAND_SUFFIX();
+		prompt = prompt ? NULL : optarg ? optarg : dps;
+		break;
+	case 'q':
+	case 'Q':
+		if (addr_cnt > 0) {
+			sprintf(errmsg, "unexpected address");
+			return ERR;
+		}
+		GET_COMMAND_SUFFIX();
+		gflag =  (modified && !scripted && c == 'q') ? EMOD : EOF;
+		break;
+	case 'r':
+		if (!isspace(*ibufp)) {
+			sprintf(errmsg, "unexpected command suffix");
+			return ERR;
+		} else if (addr_cnt == 0)
+			second_addr = addr_last;
+		if ((fnp = get_filename()) == NULL)
+			return ERR;
+		GET_COMMAND_SUFFIX();
+		if (!isglobal) clear_undo_stack();
+		if (*old_filename == '\0' && *fnp != '!')
+			strcpy(old_filename, fnp);
+#ifdef BACKWARDS
+		if (*fnp == '\0' && *old_filename == '\0') {
+			sprintf(errmsg, "no current filename");
+			return ERR;
+		}
+#endif
+		if ((addr = read_file(*fnp ? fnp : old_filename, second_addr)) < 0)
+			return ERR;
+		else if (addr && addr != addr_last)
+			modified = 1;
+		break;
+	case 's':
+		do {
+			switch(*ibufp) {
+			case '\n':
+				sflags |=SGF;
+				break;
+			case 'g':
+				sflags |= SGG;
+				ibufp++;
+				break;
+			case 'p':
+				sflags |= SGP;
+				ibufp++;
+				break;
+			case 'r':
+				sflags |= SGR;
+				ibufp++;
+				break;
+			case '0': case '1': case '2': case '3': case '4': 
+			case '5': case '6': case '7': case '8': case '9':
+				STRTOL(sgnum, ibufp);
+				sflags |= SGF;
+				sgflag &= ~GSG;		/* override GSG */
+				break;
+			default:
+				if (sflags) {
+					sprintf(errmsg, "invalid command suffix");
+					return ERR;
+				}
+			}
+		} while (sflags && *ibufp != '\n');
+		if (sflags && !pat) {
+			sprintf(errmsg, "no previous substitution");
+			return ERR;
+		} else if (sflags & SGG)
+			sgnum = 0;		/* override numeric arg */
+		if (*ibufp != '\n' && *(ibufp + 1) == '\n') {
+			sprintf(errmsg, "invalid pattern delimiter");
+			return ERR;
+		}
+		tpat = pat;
+		SPL1();
+		if ((!sflags || (sflags & SGR)) &&
+		    (tpat = get_compiled_pattern()) == NULL) {
+		 	SPL0();
+			return ERR;
+		} else if (tpat != pat) {
+			if (pat) {
+				regfree(pat);
+				free(pat);
+			}
+			pat = tpat;
+			patlock = 1;		/* reserve pattern */
+		}
+		SPL0();
+		if (!sflags && extract_subst_tail(&sgflag, &sgnum) < 0)
+			return ERR;
+		else if (isglobal)
+			sgflag |= GLB;
+		else
+			sgflag &= ~GLB;
+		if (sflags & SGG)
+			sgflag ^= GSG;
+		if (sflags & SGP)
+			sgflag ^= GPR, sgflag &= ~(GLS | GNP);
+		do {
+			switch(*ibufp) {
+			case 'p':
+				sgflag |= GPR, ibufp++;
+				break;
+			case 'l':
+				sgflag |= GLS, ibufp++;
+				break;
+			case 'n':
+				sgflag |= GNP, ibufp++;
+				break;
+			default:
+				n++;
+			}
+		} while (!n);
+		if (check_addr_range(current_addr, current_addr) < 0)
+			return ERR;
+		GET_COMMAND_SUFFIX();
+		if (!isglobal) clear_undo_stack();
+		if (search_and_replace(pat, sgflag, sgnum) < 0)
+			return ERR;
+		break;
+	case 't':
+		if (check_addr_range(current_addr, current_addr) < 0)
+			return ERR;
+		GET_THIRD_ADDR(addr);
+		GET_COMMAND_SUFFIX();
+		if (!isglobal) clear_undo_stack();
+		if (copy_lines(addr) < 0)
+			return ERR;
+		break;
+	case 'u':
+		if (addr_cnt > 0) {
+			sprintf(errmsg, "unexpected address");
+			return ERR;
+		}
+		GET_COMMAND_SUFFIX();
+		if (pop_undo_stack() < 0)
+			return ERR;
+		break;
+	case 'w':
+	case 'W':
+		if ((n = *ibufp) == 'q' || n == 'Q') {
+			gflag = EOF;
+			ibufp++;
+		}
+		if (!isspace(*ibufp)) {
+			sprintf(errmsg, "unexpected command suffix");
+			return ERR;
+		} else if ((fnp = get_filename()) == NULL)
+			return ERR;
+		if (addr_cnt == 0 && !addr_last)
+			first_addr = second_addr = 0;
+		else if (check_addr_range(1, addr_last) < 0)
+			return ERR;
+		GET_COMMAND_SUFFIX();
+		if (*old_filename == '\0' && *fnp != '!')
+			strcpy(old_filename, fnp);
+#ifdef BACKWARDS
+		if (*fnp == '\0' && *old_filename == '\0') {
+			sprintf(errmsg, "no current filename");
+			return ERR;
+		}
+#endif
+		if ((addr = write_file(*fnp ? fnp : old_filename, 
+		    (c == 'W') ? "a" : "w", first_addr, second_addr)) < 0)
+			return ERR;
+		else if (addr == addr_last)
+			modified = 0;
+		else if (modified && !scripted && n == 'q')
+			gflag = EMOD;
+		break;
+	case 'x':
+		if (addr_cnt > 0) {
+			sprintf(errmsg, "unexpected address");
+			return ERR;
+		}
+		GET_COMMAND_SUFFIX();
+#ifdef DES
+		des = get_keyword();
+#else
+		sprintf(errmsg, "crypt unavailable");
+		return ERR;
+#endif
+		break;
+	case 'z':
+#ifdef BACKWARDS
+		if (check_addr_range(first_addr = 1, current_addr + 1) < 0)
+#else
+		if (check_addr_range(first_addr = 1, current_addr + !isglobal) < 0)
+#endif
+			return ERR;
+		else if ('0' < *ibufp && *ibufp <= '9')
+			STRTOL(rows, ibufp);
+		GET_COMMAND_SUFFIX();
+		if (display_lines(second_addr, min(addr_last,
+		    second_addr + rows), gflag) < 0)
+			return ERR;
+		gflag = 0;
+		break;
+	case '=':
+		GET_COMMAND_SUFFIX();
+		printf("%d\n", addr_cnt ? second_addr : addr_last);
+		break;
+	case '!':
+		if (addr_cnt > 0) {
+			sprintf(errmsg, "unexpected address");
+			return ERR;
+		} else if ((sflags = get_shell_command()) < 0)
+			return ERR;
+		GET_COMMAND_SUFFIX();
+		if (sflags) printf("%s\n", shcmd + 1);
+		system(shcmd + 1);
+		if (!scripted) printf("!\n");
+		break;
+	case '\n':
+#ifdef BACKWARDS
+		if (check_addr_range(first_addr = 1, current_addr + 1) < 0
+#else
+		if (check_addr_range(first_addr = 1, current_addr + !isglobal) < 0
+#endif
+		 || display_lines(second_addr, second_addr, 0) < 0)
+			return ERR;
+		break;
+	default:
+		sprintf(errmsg, "unknown command");
+		return ERR;
+	}
+	return gflag;
+}
+
+
+/* check_addr_range: return status of address range check */
+int
+check_addr_range(n, m)
+	long n, m;
+{
+	if (addr_cnt == 0) {
+		first_addr = n;
+		second_addr = m;
+	}
+	if (first_addr > second_addr || 1 > first_addr ||
+	    second_addr > addr_last) {
+		sprintf(errmsg, "invalid address");
+		return ERR;
+	}
+	return 0;
+}
+
+
+/* get_matching_node_addr: return the address of the next line matching a 
+   pattern in a given direction.  wrap around begin/end of editor buffer if
+   necessary */
+long
+get_matching_node_addr(pat, dir)
+	pattern_t *pat;
+	int dir;
+{
+	char *s;
+	long n = current_addr;
+	line_t *lp;
+
+	if (!pat) return ERR;
+	do {
+		if (n = dir ? INC_MOD(n, addr_last) : DEC_MOD(n, addr_last)) {
+			lp = get_addressed_line_node(n);
+			if ((s = get_sbuf_line(lp)) == NULL)
+				return ERR;
+			if (isbinary)
+				NUL_TO_NEWLINE(s, lp->len);
+			if (!regexec(pat, s, 0, NULL, 0))
+				return n;
+		}
+	} while (n != current_addr);
+	sprintf(errmsg, "no match");
+	return  ERR;
+}
+
+
+/* get_filename: return pointer to copy of filename in the command buffer */
+char *
+get_filename()
+{
+	static char *file = NULL;
+	static int filesz = 0;
+
+	int n;
+
+	if (*ibufp != '\n') {
+		SKIP_BLANKS();
+		if (*ibufp == '\n') {
+			sprintf(errmsg, "invalid filename");
+			return NULL;
+		} else if ((ibufp = get_extended_line(&n, 1)) == NULL)
+			return NULL;
+		else if (*ibufp == '!') {
+			ibufp++;
+			if ((n = get_shell_command()) < 0)
+				return NULL;
+			if (n) printf("%s\n", shcmd + 1);
+			return shcmd;
+		} else if (n - 1 > MAXPATHLEN) {
+			sprintf(errmsg, "filename too long");
+			return  NULL;
+		}
+	}
+#ifndef BACKWARDS
+	else if (*old_filename == '\0') {
+		sprintf(errmsg, "no current filename");
+		return  NULL;
+	}
+#endif
+	REALLOC(file, filesz, MAXPATHLEN + 1, NULL);
+	for (n = 0; *ibufp != '\n';)
+		file[n++] = *ibufp++;
+	file[n] = '\0';
+	return is_legal_filename(file) ? file : NULL;
+}
+
+
+/* get_shell_command: read a shell command from stdin; return substitution
+   status */
+int
+get_shell_command()
+{
+	static char *buf = NULL;
+	static int n = 0;
+
+	char *s;			/* substitution char pointer */
+	int i = 0;
+	int j = 0;
+
+	if (red) {
+		sprintf(errmsg, "shell access restricted");
+		return ERR;
+	} else if ((s = ibufp = get_extended_line(&j, 1)) == NULL)
+		return ERR;
+	REALLOC(buf, n, j + 1, ERR);
+	buf[i++] = '!';			/* prefix command w/ bang */
+	while (*ibufp != '\n')
+		switch (*ibufp) {
+		default:
+			REALLOC(buf, n, i + 2, ERR);
+			buf[i++] = *ibufp;
+			if (*ibufp++ == '\\')
+				buf[i++] = *ibufp++;
+			break;
+		case '!':
+			if (s != ibufp) {
+				REALLOC(buf, n, i + 1, ERR);
+				buf[i++] = *ibufp++;
+			}
+#ifdef BACKWARDS
+			else if (shcmd == NULL || *(shcmd + 1) == '\0')
+#else
+			else if (shcmd == NULL)
+#endif
+			{
+				sprintf(errmsg, "no previous command");
+				return ERR;
+			} else {
+				REALLOC(buf, n, i + shcmdi, ERR);
+				for (s = shcmd + 1; s < shcmd + shcmdi;)
+					buf[i++] = *s++;
+				s = ibufp++;
+			}
+			break;
+		case '%':
+			if (*old_filename  == '\0') {
+				sprintf(errmsg, "no current filename");
+				return ERR;
+			}
+			j = strlen(s = strip_escapes(old_filename));
+			REALLOC(buf, n, i + j, ERR);
+			while (j--)
+				buf[i++] = *s++;
+			s = ibufp++;
+			break;
+		}
+	REALLOC(shcmd, shcmdsz, i + 1, ERR);
+	memcpy(shcmd, buf, i);
+	shcmd[shcmdi = i] = '\0';
+	return *s == '!' || *s == '%';
+}
+
+
+/* append_lines: insert text from stdin to after line n; stop when either a
+   single period is read or EOF; return status */
+int
+append_lines(n)
+	long n;
+{
+	int l;
+	char *lp = ibuf;
+	char *eot;
+	undo_t *up = NULL;
+
+	for (current_addr = n;;) {
+		if (!isglobal) {
+			if ((l = get_tty_line()) < 0)
+				return ERR;
+			else if (l == 0 || ibuf[l - 1] != '\n') {
+				clearerr(stdin);
+				return  l ? EOF : 0;
+			}
+			lp = ibuf;
+		} else if (*(lp = ibufp) == '\0')
+			return 0;
+		else {
+			while (*ibufp++ != '\n')
+				;
+			l = ibufp - lp;
+		}
+		if (l == 2 && lp[0] == '.' && lp[1] == '\n') {
+			return 0;
+		}
+		eot = lp + l;
+		SPL1();
+		do {
+			if ((lp = put_sbuf_line(lp)) == NULL) {
+				SPL0();
+				return ERR;
+			} else if (up)
+				up->t = get_addressed_line_node(current_addr);
+			else if ((up = push_undo_stack(UADD, current_addr,
+			    current_addr)) == NULL) {
+				SPL0();
+				return ERR;
+			}
+		} while (lp != eot);
+		modified = 1;
+		SPL0();
+	}
+	/* NOTREACHED */
+}
+
+
+/* join_lines: replace a range of lines with the joined text of those lines */
+int
+join_lines(from, to)
+	long from;
+	long to;
+{
+	static char *buf = NULL;
+	static int n;
+
+	char *s;
+	int size = 0;
+	line_t *bp, *ep;
+
+	ep = get_addressed_line_node(INC_MOD(to, addr_last));
+	bp = get_addressed_line_node(from);
+	for (; bp != ep; bp = bp->q_forw) {
+		if ((s = get_sbuf_line(bp)) == NULL)
+			return ERR;
+		REALLOC(buf, n, size + bp->len, ERR);
+		memcpy(buf + size, s, bp->len);
+		size += bp->len;
+	}
+	REALLOC(buf, n, size + 2, ERR);
+	memcpy(buf + size, "\n", 2);
+	if (delete_lines(from, to) < 0)
+		return ERR;
+	current_addr = from - 1;
+	SPL1();
+	if (put_sbuf_line(buf) == NULL ||
+	    push_undo_stack(UADD, current_addr, current_addr) == NULL) {
+		SPL0();
+		return ERR;
+	}
+	modified = 1;
+	SPL0();
+	return 0;
+}
+
+
+/* move_lines: move a range of lines */
+int
+move_lines(addr)
+	long addr;
+{
+	line_t *b1, *a1, *b2, *a2;
+	long n = INC_MOD(second_addr, addr_last);
+	long p = first_addr - 1;
+	int done = (addr == first_addr - 1 || addr == second_addr);
+
+	SPL1();
+	if (done) {
+		a2 = get_addressed_line_node(n);
+		b2 = get_addressed_line_node(p);
+		current_addr = second_addr;
+	} else if (push_undo_stack(UMOV, p, n) == NULL ||
+	    push_undo_stack(UMOV, addr, INC_MOD(addr, addr_last)) == NULL) {
+		SPL0();
+		return ERR;
+	} else {
+		a1 = get_addressed_line_node(n);
+		if (addr < first_addr) {
+			b1 = get_addressed_line_node(p);
+			b2 = get_addressed_line_node(addr);
+					/* this get_addressed_line_node last! */
+		} else {
+			b2 = get_addressed_line_node(addr);
+			b1 = get_addressed_line_node(p);
+					/* this get_addressed_line_node last! */
+		}
+		a2 = b2->q_forw;
+		REQUE(b2, b1->q_forw);
+		REQUE(a1->q_back, a2);
+		REQUE(b1, a1);
+		current_addr = addr + ((addr < first_addr) ? 
+		    second_addr - first_addr + 1 : 0);
+	}
+	if (isglobal)
+		unset_active_nodes(b2->q_forw, a2);
+	modified = 1;
+	SPL0();
+	return 0;
+}
+
+
+/* copy_lines: copy a range of lines; return status */
+int
+copy_lines(addr)
+	long addr;
+{
+	line_t *lp, *np = get_addressed_line_node(first_addr);
+	undo_t *up = NULL;
+	long n = second_addr - first_addr + 1;
+	long m = 0;
+
+	current_addr = addr;
+	if (first_addr <= addr && addr < second_addr) {
+		n =  addr - first_addr + 1;
+		m = second_addr - addr;
+	}
+	for (; n > 0; n=m, m=0, np = get_addressed_line_node(current_addr + 1))
+		for (; n-- > 0; np = np->q_forw) {
+			SPL1();
+			if ((lp = dup_line_node(np)) == NULL) {
+				SPL0();
+				return ERR;
+			}
+			add_line_node(lp);
+			if (up)
+				up->t = lp;
+			else if ((up = push_undo_stack(UADD, current_addr,
+			    current_addr)) == NULL) {
+				SPL0();
+				return ERR;
+			}
+			modified = 1;
+			SPL0();
+		}
+	return 0;
+}
+
+
+/* delete_lines: delete a range of lines */
+int
+delete_lines(from, to)
+	long from, to;
+{
+	line_t *n, *p;
+
+	SPL1();
+	if (push_undo_stack(UDEL, from, to) == NULL) {
+		SPL0();
+		return ERR;
+	}
+	n = get_addressed_line_node(INC_MOD(to, addr_last));
+	p = get_addressed_line_node(from - 1);
+					/* this get_addressed_line_node last! */
+	if (isglobal)
+		unset_active_nodes(p->q_forw, n);
+	REQUE(p, n);
+	addr_last -= to - from + 1;
+	current_addr = from - 1;
+	modified = 1;
+	SPL0();
+	return 0;
+}
+
+
+/* display_lines: print a range of lines to stdout */
+int
+display_lines(from, to, gflag)
+	long from;
+	long to;
+	int gflag;
+{
+	line_t *bp;
+	line_t *ep;
+	char *s;
+
+	if (!from) {
+		sprintf(errmsg, "invalid address");
+		return ERR;
+	}
+	ep = get_addressed_line_node(INC_MOD(to, addr_last));
+	bp = get_addressed_line_node(from);
+	for (; bp != ep; bp = bp->q_forw) {
+		if ((s = get_sbuf_line(bp)) == NULL)
+			return ERR;
+		if (put_tty_line(s, bp->len, current_addr = from++, gflag) < 0)
+			return ERR;
+	}
+	return 0;
+}
+
+
+#define MAXMARK 26			/* max number of marks */
+
+line_t	*mark[MAXMARK];			/* line markers */
+int markno;				/* line marker count */
+
+/* mark_line_node: set a line node mark */
+int
+mark_line_node(lp, n)
+	line_t *lp;
+	int n;
+{
+	if (!islower(n)) {
+		sprintf(errmsg, "invalid mark character");
+		return ERR;
+	} else if (mark[n - 'a'] == NULL)
+		markno++;
+	mark[n - 'a'] = lp;
+	return 0;
+}
+
+
+/* get_marked_node_addr: return address of a marked line */
+long
+get_marked_node_addr(n)
+	int n;
+{
+	if (!islower(n)) {
+		sprintf(errmsg, "invalid mark character");
+		return ERR;
+	}
+	return get_line_node_addr(mark[n - 'a']);
+}
+
+
+/* unmark_line_node: clear line node mark */
+void
+unmark_line_node(lp)
+	line_t *lp;
+{
+	int i;
+
+	for (i = 0; markno && i < MAXMARK; i++)
+		if (mark[i] == lp) {
+			mark[i] = NULL;
+			markno--;
+		}
+}
+
+
+/* dup_line_node: return a pointer to a copy of a line node */
+line_t *
+dup_line_node(lp)
+	line_t *lp;
+{
+	line_t *np;
+
+	if ((np = (line_t *) malloc(sizeof(line_t))) == NULL) {
+		fprintf(stderr, "%s\n", strerror(errno));
+		sprintf(errmsg, "out of memory");
+		return NULL;
+	}
+	np->seek = lp->seek;
+	np->len = lp->len;
+	return np;
+}
+
+
+/* has_trailing_escape:  return the parity of escapes preceding a character
+   in a string */
+int
+has_trailing_escape(s, t)
+	char *s;
+	char *t;
+{
+    return (s == t || *(t - 1) != '\\') ? 0 : !has_trailing_escape(s, t - 1);
+}
+
+
+/* strip_escapes: return copy of escaped string of at most length MAXPATHLEN */
+char *
+strip_escapes(s)
+	char *s;
+{
+	static char *file = NULL;
+	static int filesz = 0;
+
+	int i = 0;
+
+	REALLOC(file, filesz, MAXPATHLEN + 1, NULL);
+	/* assert: no trailing escape */
+	while (file[i++] = (*s == '\\') ? *++s : *s)
+		s++;
+	return file;
+}
+
+
+void
+signal_hup(signo)
+	int signo;
+{
+	if (mutex)
+		sigflags |= (1 << (signo - 1));
+	else	handle_hup(signo);
+}
+
+
+void
+signal_int(signo)
+	int signo;
+{
+	if (mutex)
+		sigflags |= (1 << (signo - 1));
+	else	handle_int(signo);
+}
+
+
+void
+handle_hup(signo)
+	int signo;
+{
+	char *hup = NULL;		/* hup filename */
+	char *s;
+	int n;
+
+	if (!sigactive)
+		quit(1);
+	sigflags &= ~(1 << (signo - 1));
+	if (addr_last && write_file("ed.hup", "w", 1, addr_last) < 0 &&
+	    (s = getenv("HOME")) != NULL &&
+	    (n = strlen(s)) + 8 <= MAXPATHLEN &&	/* "ed.hup" + '/' */
+	    (hup = (char *) malloc(n + 10)) != NULL) {
+		strcpy(hup, s);
+		if (hup[n - 1] != '/')
+			hup[n] = '/', hup[n+1] = '\0';
+		strcat(hup, "ed.hup");
+		write_file(hup, "w", 1, addr_last);
+	}
+	quit(2);
+}
+
+
+void
+handle_int(signo)
+	int signo;
+{
+	if (!sigactive)
+		quit(1);
+	sigflags &= ~(1 << (signo - 1));
+#ifdef _POSIX_SOURCE
+	siglongjmp(env, -1);
+#else
+	longjmp(env, -1);
+#endif
+}
+
+
+int cols = 72;				/* wrap column */
+
+void
+handle_winch(signo)
+	int signo;
+{
+	struct winsize ws;		/* window size structure */
+
+	sigflags &= ~(1 << (signo - 1));
+	if (ioctl(0, TIOCGWINSZ, (char *) &ws) >= 0) {
+		if (ws.ws_row > 2) rows = ws.ws_row - 2;
+		if (ws.ws_col > 8) cols = ws.ws_col - 8;
+	}
+}
+
+
+/* is_legal_filename: return a legal filename */
+int
+is_legal_filename(s)
+	char *s;
+{
+	if (red && (*s == '!' || !strcmp(s, "..") || strchr(s, '/'))) {
+		sprintf(errmsg, "shell access restricted");
+		return 0;
+	}
+	return 1;
+}
diff --git a/bin/ed/re.c b/bin/ed/re.c
new file mode 100644
index 00000000000..5ba51849ba8
--- /dev/null
+++ b/bin/ed/re.c
@@ -0,0 +1,138 @@
+/*	$NetBSD: re.c,v 1.14 1995/03/21 09:04:48 cgd Exp $	*/
+
+/* re.c: This file contains the regular expression interface routines for
+   the ed line editor. */
+/*-
+ * Copyright (c) 1993 Andrew Moore, Talke Studio.
+ * 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.
+ */
+
+#ifndef lint
+#if 0
+static char *rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
+#else
+static char rcsid[] = "$NetBSD: re.c,v 1.14 1995/03/21 09:04:48 cgd Exp $";
+#endif
+#endif /* not lint */
+
+#include "ed.h"
+
+
+extern int patlock;
+
+char errmsg[MAXPATHLEN + 40] = "";
+
+/* get_compiled_pattern: return pointer to compiled pattern from command 
+   buffer */
+pattern_t *
+get_compiled_pattern()
+{
+	static pattern_t *exp = NULL;
+
+	char *exps;
+	char delimiter;
+	int n;
+
+	if ((delimiter = *ibufp) == ' ') {
+		sprintf(errmsg, "invalid pattern delimiter");
+		return NULL;
+	} else if (delimiter == '\n' || *++ibufp == '\n' || *ibufp == delimiter) {
+		if (!exp) sprintf(errmsg, "no previous pattern");
+		return exp;
+	} else if ((exps = extract_pattern(delimiter)) == NULL)
+		return NULL;
+	/* buffer alloc'd && not reserved */
+	if (exp && !patlock)
+		regfree(exp);
+	else if ((exp = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) {
+		fprintf(stderr, "%s\n", strerror(errno));
+		sprintf(errmsg, "out of memory");
+		return NULL;
+	}
+	patlock = 0;
+	if (n = regcomp(exp, exps, 0)) {
+		regerror(n, exp, errmsg, sizeof errmsg);
+		free(exp);
+		return exp = NULL;
+	}
+	return exp;
+}
+
+
+/* extract_pattern: copy a pattern string from the command buffer; return
+   pointer to the copy */
+char *
+extract_pattern(delimiter)
+	int delimiter;
+{
+	static char *lhbuf = NULL;	/* buffer */
+	static int lhbufsz = 0;		/* buffer size */
+
+	char *nd;
+	int len;
+
+	for (nd = ibufp; *nd != delimiter && *nd != '\n'; nd++)
+		switch (*nd) {
+		default:
+			break;
+		case '[':
+			if ((nd = parse_char_class(++nd)) == NULL) {
+				sprintf(errmsg, "unbalanced brackets ([])");
+				return NULL;
+			}
+			break;
+		case '\\':
+			if (*++nd == '\n') {
+				sprintf(errmsg, "trailing backslash (\\)");
+				return NULL;
+			}
+			break;
+		}
+	len = nd - ibufp;
+	REALLOC(lhbuf, lhbufsz, len + 1, NULL);
+	memcpy(lhbuf, ibufp, len);
+	lhbuf[len] = '\0';
+	ibufp = nd;
+	return (isbinary) ? NUL_TO_NEWLINE(lhbuf, len) : lhbuf;
+}
+
+
+/* parse_char_class: expand a POSIX character class */
+char *
+parse_char_class(s)
+	char *s;
+{
+	int c, d;
+
+	if (*s == '^')
+		s++;
+	if (*s == ']')
+		s++;
+	for (; *s != ']' && *s != '\n'; s++)
+		if (*s == '[' && ((d = *(s+1)) == '.' || d == ':' || d == '='))
+			for (s++, c = *++s; *s != ']' || c != d; s++)
+				if ((c = *s) == '\n')
+					return NULL;
+	return  (*s == ']') ? s : NULL;
+}
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
new file mode 100644
index 00000000000..d5e32abe796
--- /dev/null
+++ b/bin/ed/sub.c
@@ -0,0 +1,272 @@
+/*	$NetBSD: sub.c,v 1.4 1995/03/21 09:04:50 cgd Exp $	*/
+
+/* sub.c: This file contains the substitution routines for the ed 
+   line editor */
+/*-
+ * Copyright (c) 1993 Andrew Moore, Talke Studio.
+ * 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.
+ */
+
+#ifndef lint
+#if 0
+static char *rcsid = "@(#)sub.c,v 1.1 1994/02/01 00:34:44 alm Exp";
+#else
+static char rcsid[] = "$NetBSD: sub.c,v 1.4 1995/03/21 09:04:50 cgd Exp $";
+#endif
+#endif /* not lint */
+
+#include "ed.h"
+
+
+char *rhbuf;			/* rhs substitution buffer */
+int rhbufsz;			/* rhs substitution buffer size */
+int rhbufi;			/* rhs substitution buffer index */
+
+/* extract_subst_tail: extract substitution tail from the command buffer */
+int
+extract_subst_tail(flagp, np)
+	int *flagp;
+	long *np;
+{
+	char delimiter;
+
+	*flagp = *np = 0;
+	if ((delimiter = *ibufp) == '\n') {
+		rhbufi = 0;
+		*flagp = GPR;
+		return 0;
+	} else if (extract_subst_template() == NULL)
+		return  ERR;
+	else if (*ibufp == '\n') {
+		*flagp = GPR;
+		return 0;
+	} else if (*ibufp == delimiter)
+		ibufp++;
+	if ('1' <= *ibufp && *ibufp <= '9') {
+		STRTOL(*np, ibufp);
+		return 0;
+	} else if (*ibufp == 'g') {
+		ibufp++;
+		*flagp = GSG;
+		return 0;
+	}
+	return 0;
+}
+
+
+/* extract_subst_template: return pointer to copy of substitution template
+   in the command buffer */
+char *
+extract_subst_template()
+{
+	int n = 0;
+	int i = 0;
+	char c;
+	char delimiter = *ibufp++;
+
+	if (*ibufp == '%' && *(ibufp + 1) == delimiter) {
+		ibufp++;
+		if (!rhbuf) sprintf(errmsg, "no previous substitution");
+		return rhbuf;
+	}
+	while (*ibufp != delimiter) {
+		REALLOC(rhbuf, rhbufsz, i + 2, NULL);
+		if ((c = rhbuf[i++] = *ibufp++) == '\n' && *ibufp == '\0') {
+			i--, ibufp--;
+			break;
+		} else if (c != '\\')
+			;
+		else if ((rhbuf[i++] = *ibufp++) != '\n')
+			;
+		else if (!isglobal) {
+			while ((n = get_tty_line()) == 0 ||
+			    n > 0 && ibuf[n - 1] != '\n')
+				clearerr(stdin);
+			if (n < 0)
+				return NULL;
+		}
+	}
+	REALLOC(rhbuf, rhbufsz, i + 1, NULL);
+	rhbuf[rhbufi = i] = '\0';
+	return  rhbuf;
+}
+
+
+char *rbuf;			/* substitute_matching_text buffer */
+int rbufsz;			/* substitute_matching_text buffer size */
+
+/* search_and_replace: for each line in a range, change text matching a pattern
+   according to a substitution template; return status  */
+int
+search_and_replace(pat, gflag, kth)
+	pattern_t *pat;
+	int gflag;
+	int kth;
+{
+	undo_t *up;
+	char *txt;
+	char *eot;
+	long lc;
+	long xa = current_addr;
+	int nsubs = 0;
+	line_t *lp;
+	int len;
+
+	current_addr = first_addr - 1;
+	for (lc = 0; lc <= second_addr - first_addr; lc++) {
+		lp = get_addressed_line_node(++current_addr);
+		if ((len = substitute_matching_text(pat, lp, gflag, kth)) < 0)
+			return ERR;
+		else if (len) {
+			up = NULL;
+			if (delete_lines(current_addr, current_addr) < 0)
+				return ERR;
+			txt = rbuf;
+			eot = rbuf + len;
+			SPL1();
+			do {
+				if ((txt = put_sbuf_line(txt)) == NULL) {
+					SPL0();
+					return ERR;
+				} else if (up)
+					up->t = get_addressed_line_node(current_addr);
+				else if ((up = push_undo_stack(UADD,
+				    current_addr, current_addr)) == NULL) {
+					SPL0();
+					return ERR;
+				}
+			} while (txt != eot);
+			SPL0();
+			nsubs++;
+			xa = current_addr;
+		}
+	}
+	current_addr = xa;
+	if  (nsubs == 0 && !(gflag & GLB)) {
+		sprintf(errmsg, "no match");
+		return ERR;
+	} else if ((gflag & (GPR | GLS | GNP)) &&
+	    display_lines(current_addr, current_addr, gflag) < 0)
+		return ERR;
+	return 0;
+}
+
+
+/* substitute_matching_text: replace text matched by a pattern according to
+   a substitution template; return pointer to the modified text */
+int
+substitute_matching_text(pat, lp, gflag, kth)
+	pattern_t *pat;
+	line_t *lp;
+	int gflag;
+	int kth;
+{
+	int off = 0;
+	int changed = 0;
+	int matchno = 0;
+	int i = 0;
+	regmatch_t rm[SE_MAX];
+	char *txt;
+	char *eot;
+
+	if ((txt = get_sbuf_line(lp)) == NULL)
+		return ERR;
+	if (isbinary) 
+		NUL_TO_NEWLINE(txt, lp->len);
+	eot = txt + lp->len;
+	if (!regexec(pat, txt, SE_MAX, rm, 0)) {
+		do {
+			if (!kth || kth == ++matchno) {
+				changed++;
+				i = rm[0].rm_so;
+				REALLOC(rbuf, rbufsz, off + i, ERR);
+				if (isbinary)
+					NEWLINE_TO_NUL(txt, rm[0].rm_eo);
+				memcpy(rbuf + off, txt, i);
+				off += i;
+				if ((off = apply_subst_template(txt, rm, off,
+				    pat->re_nsub)) < 0)
+					return ERR;
+			} else {
+				i = rm[0].rm_eo;
+				REALLOC(rbuf, rbufsz, off + i, ERR);
+				if (isbinary)
+					NEWLINE_TO_NUL(txt, i);
+				memcpy(rbuf + off, txt, i);
+				off += i;
+			}
+			txt += rm[0].rm_eo;
+		} while (*txt && (!changed || (gflag & GSG) && rm[0].rm_eo) &&
+		    !regexec(pat, txt, SE_MAX, rm, REG_NOTBOL));
+		i = eot - txt;
+		REALLOC(rbuf, rbufsz, off + i + 2, ERR);
+		if (i > 0 && !rm[0].rm_eo && (gflag & GSG)) {
+			sprintf(errmsg, "infinite substitution loop");
+			return  ERR;
+		}
+		if (isbinary)
+			NEWLINE_TO_NUL(txt, i);
+		memcpy(rbuf + off, txt, i);
+		memcpy(rbuf + off + i, "\n", 2);
+	}
+	return changed ? off + i + 1 : 0;
+}
+
+
+/* apply_subst_template: modify text according to a substitution template;
+   return offset to end of modified text */
+int
+apply_subst_template(boln, rm, off, re_nsub)
+	char *boln;
+	regmatch_t *rm;
+	int off;
+	int re_nsub;
+{
+	int j = 0;
+	int k = 0;
+	int n;
+	char *sub = rhbuf;
+
+	for (; sub - rhbuf < rhbufi; sub++)
+		if (*sub == '&') {
+			j = rm[0].rm_so;
+			k = rm[0].rm_eo;
+			REALLOC(rbuf, rbufsz, off + k - j, ERR);
+			while (j < k)
+				rbuf[off++] = boln[j++];
+		} else if (*sub == '\\' && '1' <= *++sub && *sub <= '9' &&
+		    (n = *sub - '0') <= re_nsub) {
+			j = rm[n].rm_so;
+			k = rm[n].rm_eo;
+			REALLOC(rbuf, rbufsz, off + k - j, ERR);
+			while (j < k)
+				rbuf[off++] = boln[j++];
+		} else {
+			REALLOC(rbuf, rbufsz, off + 1, ERR);
+			rbuf[off++] = *sub;
+		}
+	REALLOC(rbuf, rbufsz, off + 1, ERR);
+	rbuf[off] = '\0';
+	return off;
+}
diff --git a/bin/ed/test/=.err b/bin/ed/test/=.err
new file mode 100644
index 00000000000..6a6055955b1
--- /dev/null
+++ b/bin/ed/test/=.err
@@ -0,0 +1 @@
+1,$=
diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile
new file mode 100644
index 00000000000..5f0dc3d55de
--- /dev/null
+++ b/bin/ed/test/Makefile
@@ -0,0 +1,25 @@
+#	$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
new file mode 100644
index 00000000000..73d7f2ee084
--- /dev/null
+++ b/bin/ed/test/README
@@ -0,0 +1,32 @@
+$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:
+=-err.ed
+a1-err.ed
+i1-err.ed
+k1-err.ed
+r1-err.ed
diff --git a/bin/ed/test/TODO b/bin/ed/test/TODO
new file mode 100644
index 00000000000..c516d1eb809
--- /dev/null
+++ b/bin/ed/test/TODO
@@ -0,0 +1,17 @@
+$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
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/a.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/a.r b/bin/ed/test/a.r
new file mode 100644
index 00000000000..26257bd3b3c
--- /dev/null
+++ b/bin/ed/test/a.r
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..ac98c40d085
--- /dev/null
+++ b/bin/ed/test/a.t
@@ -0,0 +1,9 @@
+0a
+hello world
+.
+2a
+hello world!
+.
+$a
+hello world!!
+.
diff --git a/bin/ed/test/a1.err b/bin/ed/test/a1.err
new file mode 100644
index 00000000000..e80815ff50d
--- /dev/null
+++ b/bin/ed/test/a1.err
@@ -0,0 +1,3 @@
+1,$a
+hello world
+.
diff --git a/bin/ed/test/a2.err b/bin/ed/test/a2.err
new file mode 100644
index 00000000000..ec4b00b40c4
--- /dev/null
+++ b/bin/ed/test/a2.err
@@ -0,0 +1,3 @@
+aa
+hello world
+.
diff --git a/bin/ed/test/addr.d b/bin/ed/test/addr.d
new file mode 100644
index 00000000000..8f7ba1b5d35
--- /dev/null
+++ b/bin/ed/test/addr.d
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..04caf17f422
--- /dev/null
+++ b/bin/ed/test/addr.r
@@ -0,0 +1,2 @@
+line 2
+line9
diff --git a/bin/ed/test/addr.t b/bin/ed/test/addr.t
new file mode 100644
index 00000000000..750b224ed88
--- /dev/null
+++ b/bin/ed/test/addr.t
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 00000000000..29d6383b52c
--- /dev/null
+++ b/bin/ed/test/addr1.err
@@ -0,0 +1 @@
+100
diff --git a/bin/ed/test/addr2.err b/bin/ed/test/addr2.err
new file mode 100644
index 00000000000..e96acb9254b
--- /dev/null
+++ b/bin/ed/test/addr2.err
@@ -0,0 +1 @@
+-100
diff --git a/bin/ed/test/ascii.d b/bin/ed/test/ascii.d
new file mode 100644
index 00000000000..c86626638e0
--- /dev/null
+++ b/bin/ed/test/ascii.d
diff --git a/bin/ed/test/ascii.r b/bin/ed/test/ascii.r
new file mode 100644
index 00000000000..c86626638e0
--- /dev/null
+++ b/bin/ed/test/ascii.r
diff --git a/bin/ed/test/ascii.t b/bin/ed/test/ascii.t
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/ascii.t
diff --git a/bin/ed/test/bang1.d b/bin/ed/test/bang1.d
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/bang1.d
diff --git a/bin/ed/test/bang1.err b/bin/ed/test/bang1.err
new file mode 100644
index 00000000000..630af9011c9
--- /dev/null
+++ b/bin/ed/test/bang1.err
@@ -0,0 +1 @@
+.!date
diff --git a/bin/ed/test/bang1.r b/bin/ed/test/bang1.r
new file mode 100644
index 00000000000..dcf02b2fb6b
--- /dev/null
+++ b/bin/ed/test/bang1.r
@@ -0,0 +1 @@
+okay
diff --git a/bin/ed/test/bang1.t b/bin/ed/test/bang1.t
new file mode 100644
index 00000000000..d7b1fea1f7f
--- /dev/null
+++ b/bin/ed/test/bang1.t
@@ -0,0 +1,5 @@
+!read one
+hello, world
+a
+okay
+.
diff --git a/bin/ed/test/bang2.err b/bin/ed/test/bang2.err
new file mode 100644
index 00000000000..79d89568222
--- /dev/null
+++ b/bin/ed/test/bang2.err
@@ -0,0 +1 @@
+!!
diff --git a/bin/ed/test/c.d b/bin/ed/test/c.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/c.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/c.r b/bin/ed/test/c.r
new file mode 100644
index 00000000000..0fb3e4fffc0
--- /dev/null
+++ b/bin/ed/test/c.r
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 00000000000..ebdd536f817
--- /dev/null
+++ b/bin/ed/test/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/bin/ed/test/c1.err b/bin/ed/test/c1.err
new file mode 100644
index 00000000000..658ec38b464
--- /dev/null
+++ b/bin/ed/test/c1.err
@@ -0,0 +1,3 @@
+cc
+hello world
+.
diff --git a/bin/ed/test/c2.err b/bin/ed/test/c2.err
new file mode 100644
index 00000000000..24b322776a6
--- /dev/null
+++ b/bin/ed/test/c2.err
@@ -0,0 +1,3 @@
+0c
+hello world
+.
diff --git a/bin/ed/test/ckscripts.sh b/bin/ed/test/ckscripts.sh
new file mode 100644
index 00000000000..86a19b18d89
--- /dev/null
+++ b/bin/ed/test/ckscripts.sh
@@ -0,0 +1,37 @@
+#!/bin/sh -
+#	$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 remainding 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
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/d.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/d.err b/bin/ed/test/d.err
new file mode 100644
index 00000000000..f03f6945fbf
--- /dev/null
+++ b/bin/ed/test/d.err
@@ -0,0 +1 @@
+dd
diff --git a/bin/ed/test/d.r b/bin/ed/test/d.r
new file mode 100644
index 00000000000..b7e242c00cd
--- /dev/null
+++ b/bin/ed/test/d.r
@@ -0,0 +1 @@
+line 2
diff --git a/bin/ed/test/d.t b/bin/ed/test/d.t
new file mode 100644
index 00000000000..c7c473febdf
--- /dev/null
+++ b/bin/ed/test/d.t
@@ -0,0 +1,3 @@
+1d
+2;+1d
+$d
diff --git a/bin/ed/test/e1.d b/bin/ed/test/e1.d
new file mode 100644
index 00000000000..3b18e512dba
--- /dev/null
+++ b/bin/ed/test/e1.d
@@ -0,0 +1 @@
+hello world
diff --git a/bin/ed/test/e1.err b/bin/ed/test/e1.err
new file mode 100644
index 00000000000..827cc292b6b
--- /dev/null
+++ b/bin/ed/test/e1.err
@@ -0,0 +1 @@
+ee e1.err
diff --git a/bin/ed/test/e1.r b/bin/ed/test/e1.r
new file mode 100644
index 00000000000..e656728bab2
--- /dev/null
+++ b/bin/ed/test/e1.r
@@ -0,0 +1 @@
+E e1.t
diff --git a/bin/ed/test/e1.t b/bin/ed/test/e1.t
new file mode 100644
index 00000000000..e656728bab2
--- /dev/null
+++ b/bin/ed/test/e1.t
@@ -0,0 +1 @@
+E e1.t
diff --git a/bin/ed/test/e2.d b/bin/ed/test/e2.d
new file mode 100644
index 00000000000..aa44630d22a
--- /dev/null
+++ b/bin/ed/test/e2.d
@@ -0,0 +1 @@
+E !echo hello world-
diff --git a/bin/ed/test/e2.err b/bin/ed/test/e2.err
new file mode 100644
index 00000000000..779a64b54ff
--- /dev/null
+++ b/bin/ed/test/e2.err
@@ -0,0 +1 @@
+.e e2.err
diff --git a/bin/ed/test/e2.r b/bin/ed/test/e2.r
new file mode 100644
index 00000000000..59ebf11fd09
--- /dev/null
+++ b/bin/ed/test/e2.r
@@ -0,0 +1 @@
+hello world-
diff --git a/bin/ed/test/e2.t b/bin/ed/test/e2.t
new file mode 100644
index 00000000000..aa44630d22a
--- /dev/null
+++ b/bin/ed/test/e2.t
@@ -0,0 +1 @@
+E !echo hello world-
diff --git a/bin/ed/test/e3.d b/bin/ed/test/e3.d
new file mode 100644
index 00000000000..aa44630d22a
--- /dev/null
+++ b/bin/ed/test/e3.d
@@ -0,0 +1 @@
+E !echo hello world-
diff --git a/bin/ed/test/e3.err b/bin/ed/test/e3.err
new file mode 100644
index 00000000000..80a7fdcf92e
--- /dev/null
+++ b/bin/ed/test/e3.err
@@ -0,0 +1 @@
+ee.err
diff --git a/bin/ed/test/e3.r b/bin/ed/test/e3.r
new file mode 100644
index 00000000000..aa44630d22a
--- /dev/null
+++ b/bin/ed/test/e3.r
@@ -0,0 +1 @@
+E !echo hello world-
diff --git a/bin/ed/test/e3.t b/bin/ed/test/e3.t
new file mode 100644
index 00000000000..1c507261389
--- /dev/null
+++ b/bin/ed/test/e3.t
@@ -0,0 +1 @@
+E
diff --git a/bin/ed/test/e4.d b/bin/ed/test/e4.d
new file mode 100644
index 00000000000..aa44630d22a
--- /dev/null
+++ b/bin/ed/test/e4.d
@@ -0,0 +1 @@
+E !echo hello world-
diff --git a/bin/ed/test/e4.r b/bin/ed/test/e4.r
new file mode 100644
index 00000000000..aa44630d22a
--- /dev/null
+++ b/bin/ed/test/e4.r
@@ -0,0 +1 @@
+E !echo hello world-
diff --git a/bin/ed/test/e4.t b/bin/ed/test/e4.t
new file mode 100644
index 00000000000..d905d9da82c
--- /dev/null
+++ b/bin/ed/test/e4.t
@@ -0,0 +1 @@
+e
diff --git a/bin/ed/test/f1.err b/bin/ed/test/f1.err
new file mode 100644
index 00000000000..e60975adabb
--- /dev/null
+++ b/bin/ed/test/f1.err
@@ -0,0 +1 @@
+.f f1.err
diff --git a/bin/ed/test/f2.err b/bin/ed/test/f2.err
new file mode 100644
index 00000000000..26d1c5e3a75
--- /dev/null
+++ b/bin/ed/test/f2.err
@@ -0,0 +1 @@
+ff1.err
diff --git a/bin/ed/test/g1.d b/bin/ed/test/g1.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/g1.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/g1.err b/bin/ed/test/g1.err
new file mode 100644
index 00000000000..f95ea22232c
--- /dev/null
+++ b/bin/ed/test/g1.err
@@ -0,0 +1 @@
+g/./s //x/
diff --git a/bin/ed/test/g1.r b/bin/ed/test/g1.r
new file mode 100644
index 00000000000..578a44b6b21
--- /dev/null
+++ b/bin/ed/test/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/bin/ed/test/g1.t b/bin/ed/test/g1.t
new file mode 100644
index 00000000000..2d0b54f35ad
--- /dev/null
+++ b/bin/ed/test/g1.t
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/g2.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/g2.err b/bin/ed/test/g2.err
new file mode 100644
index 00000000000..0ff6a5a601d
--- /dev/null
+++ b/bin/ed/test/g2.err
@@ -0,0 +1 @@
+g//s/./x/
diff --git a/bin/ed/test/g2.r b/bin/ed/test/g2.r
new file mode 100644
index 00000000000..3b18e512dba
--- /dev/null
+++ b/bin/ed/test/g2.r
@@ -0,0 +1 @@
+hello world
diff --git a/bin/ed/test/g2.t b/bin/ed/test/g2.t
new file mode 100644
index 00000000000..831ee8367bc
--- /dev/null
+++ b/bin/ed/test/g2.t
@@ -0,0 +1,2 @@
+g/[2-4]/-1,+1c\
+hello world
diff --git a/bin/ed/test/g3.d b/bin/ed/test/g3.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/g3.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/g3.err b/bin/ed/test/g3.err
new file mode 100644
index 00000000000..01058d844a9
--- /dev/null
+++ b/bin/ed/test/g3.err
@@ -0,0 +1 @@
+g
diff --git a/bin/ed/test/g3.r b/bin/ed/test/g3.r
new file mode 100644
index 00000000000..cc6fbddec23
--- /dev/null
+++ b/bin/ed/test/g3.r
@@ -0,0 +1,5 @@
+linc 3
+xine 1
+xine 2
+xinc 4
+xinc5
diff --git a/bin/ed/test/g3.t b/bin/ed/test/g3.t
new file mode 100644
index 00000000000..2d052a6e840
--- /dev/null
+++ b/bin/ed/test/g3.t
@@ -0,0 +1,4 @@
+g/./s//x/\
+3m0
+g/./s/e/c/\
+2,3m1
diff --git a/bin/ed/test/g4.d b/bin/ed/test/g4.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/g4.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/g4.r b/bin/ed/test/g4.r
new file mode 100644
index 00000000000..350882d8237
--- /dev/null
+++ b/bin/ed/test/g4.r
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..ec618166cc3
--- /dev/null
+++ b/bin/ed/test/g4.t
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 00000000000..a92d664bc20
--- /dev/null
+++ b/bin/ed/test/g5.d
@@ -0,0 +1,3 @@
+line 1
+line 2
+line 3
diff --git a/bin/ed/test/g5.r b/bin/ed/test/g5.r
new file mode 100644
index 00000000000..15a26758bac
--- /dev/null
+++ b/bin/ed/test/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/bin/ed/test/g5.t b/bin/ed/test/g5.t
new file mode 100644
index 00000000000..e213481d54c
--- /dev/null
+++ b/bin/ed/test/g5.t
@@ -0,0 +1,2 @@
+g/./1,3t$\
+1d
diff --git a/bin/ed/test/h.err b/bin/ed/test/h.err
new file mode 100644
index 00000000000..a71e506f6dd
--- /dev/null
+++ b/bin/ed/test/h.err
@@ -0,0 +1 @@
+.h
diff --git a/bin/ed/test/i.d b/bin/ed/test/i.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/i.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/i.r b/bin/ed/test/i.r
new file mode 100644
index 00000000000..5f27af09c03
--- /dev/null
+++ b/bin/ed/test/i.r
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..d1d98057d88
--- /dev/null
+++ b/bin/ed/test/i.t
@@ -0,0 +1,9 @@
+1i
+hello world
+.
+2i
+hello world!
+.
+$i
+hello world!!
+.
diff --git a/bin/ed/test/i1.err b/bin/ed/test/i1.err
new file mode 100644
index 00000000000..aaddede2599
--- /dev/null
+++ b/bin/ed/test/i1.err
@@ -0,0 +1,3 @@
+1,$i
+hello world
+.
diff --git a/bin/ed/test/i2.err b/bin/ed/test/i2.err
new file mode 100644
index 00000000000..b63f5ac507f
--- /dev/null
+++ b/bin/ed/test/i2.err
@@ -0,0 +1,3 @@
+ii
+hello world
+.
diff --git a/bin/ed/test/i3.err b/bin/ed/test/i3.err
new file mode 100644
index 00000000000..6d200c8c97e
--- /dev/null
+++ b/bin/ed/test/i3.err
@@ -0,0 +1,3 @@
+0i
+hello world
+.
diff --git a/bin/ed/test/j.d b/bin/ed/test/j.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/j.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/j.r b/bin/ed/test/j.r
new file mode 100644
index 00000000000..66f36a8f8ab
--- /dev/null
+++ b/bin/ed/test/j.r
@@ -0,0 +1,4 @@
+line 1
+line 2line 3
+line 4
+line5
diff --git a/bin/ed/test/j.t b/bin/ed/test/j.t
new file mode 100644
index 00000000000..9b5d28ddf17
--- /dev/null
+++ b/bin/ed/test/j.t
@@ -0,0 +1,2 @@
+1,1j
+2,3j
diff --git a/bin/ed/test/k.d b/bin/ed/test/k.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/k.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/k.r b/bin/ed/test/k.r
new file mode 100644
index 00000000000..eeb38db20c6
--- /dev/null
+++ b/bin/ed/test/k.r
@@ -0,0 +1,5 @@
+line 3
+hello world
+line 4
+line5
+line 2
diff --git a/bin/ed/test/k.t b/bin/ed/test/k.t
new file mode 100644
index 00000000000..53d588dd07a
--- /dev/null
+++ b/bin/ed/test/k.t
@@ -0,0 +1,10 @@
+2ka
+1d
+'am$
+1ka
+0a
+hello world
+.
+'ad
+u
+'am0
diff --git a/bin/ed/test/k1.err b/bin/ed/test/k1.err
new file mode 100644
index 00000000000..eba1f3d8ff1
--- /dev/null
+++ b/bin/ed/test/k1.err
@@ -0,0 +1 @@
+1,$ka
diff --git a/bin/ed/test/k2.err b/bin/ed/test/k2.err
new file mode 100644
index 00000000000..b34a18d5195
--- /dev/null
+++ b/bin/ed/test/k2.err
@@ -0,0 +1 @@
+kA
diff --git a/bin/ed/test/k3.err b/bin/ed/test/k3.err
new file mode 100644
index 00000000000..70190c473df
--- /dev/null
+++ b/bin/ed/test/k3.err
@@ -0,0 +1 @@
+0ka
diff --git a/bin/ed/test/k4.err b/bin/ed/test/k4.err
new file mode 100644
index 00000000000..34576422294
--- /dev/null
+++ b/bin/ed/test/k4.err
@@ -0,0 +1,6 @@
+a
+hello
+.
+.ka
+'ad
+'ap
diff --git a/bin/ed/test/l.d b/bin/ed/test/l.d
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/l.d
diff --git a/bin/ed/test/l.r b/bin/ed/test/l.r
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/l.r
diff --git a/bin/ed/test/l.t b/bin/ed/test/l.t
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/l.t
diff --git a/bin/ed/test/m.d b/bin/ed/test/m.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/m.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/m.err b/bin/ed/test/m.err
new file mode 100644
index 00000000000..3aec4c32c1f
--- /dev/null
+++ b/bin/ed/test/m.err
@@ -0,0 +1,4 @@
+a
+hello world
+.
+1,$m1
diff --git a/bin/ed/test/m.r b/bin/ed/test/m.r
new file mode 100644
index 00000000000..186cf5403b9
--- /dev/null
+++ b/bin/ed/test/m.r
@@ -0,0 +1,5 @@
+line5
+line 1
+line 2
+line 3
+line 4
diff --git a/bin/ed/test/m.t b/bin/ed/test/m.t
new file mode 100644
index 00000000000..c39c0887245
--- /dev/null
+++ b/bin/ed/test/m.t
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..5e1a09527b8
--- /dev/null
+++ b/bin/ed/test/mkscripts.sh
@@ -0,0 +1,75 @@
+#!/bin/sh -
+#	$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
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/n.d
diff --git a/bin/ed/test/n.r b/bin/ed/test/n.r
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/n.r
diff --git a/bin/ed/test/n.t b/bin/ed/test/n.t
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/n.t
diff --git a/bin/ed/test/nl.err b/bin/ed/test/nl.err
new file mode 100644
index 00000000000..8949a85006c
--- /dev/null
+++ b/bin/ed/test/nl.err
@@ -0,0 +1 @@
+,1
diff --git a/bin/ed/test/nl1.d b/bin/ed/test/nl1.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/nl1.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/nl1.r b/bin/ed/test/nl1.r
new file mode 100644
index 00000000000..9d8854cd04d
--- /dev/null
+++ b/bin/ed/test/nl1.r
@@ -0,0 +1,8 @@
+
+
+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
new file mode 100644
index 00000000000..ea192e9b829
--- /dev/null
+++ b/bin/ed/test/nl1.t
@@ -0,0 +1,8 @@
+1
+
+
+0a
+
+
+hello world
+.
diff --git a/bin/ed/test/nl2.d b/bin/ed/test/nl2.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/nl2.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/nl2.r b/bin/ed/test/nl2.r
new file mode 100644
index 00000000000..fe99e416286
--- /dev/null
+++ b/bin/ed/test/nl2.r
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..73fd27b7e23
--- /dev/null
+++ b/bin/ed/test/nl2.t
@@ -0,0 +1,4 @@
+a
+hello world
+.
+0;/./
diff --git a/bin/ed/test/p.d b/bin/ed/test/p.d
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/p.d
diff --git a/bin/ed/test/p.r b/bin/ed/test/p.r
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/p.r
diff --git a/bin/ed/test/p.t b/bin/ed/test/p.t
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/p.t
diff --git a/bin/ed/test/q.d b/bin/ed/test/q.d
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/q.d
diff --git a/bin/ed/test/q.r b/bin/ed/test/q.r
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/q.r
diff --git a/bin/ed/test/q.t b/bin/ed/test/q.t
new file mode 100644
index 00000000000..123a2c8e2cf
--- /dev/null
+++ b/bin/ed/test/q.t
@@ -0,0 +1,5 @@
+w q.o
+a
+hello
+.
+q
diff --git a/bin/ed/test/q1.err b/bin/ed/test/q1.err
new file mode 100644
index 00000000000..0a7e178d206
--- /dev/null
+++ b/bin/ed/test/q1.err
@@ -0,0 +1 @@
+.q
diff --git a/bin/ed/test/r1.d b/bin/ed/test/r1.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/r1.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/r1.err b/bin/ed/test/r1.err
new file mode 100644
index 00000000000..269aa7cbcb8
--- /dev/null
+++ b/bin/ed/test/r1.err
@@ -0,0 +1 @@
+1,$r r1.err
diff --git a/bin/ed/test/r1.r b/bin/ed/test/r1.r
new file mode 100644
index 00000000000..a3ff506ec7c
--- /dev/null
+++ b/bin/ed/test/r1.r
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..d787a923e3f
--- /dev/null
+++ b/bin/ed/test/r1.t
@@ -0,0 +1,3 @@
+1;r !echo hello world
+1
+r !echo hello world
diff --git a/bin/ed/test/r2.d b/bin/ed/test/r2.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/r2.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/r2.err b/bin/ed/test/r2.err
new file mode 100644
index 00000000000..1c44fa3ea9c
--- /dev/null
+++ b/bin/ed/test/r2.err
@@ -0,0 +1 @@
+r a-good-book
diff --git a/bin/ed/test/r2.r b/bin/ed/test/r2.r
new file mode 100644
index 00000000000..ac152ba9d0a
--- /dev/null
+++ b/bin/ed/test/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/bin/ed/test/r2.t b/bin/ed/test/r2.t
new file mode 100644
index 00000000000..4286f428e3b
--- /dev/null
+++ b/bin/ed/test/r2.t
@@ -0,0 +1 @@
+r
diff --git a/bin/ed/test/r3.d b/bin/ed/test/r3.d
new file mode 100644
index 00000000000..593eec6192b
--- /dev/null
+++ b/bin/ed/test/r3.d
@@ -0,0 +1 @@
+r r3.t
diff --git a/bin/ed/test/r3.r b/bin/ed/test/r3.r
new file mode 100644
index 00000000000..86d5f904fc1
--- /dev/null
+++ b/bin/ed/test/r3.r
@@ -0,0 +1,2 @@
+r r3.t
+r r3.t
diff --git a/bin/ed/test/r3.t b/bin/ed/test/r3.t
new file mode 100644
index 00000000000..593eec6192b
--- /dev/null
+++ b/bin/ed/test/r3.t
@@ -0,0 +1 @@
+r r3.t
diff --git a/bin/ed/test/s1.d b/bin/ed/test/s1.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/s1.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/s1.err b/bin/ed/test/s1.err
new file mode 100644
index 00000000000..d7ca0cf480d
--- /dev/null
+++ b/bin/ed/test/s1.err
@@ -0,0 +1 @@
+s . x
diff --git a/bin/ed/test/s1.r b/bin/ed/test/s1.r
new file mode 100644
index 00000000000..4eb0980cfe7
--- /dev/null
+++ b/bin/ed/test/s1.r
@@ -0,0 +1,5 @@
+liene 1
+(liene) (2)
+(liene) (3)
+liene (4)
+(()liene5)
diff --git a/bin/ed/test/s1.t b/bin/ed/test/s1.t
new file mode 100644
index 00000000000..b0028bb6c92
--- /dev/null
+++ b/bin/ed/test/s1.t
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..0d8d83de19a
--- /dev/null
+++ b/bin/ed/test/s10.err
@@ -0,0 +1,4 @@
+a
+hello
+.
+s/[h[.]/x/
diff --git a/bin/ed/test/s2.d b/bin/ed/test/s2.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/s2.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/s2.err b/bin/ed/test/s2.err
new file mode 100644
index 00000000000..b5c851df7b2
--- /dev/null
+++ b/bin/ed/test/s2.err
@@ -0,0 +1,4 @@
+a
+a
+.
+s/x*/a/g
diff --git a/bin/ed/test/s2.r b/bin/ed/test/s2.r
new file mode 100644
index 00000000000..ca305c8d506
--- /dev/null
+++ b/bin/ed/test/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/bin/ed/test/s2.t b/bin/ed/test/s2.t
new file mode 100644
index 00000000000..f36584997c9
--- /dev/null
+++ b/bin/ed/test/s2.t
@@ -0,0 +1,4 @@
+,s/./(&)/3
+s/$/00
+2s//%/g
+s/^l
diff --git a/bin/ed/test/s3.d b/bin/ed/test/s3.d
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/bin/ed/test/s3.d
diff --git a/bin/ed/test/s3.err b/bin/ed/test/s3.err
new file mode 100644
index 00000000000..d68c7d07f99
--- /dev/null
+++ b/bin/ed/test/s3.err
@@ -0,0 +1 @@
+s/[xyx/a/
diff --git a/bin/ed/test/s3.r b/bin/ed/test/s3.r
new file mode 100644
index 00000000000..d6cada2212f
--- /dev/null
+++ b/bin/ed/test/s3.r
@@ -0,0 +1 @@
+hello   world
diff --git a/bin/ed/test/s3.t b/bin/ed/test/s3.t
new file mode 100644
index 00000000000..fbf880304b7
--- /dev/null
+++ b/bin/ed/test/s3.t
@@ -0,0 +1,6 @@
+a
+hello/[]world
+.
+s/[/]/ /
+s/[[:digit:][]/ /
+s/[]]/ /
diff --git a/bin/ed/test/s4.err b/bin/ed/test/s4.err
new file mode 100644
index 00000000000..35b609fc625
--- /dev/null
+++ b/bin/ed/test/s4.err
@@ -0,0 +1 @@
+s/\a\b\c/xyz/
diff --git a/bin/ed/test/s5.err b/bin/ed/test/s5.err
new file mode 100644
index 00000000000..89104c55232
--- /dev/null
+++ b/bin/ed/test/s5.err
@@ -0,0 +1 @@
+s//xyz/
diff --git a/bin/ed/test/s6.err b/bin/ed/test/s6.err
new file mode 100644
index 00000000000..b4785957bc9
--- /dev/null
+++ b/bin/ed/test/s6.err
@@ -0,0 +1 @@
+s
diff --git a/bin/ed/test/s7.err b/bin/ed/test/s7.err
new file mode 100644
index 00000000000..30ba4fded76
--- /dev/null
+++ b/bin/ed/test/s7.err
@@ -0,0 +1,5 @@
+a
+hello world
+.
+/./
+sr
diff --git a/bin/ed/test/s8.err b/bin/ed/test/s8.err
new file mode 100644
index 00000000000..5665767c3fa
--- /dev/null
+++ b/bin/ed/test/s8.err
@@ -0,0 +1,4 @@
+a
+hello
+.
+s/[h[=]/x/
diff --git a/bin/ed/test/s9.err b/bin/ed/test/s9.err
new file mode 100644
index 00000000000..1ff16dd8470
--- /dev/null
+++ b/bin/ed/test/s9.err
@@ -0,0 +1,4 @@
+a
+hello
+.
+s/[h[:]/x/
diff --git a/bin/ed/test/t.d b/bin/ed/test/t.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/t.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/t.r b/bin/ed/test/t.r
new file mode 100644
index 00000000000..2b2854758d5
--- /dev/null
+++ b/bin/ed/test/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/bin/ed/test/t1.d b/bin/ed/test/t1.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/t1.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/t1.err b/bin/ed/test/t1.err
new file mode 100644
index 00000000000..c49c556e0e4
--- /dev/null
+++ b/bin/ed/test/t1.err
@@ -0,0 +1 @@
+tt
diff --git a/bin/ed/test/t1.r b/bin/ed/test/t1.r
new file mode 100644
index 00000000000..2b2854758d5
--- /dev/null
+++ b/bin/ed/test/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/bin/ed/test/t1.t b/bin/ed/test/t1.t
new file mode 100644
index 00000000000..6b66163793a
--- /dev/null
+++ b/bin/ed/test/t1.t
@@ -0,0 +1,3 @@
+1t0
+2,3t2
+,t$
diff --git a/bin/ed/test/t2.d b/bin/ed/test/t2.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/t2.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/t2.err b/bin/ed/test/t2.err
new file mode 100644
index 00000000000..c202051b7f1
--- /dev/null
+++ b/bin/ed/test/t2.err
@@ -0,0 +1 @@
+t0;-1
diff --git a/bin/ed/test/t2.r b/bin/ed/test/t2.r
new file mode 100644
index 00000000000..0c75ff554ca
--- /dev/null
+++ b/bin/ed/test/t2.r
@@ -0,0 +1,6 @@
+line 1
+line5
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/t2.t b/bin/ed/test/t2.t
new file mode 100644
index 00000000000..5175abdec90
--- /dev/null
+++ b/bin/ed/test/t2.t
@@ -0,0 +1 @@
+t0;/./
diff --git a/bin/ed/test/u.d b/bin/ed/test/u.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/u.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/u.err b/bin/ed/test/u.err
new file mode 100644
index 00000000000..caa1ba11488
--- /dev/null
+++ b/bin/ed/test/u.err
@@ -0,0 +1 @@
+.u
diff --git a/bin/ed/test/u.r b/bin/ed/test/u.r
new file mode 100644
index 00000000000..ad558d82d02
--- /dev/null
+++ b/bin/ed/test/u.r
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..131cb6e25c1
--- /dev/null
+++ b/bin/ed/test/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/bin/ed/test/v.d b/bin/ed/test/v.d
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/v.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/v.r b/bin/ed/test/v.r
new file mode 100644
index 00000000000..714db63e357
--- /dev/null
+++ b/bin/ed/test/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/bin/ed/test/v.t b/bin/ed/test/v.t
new file mode 100644
index 00000000000..608a77fb6a4
--- /dev/null
+++ b/bin/ed/test/v.t
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..92f337e977f
--- /dev/null
+++ b/bin/ed/test/w.d
@@ -0,0 +1,5 @@
+line 1
+line 2
+line 3
+line 4
+line5
diff --git a/bin/ed/test/w.r b/bin/ed/test/w.r
new file mode 100644
index 00000000000..ac152ba9d0a
--- /dev/null
+++ b/bin/ed/test/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/bin/ed/test/w.t b/bin/ed/test/w.t
new file mode 100644
index 00000000000..c2e18bd2f65
--- /dev/null
+++ b/bin/ed/test/w.t
@@ -0,0 +1,2 @@
+w !cat >\!.z
+r \!.z
diff --git a/bin/ed/test/w1.err b/bin/ed/test/w1.err
new file mode 100644
index 00000000000..e2c8a603f7e
--- /dev/null
+++ b/bin/ed/test/w1.err
@@ -0,0 +1 @@
+w /to/some/far-away/place
diff --git a/bin/ed/test/w2.err b/bin/ed/test/w2.err
new file mode 100644
index 00000000000..9daf89cfa71
--- /dev/null
+++ b/bin/ed/test/w2.err
@@ -0,0 +1 @@
+ww.o
diff --git a/bin/ed/test/w3.err b/bin/ed/test/w3.err
new file mode 100644
index 00000000000..39bbf4c95b9
--- /dev/null
+++ b/bin/ed/test/w3.err
@@ -0,0 +1 @@
+wqp w.o
diff --git a/bin/ed/test/x.err b/bin/ed/test/x.err
new file mode 100644
index 00000000000..0953f01dd07
--- /dev/null
+++ b/bin/ed/test/x.err
@@ -0,0 +1 @@
+.x
diff --git a/bin/ed/test/z.err b/bin/ed/test/z.err
new file mode 100644
index 00000000000..6a51a2d5830
--- /dev/null
+++ b/bin/ed/test/z.err
@@ -0,0 +1,2 @@
+z
+z
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
new file mode 100644
index 00000000000..8a30a9110f2
--- /dev/null
+++ b/bin/ed/undo.c
@@ -0,0 +1,160 @@
+/*	$NetBSD: undo.c,v 1.2 1995/03/21 09:04:52 cgd Exp $	*/
+
+/* undo.c: This file contains the undo routines for the ed line editor */
+/*-
+ * Copyright (c) 1993 Andrew Moore, Talke Studio.
+ * 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.
+ */
+
+#ifndef lint
+#if 0
+static char *rcsid = "@(#)undo.c,v 1.1 1994/02/01 00:34:44 alm Exp";
+#else
+static char rcsid[] = "$NetBSD: undo.c,v 1.2 1995/03/21 09:04:52 cgd Exp $";
+#endif
+#endif /* not lint */
+
+#include "ed.h"
+
+
+#define USIZE 100				/* undo stack size */
+undo_t *ustack = NULL;				/* undo stack */
+long usize = 0;					/* stack size variable */
+long u_p = 0;					/* undo stack pointer */
+
+/* push_undo_stack: return pointer to intialized undo node */
+undo_t *
+push_undo_stack(type, from, to)
+	int type;
+	long from;
+	long to;
+{
+	undo_t *t;
+
+#if defined(sun) || defined(NO_REALLOC_NULL)
+	if (ustack == NULL &&
+	    (ustack = (undo_t *) malloc((usize = USIZE) * sizeof(undo_t))) == NULL) {
+		fprintf(stderr, "%s\n", strerror(errno));
+		sprintf(errmsg, "out of memory");
+		return NULL;
+	}
+#endif
+	t = ustack;
+	if (u_p < usize ||
+	    (t = (undo_t *) realloc(ustack, (usize += USIZE) * sizeof(undo_t))) != NULL) {
+		ustack = t;
+		ustack[u_p].type = type;
+		ustack[u_p].t = get_addressed_line_node(to);
+		ustack[u_p].h = get_addressed_line_node(from);
+		return ustack + u_p++;
+	}
+	/* out of memory - release undo stack */
+	fprintf(stderr, "%s\n", strerror(errno));
+	sprintf(errmsg, "out of memory");
+	clear_undo_stack();
+	free(ustack);
+	ustack = NULL;
+	usize = 0;
+	return NULL;
+}
+
+
+/* USWAP: swap undo nodes */
+#define USWAP(x,y) { \
+	undo_t utmp; \
+	utmp = x, x = y, y = utmp; \
+}
+
+
+long u_current_addr = -1;	/* if >= 0, undo enabled */
+long u_addr_last = -1;		/* if >= 0, undo enabled */
+
+/* pop_undo_stack: undo last change to the editor buffer */
+int
+pop_undo_stack()
+{
+	long n;
+	long o_current_addr = current_addr;
+	long o_addr_last = addr_last;
+
+	if (u_current_addr == -1 || u_addr_last == -1) {
+		sprintf(errmsg, "nothing to undo");
+		return ERR;
+	} else if (u_p)
+		modified = 1;
+	get_addressed_line_node(0);	/* this get_addressed_line_node last! */
+	SPL1();
+	for (n = u_p; n-- > 0;) {
+		switch(ustack[n].type) {
+		case UADD:
+			REQUE(ustack[n].h->q_back, ustack[n].t->q_forw);
+			break;
+		case UDEL:
+			REQUE(ustack[n].h->q_back, ustack[n].h);
+			REQUE(ustack[n].t, ustack[n].t->q_forw);
+			break;
+		case UMOV:
+		case VMOV:
+			REQUE(ustack[n - 1].h, ustack[n].h->q_forw);
+			REQUE(ustack[n].t->q_back, ustack[n - 1].t);
+			REQUE(ustack[n].h, ustack[n].t);
+			n--;
+			break;
+		default:
+			/*NOTREACHED*/
+			;
+		}
+		ustack[n].type ^= 1;
+	}
+	/* reverse undo stack order */
+	for (n = u_p; n-- > (u_p + 1)/ 2;)
+		USWAP(ustack[n], ustack[u_p - 1 - n]);
+	if (isglobal)
+		clear_active_list();
+	current_addr = u_current_addr, u_current_addr = o_current_addr;
+	addr_last = u_addr_last, u_addr_last = o_addr_last;
+	SPL0();
+	return 0;
+}
+
+
+/* clear_undo_stack: clear the undo stack */
+void
+clear_undo_stack()
+{
+	line_t *lp, *ep, *tl;
+
+	while (u_p--)
+		if (ustack[u_p].type == UDEL) {
+			ep = ustack[u_p].t->q_forw;
+			for (lp = ustack[u_p].h; lp != ep; lp = tl) {
+				unmark_line_node(lp);
+				tl = lp->q_forw;
+				free(lp);
+			}
+		}
+	u_p = 0;
+	u_current_addr = current_addr;
+	u_addr_last = addr_last;
+}