include netdrv_tg3 on cd

Revert "SMP - no_apic=0 and acpi=1 set when CONFIG_SMP=y"
This reverts commit c468f4efa5. Since we use the new boot loader, this hack is no longer necessary.
2012-02-26 23:36:00 +01:00 · 2012-02-24 14:58:48 +01:00 · 2012-02-24 13:29:58 +01:00 · 2012-02-24 13:10:27 +01:00 · 2012-02-24 11:51:07 +01:00 · 2012-02-22 16:39:41 +01:00
9512 changed files with 233443 additions and 1962620 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,13 +10,11 @@ cscope.*
 *.[1-9].gz
 *.o
 *.[psS]o
-*.pico
-lib*.so*
 *.a
-*.so.*
 *.d
 .depend
 nbsdsrc/*
+tools/revision
 TAGS
 tags
 GPATH
@@ -35,9 +33,7 @@ usr.bin/mdocml/man/*.7
 etc/passwd
 etc/pwd.db
 etc/spwd.db
-releasetools/image
-releasetools/kernel
-releasetools/revision
+tools/image
+tools/kernel
 share/zoneinfo/builddir
 lib/libc/compat__*
-.gdbinit
--- a/.gitreview
+++ b/.gitreview
@@ -1,17 +0,0 @@
-# MINIX 3 code review setup.
-# 
-# This gerrit code review configuration is meant for performing per commit 
-# internal code reviews. If you are an external contributor please read and 
-# apply http://wiki.minix3.org/en/HowToContribute
-#
-# Consider reading http://wiki.openstack.org/GerritWorkflow to learn how
-# to install git review on a Linux setup. On Minix you can use pkgin to 
-# install git-review.
-#
-[gerrit]
-# The git-minix host is to be configured in your .ssh/config
-#
-host=git-minix
-port=2222
-project=minix
-defaultbranch=master
--- a/636
+++ b/636
@@ -1,548 +1,124 @@
-#	$NetBSD: Makefile,v 1.299 2012/08/17 16:22:27 joerg Exp $
-
-#
-# This is the top-level makefile for building NetBSD. For an outline of
-# how to build a snapshot or release, as well as other release engineering
-# information, see http://www.NetBSD.org/developers/releng/index.html
-#
-# Not everything you can set or do is documented in this makefile. In
-# particular, you should review the files in /usr/share/mk (especially
-# bsd.README) for general information on building programs and writing
-# Makefiles within this structure, and see the comments in src/etc/Makefile
-# for further information on installation and release set options.
-#
-# Variables listed below can be set on the make command line (highest
-# priority), in /etc/mk.conf (middle priority), or in the environment
-# (lowest priority).
-#
-# Variables:
-#   DESTDIR is the target directory for installation of the compiled
-#	software. It defaults to /. Note that programs are built against
-#	libraries installed in DESTDIR.
-#   MKMAN, if `no', will prevent building of manual pages.
-#   MKOBJDIRS, if not `no', will build object directories at
-#	an appropriate point in a build.
-#   MKSHARE, if `no', will prevent building and installing
-#	anything in /usr/share.
-#   MKUPDATE, if not `no', will avoid a `make cleandir' at the start of
-#	`make build', as well as having the effects listed in
-#	/usr/share/mk/bsd.README.
-#   NOCLEANDIR, if defined, will avoid a `make cleandir' at the start
-#	of the `make build'.
-#   NOINCLUDES will avoid the `make includes' usually done by `make build'.
-#
-#   See mk.conf(5) for more details.
-#
-#
-# Targets:
-#   build:
-#	Builds a full release of NetBSD in DESTDIR, except for the
-#	/etc configuration files.
-#	If BUILD_DONE is set, this is an empty target.
-#   distribution:
-#	Builds a full release of NetBSD in DESTDIR, including the /etc
-#	configuration files.
-#   buildworld:
-#	As per `make distribution', except that it ensures that DESTDIR
-#	is not the root directory.
-#   installworld:
-#	Install the distribution from DESTDIR to INSTALLWORLDDIR (which
-#	defaults to the root directory).  Ensures that INSTALLWORLDDIR
-#	is not the root directory if cross compiling.
-#   release:
-#	Does a `make distribution', and then tars up the DESTDIR files
-#	into ${RELEASEDIR}/${RELEASEMACHINEDIR}, in release(7) format.
-#	(See etc/Makefile for more information on this.)
-#   regression-tests:
-#	Runs the regression tests in "regress" on this host.
-#   sets:
-#	Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
-#	from ${DESTDIR}
-#   sourcesets:
-#	Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
-#   syspkgs:
-#	Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
-#	from ${DESTDIR}
-#   iso-image:
-#	Create CD-ROM image in RELEASEDIR/iso.
-#	RELEASEDIR must already have been populated by `make release'
-#	or equivalent.
-#   iso-image-source:
-#	Create CD-ROM image with source in RELEASEDIR/iso.
-#	RELEASEDIR must already have been populated by
-#	`make release sourcesets' or equivalent.
-#   live-image:
-#	Create bootable live image for emulators or USB stick etc.
-#	in RELEASEDIR/liveimage.
-#	RELEASEDIR must already have been populated by `make release'
-#	or equivalent.
-#   install-image:
-#	Create bootable installation image for USB stick etc.
-#	in RELEASEDIR/installimage.
-#	RELEASEDIR must already have been populated by `make release'
-#	or equivalent.
-#
-# Targets invoked by `make build,' in order:
-#   cleandir:        cleans the tree.
-#   do-top-obj:      creates the top level object directory.
-#   do-tools-obj:    creates object directories for the host toolchain.
-#   do-tools:        builds host toolchain.
-#   obj:             creates object directories.
-#   do-distrib-dirs: creates the distribution directories.
-#   includes:        installs include files.
-#   do-tools-compat: builds the "libnbcompat" library; needed for some
-#                    random host tool programs in the source tree.
-#   do-lib:          builds and installs prerequisites from lib
-#                    if ${MKCOMPAT} != "no".
-#   do-compat-lib:   builds and installs prerequisites from compat/lib
-#                    if ${MKCOMPAT} != "no".
-#   do-build:        builds and installs the entire system.
-#   do-x11:          builds and installs X11 if ${MKX11} != "no"; either
-#                    X11R7 from src/external/mit/xorg if ${X11FLAVOUR} == "Xorg"
-#                    or X11R6 from src/x11
-#   do-extsrc:       builds and installs extsrc if ${MKEXTSRC} != "no".
-#   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
-#
-
-.if ${.MAKEFLAGS:M${.CURDIR}/share/mk} == ""
-.MAKEFLAGS: -m ${.CURDIR}/share/mk
-.endif
-
-#
-# If _SRC_TOP_OBJ_ gets set here, we will end up with a directory that may
-# not be the top level objdir, because "make obj" can happen in the *middle*
-# of "make build" (long after <bsd.own.mk> is calculated it).  So, pre-set
-# _SRC_TOP_OBJ_ here so it will not be added to ${.MAKEOVERRIDES}.
-#
-_SRC_TOP_OBJ_=
+# Master Makefile to compile everything in /usr/src except the system.

 .include <bsd.own.mk>

-#
-# Sanity check: make sure that "make build" is not invoked simultaneously
-# with a standard recursive target.
-#
+MAKE=make

-.if make(build) || make(release) || make(snapshot)
-.for targ in ${TARGETS:Nobj:Ncleandir}
-.if make(${targ}) && !target(.BEGIN)
-.BEGIN:
-	@echo 'BUILD ABORTED: "make build" and "make ${targ}" are mutually exclusive.'
-	@false
-.endif
-.endfor
-.endif
+usage:
+	@echo "" 
+	@echo "Master Makefile for MINIX commands and utilities." 
+	@echo "Root privileges are required for some actions." 
+	@echo "" 
+	@echo "Usage:" 
+	@echo "	make world         # Compile everything (libraries & commands)"
+	@echo "	make includes      # Install include files from src/"
+	@echo "	make libraries     # Compile and install libraries"
+	@echo "	make commands      # Compile all, commands, but don't install"
+	@echo "	make install       # Compile and install commands"
+	@echo "	make gnu-includes  # Install include files for GCC"
+	@echo "	make clean         # Remove all compiler results"
+	@echo "" 
+	@echo "Run 'make' in tools/ to create a new MINIX configuration." 
+	@echo "" 

-#
-# _SUBDIR is used to set SUBDIR, after removing directories that have
-# BUILD_${dir}=no, or that have no ${dir}/Makefile.
-#
-_SUBDIR=	tools lib .WAIT include gnu external crypto/external bin games
-_SUBDIR+=	libexec sbin usr.bin
-_SUBDIR+=	commands man
-_SUBDIR+=	common drivers kernel servers
-_SUBDIR+=	usr.sbin share rescue sys etc test compat .WAIT distrib regress
+# world has to be able to make a new system, even if there
+# is no complete old system. it has to install commands, for which
+# it has to install libraries, for which it has to install includes,
+# for which it has to install /etc (for users and ownerships).
+# etcfiles also creates a directory hierarchy in its
+# 'make install' target.
+# 
+# etcfiles has to be done first.
+world: mkfiles etcfiles includes libraries dep-all install etcforce

-.if defined(__MINIX)
-_SUBDIR+=	benchmarks
-.endif
+mkfiles:
+	make -C share/mk install

-.for dir in ${_SUBDIR}
-.if "${dir}" == ".WAIT" \
-	|| (${BUILD_${dir}:Uyes} != "no" && exists(${dir}/Makefile))
-SUBDIR+=	${dir}
-.endif
-.endfor
+includes:
+	$(MAKE) -C include includes
+	$(MAKE) -C lib includes NBSD_LIBC=yes

-.if exists(regress)
-regression-tests: .PHONY .MAKE
-	@echo Running regression tests...
-	${MAKEDIRTARGET} regress regress
-.endif
+MKHEADERSS=/usr/pkg/gcc*/libexec/gcc/*/*/install-tools/mkheaders
+gnu-includes: includes
+	SHELL=/bin/sh; for d in $(MKHEADERSS); do if [ -f $$d ] ; then sh -e $$d ; fi; done

-.if ${MKUNPRIVED} != "no"
-NOPOSTINSTALL=	# defined
-.endif
+libraries: includes
+	$(MAKE) -C lib dependall install

-afterinstall: .PHONY .MAKE
-.if ${MKMAN} != "no"
-.if !defined(__MINIX)
-	${MAKEDIRTARGET} share/man makedb
-.else
-	${MAKEDIRTARGET} man makedb
-.endif # !defined(__MINIX)
-.endif
-.if (${MKUNPRIVED} != "no" && ${MKINFO} != "no")
-	${MAKEDIRTARGET} gnu/usr.bin/texinfo/install-info infodir-meta
-.endif
-.if !defined(NOPOSTINSTALL)
-	${MAKEDIRTARGET} . postinstall-check
-.endif
+commands: includes libraries
+	$(MAKE) -C commands all
+	$(MAKE) -C bin all
+	$(MAKE) -C sbin all
+	$(MAKE) -C usr.bin all
+	$(MAKE) -C libexec all
+	$(MAKE) -C usr.sbin all

-_POSTINSTALL=	${.CURDIR}/usr.sbin/postinstall/postinstall
-_POSTINSTALL_ENV= \
-	AWK=${TOOL_AWK:Q}		\
-	DB=${TOOL_DB:Q}			\
-	HOST_SH=${HOST_SH:Q}		\
-	MAKE=${MAKE:Q}			\
-	PWD_MKDB=${TOOL_PWD_MKDB:Q}	\
-	STAT=${TOOL_STAT:Q}
+dep-all:
+	$(MAKE) -C sys dependall
+	$(MAKE) -C commands dependall
+	$(MAKE) -C bin dependall
+	$(MAKE) -C sbin dependall
+	$(MAKE) -C usr.bin dependall
+	$(MAKE) -C libexec dependall
+	$(MAKE) -C usr.sbin dependall
+	$(MAKE) -C kernel dependall
+	$(MAKE) -C servers dependall
+	$(MAKE) -C drivers dependall

-postinstall-check: .PHONY
-	@echo "   === Post installation checks ==="
-	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
-	@echo "   ================================"
+etcfiles:
+	$(MAKE) -C etc install

-postinstall-fix: .NOTMAIN .PHONY
-	@echo "   === Post installation fixes ==="
-	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix
-	@echo "   ==============================="
+etcforce:
+	$(MAKE) -C etc installforce

-postinstall-fix-obsolete: .NOTMAIN .PHONY
-	@echo "   === Removing obsolete files ==="
-	${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete
-	@echo "   ==============================="
+all:
+	$(MAKE) -C sys all
+	$(MAKE) -C commands all
+	$(MAKE) -C bin all
+	$(MAKE) -C sbin all
+	$(MAKE) -C usr.bin all
+	$(MAKE) -C libexec all
+	$(MAKE) -C usr.sbin all
+	$(MAKE) -C tools all

+install:
+	$(MAKE) -C sys install
+	$(MAKE) -C libexec install
+	$(MAKE) -C man install makedb
+	$(MAKE) -C commands install
+	$(MAKE) -C bin install
+	$(MAKE) -C sbin install
+	$(MAKE) -C usr.bin install
+	$(MAKE) -C usr.sbin install
+	$(MAKE) -C servers install
+	$(MAKE) -C share install
+	$(MAKE) -C tools install

-#
-# Targets (in order!) called by "make build".
-#
-.if defined(HAVE_GCC)
-.if ${HAVE_GCC} == "4"
-LIBGCC_EXT=4
-BUILD_CC_LIB_BASEDIR= gnu/lib
-BUILD_CC_LIB_BASETARGET= gnu-lib
-.else
-LIBGCC_EXT=
-BUILD_CC_LIB_BASEDIR= external/gpl3/gcc/lib
-BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
-.endif
-.endif
+clean: mkfiles
+	$(MAKE) -C sys clean
+	$(MAKE) -C commands clean
+	$(MAKE) -C bin clean
+	$(MAKE) -C sbin clean
+	$(MAKE) -C usr.bin clean
+	$(MAKE) -C libexec clean
+	$(MAKE) -C usr.sbin clean
+	$(MAKE) -C share clean
+	$(MAKE) -C tools clean
+	$(MAKE) -C lib clean
+	$(MAKE) -C test clean

-BUILDTARGETS+=	check-tools
-.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
-BUILDTARGETS+=	cleandir
-.endif
-.if ${MKOBJDIRS} != "no"
-BUILDTARGETS+=	do-top-obj
-.endif
-.if ${USETOOLS} == "yes"	# {
-.if ${MKOBJDIRS} != "no"
-BUILDTARGETS+=	do-tools-obj
-.endif
-BUILDTARGETS+=	do-tools
-.endif # USETOOLS		# }
-.if ${MKOBJDIRS} != "no"
-BUILDTARGETS+=	obj
-.endif
-BUILDTARGETS+=	clean_METALOG
-.if !defined(NODISTRIBDIRS)
-BUILDTARGETS+=	do-distrib-dirs
-.endif
-.if !defined(NOINCLUDES)
-BUILDTARGETS+=	includes
-.endif
-BUILDTARGETS+=	do-lib
-.if !defined(__MINIX)
-# LSC Not used in MINIX3
-BUILDTARGETS+=	do-compat-lib
-.endif # !defined(__MINIX)
-BUILDTARGETS+=	do-build
-.if ${MKX11} != "no"
-BUILDTARGETS+=	do-x11
-.endif
-.if ${MKEXTSRC} != "no"
-BUILDTARGETS+=	do-extsrc
-.endif
-BUILDTARGETS+=	do-obsolete
+cleandepend: mkfiles
+	$(MAKE) -C lib cleandepend
+	$(MAKE) -C sys cleandepend
+	$(MAKE) -C commands cleandepend
+	$(MAKE) -C bin cleandepend
+	$(MAKE) -C sbin cleandepend
+	$(MAKE) -C usr.bin cleandepend
+	$(MAKE) -C libexec cleandepend
+	$(MAKE) -C usr.sbin cleandepend
+	$(MAKE) -C tools cleandepend

-#
-# Enforce proper ordering of some rules.
-#
-
-.ORDER:		${BUILDTARGETS}
-includes-lib:	.PHONY includes-include includes-sys
-includes-gnu:	.PHONY includes-lib
-
-#
-# Build the system and install into DESTDIR.
-#
-
-START_TIME!=	date
-
-.if defined(__MINIX)
-world: build .PHONY .MAKE
-	${MAKEDIRTARGET} . etcfiles
-	@echo "WARNING: "
-	@echo "WARNING: The 'world' target is obsolete, please use 'build' instead."
-	@echo "WARNING: "
-
-etcfiles: .PHONY .MAKE
-	${MAKEDIRTARGET} etc install-etc-files-safe  DESTDIR=${DESTDIR:U/}
-
-etcforce: .PHONY .MAKE
-	${MAKEDIRTARGET} etc install-etc-files  DESTDIR=${DESTDIR:U/}
-
-.endif # defined(__MINIX)
-
-build: .PHONY .MAKE
-.if defined(BUILD_DONE)
-	@echo "Build already installed into ${DESTDIR}"
-.else
-	@echo "Build started at: ${START_TIME}"
-.for tgt in ${BUILDTARGETS}
-	${MAKEDIRTARGET} . ${tgt}
-.endfor
-	${MAKEDIRTARGET} etc install-etc-release
-.if defined(__MINIX)
-	${MAKEDIRTARGET} etc install-etc-files-safe DESTDIR=${DESTDIR:U/}
-	${MAKEDIRTARGET} releasetools do-hdboot
-.endif # defined(__MINIX)
-	@echo   "Build started at:  ${START_TIME}"
-	@printf "Build finished at: " && date
-.endif
-
-#
-# Build a full distribution, but not a release (i.e. no sets into
-# ${RELEASEDIR}).  "buildworld" enforces a build to ${DESTDIR} != /
-#
-
-distribution buildworld: .PHONY .MAKE
-.if make(buildworld) && \
-    (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
-	@echo "Won't make ${.TARGET} with DESTDIR=/"
-	@false
-.endif
-	${MAKEDIRTARGET} . build NOPOSTINSTALL=1
-	${MAKEDIRTARGET} etc distribution INSTALL_DONE=1
-.if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"  && ${CHECKFLIST:Uyes} == "yes"
-	${MAKEDIRTARGET} . postinstall-fix-obsolete
-	${MAKEDIRTARGET} distrib/sets checkflist
-.endif
-	@echo   "make ${.TARGET} started at:  ${START_TIME}"
-	@printf "make ${.TARGET} finished at: " && date
-
-#
-# Install the distribution from $DESTDIR to $INSTALLWORLDDIR (defaults to `/')
-# If installing to /, ensures that the host's operating system is NetBSD and
-# the host's `uname -m` == ${MACHINE}.
-#
-
-HOST_UNAME_S!=	uname -s
-.if ${HOST_OSTYPE:C/\-.*//} != "Minix"
-HOST_UNAME_M!=	uname -m
-.else
-HOST_UNAME_M:= ${MACHINE}
-.endif
-
-installworld: .PHONY .MAKE
-.if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
-	@echo "Can't make ${.TARGET} to DESTDIR=/"
-	@false
-.endif
-.if !defined(INSTALLWORLDDIR) || \
-    ${INSTALLWORLDDIR} == "" || ${INSTALLWORLDDIR} == "/"
-.if (${HOST_UNAME_S} != "Minix")
-	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_S} to Minix with INSTALLWORLDDIR=/"
-	@false
-.endif
-.if (${HOST_UNAME_M} != ${MACHINE})
-	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_M} to ${MACHINE} with INSTALLWORLDDIR=/"
-	@false
-.endif
-.endif
-	${MAKEDIRTARGET} distrib/sets installsets \
-		INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=${INSTALLSETS:Q}
-	${MAKEDIRTARGET} . postinstall-check DESTDIR=${INSTALLWORLDDIR}
-	@echo   "make ${.TARGET} started at:  ${START_TIME}"
-	@printf "make ${.TARGET} finished at: " && date
-
-#
-# Install modules from $DESTDIR to $INSTALLMODULESDIR
-#
-installmodules: .PHONY .MAKE
-.if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
-	@echo "Can't make ${.TARGET} to DESTDIR=/"
-	@false
-.endif
-.if !defined(INSTALLMODULESDIR) || \
-    ${INSTALLMODULESDIR} == "" || ${INSTALLMODULESDIR} == "/"
-.if (${HOST_UNAME_S} != "NetBSD")
-	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_S} to NetBSD with INSTALLMODULESDIR=/"
-	@false
-.endif
-.if (${HOST_UNAME_M} != ${MACHINE})
-	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_M} to ${MACHINE} with INSTALLMODULESDIR=/"
-	@false
-.endif
-.endif
-	${MAKEDIRTARGET} sys/modules install DESTDIR=${INSTALLMODULESDIR:U/}
-	@echo   "make ${.TARGET} started at:  ${START_TIME}"
-	@printf "make ${.TARGET} finished at: " && date
-
-#
-# Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR
-#
-
-.for tgt in sets sourcesets syspkgs
-${tgt}: .PHONY .MAKE
-	${MAKEDIRTARGET} distrib/sets ${tgt}
-.endfor
-
-#
-# Build a release or snapshot (implies "make distribution").  Note that
-# in this case, the set lists will be checked before the tar files
-# are made.
-#
-
-release snapshot: .PHONY .MAKE
-	${MAKEDIRTARGET} . distribution
-	${MAKEDIRTARGET} etc release DISTRIBUTION_DONE=1
-	@echo   "make ${.TARGET} started at:  ${START_TIME}"
-	@printf "make ${.TARGET} finished at: " && date
-
-#
-# Create a CD-ROM image.
-#
-
-iso-image: .PHONY
-	${MAKEDIRTARGET} distrib iso_image
-	${MAKEDIRTARGET} etc iso-image
-	@echo   "make ${.TARGET} started at:  ${START_TIME}"
-	@printf "make ${.TARGET} finished at: " && date
-
-iso-image-source: .PHONY
-	${MAKEDIRTARGET} distrib iso_image CDSOURCE=true
-	${MAKEDIRTARGET} etc iso-image
-	@echo   "make ${.TARGET} started at:  ${START_TIME}"
-	@printf "make ${.TARGET} finished at: " && date
-
-#
-# Create bootable live images.
-#
-
-live-image: .PHONY
-	${MAKEDIRTARGET} etc live-image
-	@echo   "make ${.TARGET} started at:  ${START_TIME}"
-	@printf "make ${.TARGET} finished at: " && date
-
-#
-# Create bootable installation images.
-#
-
-install-image: .PHONY
-	${MAKEDIRTARGET} etc install-image
-	@echo   "make ${.TARGET} started at:  ${START_TIME}"
-	@printf "make ${.TARGET} finished at: " && date
-
-#
-# Special components of the "make build" process.
-#
-
-check-tools: .PHONY
-.if ${TOOLCHAIN_MISSING} != "no" && !defined(EXTERNAL_TOOLCHAIN)
-	@echo '*** WARNING:  Building on MACHINE=${MACHINE} with missing toolchain.'
-	@echo '*** May result in a failed build or corrupt binaries!'
-.elif defined(EXTERNAL_TOOLCHAIN)
-	@echo '*** Using external toolchain rooted at ${EXTERNAL_TOOLCHAIN}.'
-.endif
-.if defined(NBUILDJOBS)
-	@echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
-.endif
-
-# Delete or sanitise a leftover METALOG from a previous build.
-clean_METALOG: .PHONY .MAKE
-.if ${MKUPDATE} != "no"
-	${MAKEDIRTARGET} distrib/sets clean_METALOG
-.endif
-
-do-distrib-dirs: .PHONY .MAKE
-.if !defined(DESTDIR) || ${DESTDIR} == ""
-	${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/
-.else
-	${MAKEDIRTARGET} etc distrib-dirs DESTDIR=${DESTDIR}
-.endif
-
-.for targ in cleandir obj includes
-do-${targ}: .PHONY ${targ}
-	@true
-.endfor
-
-.for dir in tools tools/compat
-do-${dir:S/\//-/g}: .PHONY .MAKE
-.for targ in dependall install
-	${MAKEDIRTARGET} ${dir} ${targ}
-.endfor
-.endfor
-
-do-lib: .PHONY .MAKE
-	${MAKEDIRTARGET} lib build_install
-
-do-compat-lib: .PHONY .MAKE
-	${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../lib"
-
-do-top-obj: .PHONY .MAKE
-	${MAKEDIRTARGET} . obj NOSUBDIR=
-
-do-tools-obj: .PHONY .MAKE
-	${MAKEDIRTARGET} tools obj
-
-do-build: .PHONY .MAKE
-.for targ in dependall install
-	${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no
-.endfor
-
-do-x11: .PHONY .MAKE
-.if ${MKX11} != "no"
-.if ${X11FLAVOUR} == "Xorg"
-	${MAKEDIRTARGET} external/mit/xorg build
-.else
-	${MAKEDIRTARGET} x11 build
-.endif
-.else
-	@echo "MKX11 is not enabled"
-	@false
-.endif
-
-do-extsrc: .PHONY .MAKE
-.if ${MKEXTSRC} != "no"
-	${MAKEDIRTARGET} extsrc build
-.else
-	@echo "MKEXTSRC is not enabled"
-	@false
-.endif
-
-do-obsolete: .PHONY .MAKE
-	${MAKEDIRTARGET} etc install-obsolete-lists
-
-#
-# Speedup stubs for some subtrees that don't need to run these rules.
-# (Tells <bsd.subdir.mk> not to recurse for them.)
-#
-
-.for dir in bin etc distrib games libexec regress sbin usr.bin usr.sbin tools
-includes-${dir}: .PHONY
-	@true
-.endfor
-.for dir in etc distrib regress
-install-${dir}: .PHONY
-	@true
-.endfor
-
-#
-# XXX this needs to change when distrib Makefiles are recursion compliant
-# XXX many distrib subdirs need "cd etc && make snap_pre snap_kern" first...
-#
-dependall-distrib depend-distrib all-distrib: .PHONY
-	@true
-
-.include <bsd.sys.mk>
-.include <bsd.obj.mk>
-.include <bsd.kernobj.mk>
-.include <bsd.subdir.mk>
-
-#
-# Display current make(1) parameters
-#
-params: .PHONY .MAKE
-	${MAKEDIRTARGET} etc params
+# Warn usage change
+elf-libraries:
+	echo "That target is just libraries now."
+	false
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -1,5 +1,7 @@
 # Makefile for the benchmarks.

-SUBDIR=unixbench-5.1.2
+all::
+	chmod 755 run

-.include <bsd.subdir.mk>
+all clean::
+	for b in *bench*; do cd $$b && $(MAKE) $@; done
--- a/benchmarks/unixbench-5.1.2/Makefile
+++ b/benchmarks/unixbench-5.1.2/Makefile
@@ -1,5 +1,246 @@
-SCRIPTS=Run
-SUBDIR=pgms testdir run.sh
-.include "Makefile.inc"
-.include <bsd.prog.mk>
-.include <bsd.subdir.mk>
+##############################################################################
+#	UnixBench v5.1.1
+#  Based on The BYTE UNIX Benchmarks - Release 3
+#          Module: Makefile   SID: 3.9 5/15/91 19:30:15
+#
+##############################################################################
+# Bug reports, patches, comments, suggestions should be sent to:
+#	David C Niemi <niemi@tux.org>
+#
+# Original Contacts at Byte Magazine:
+#	Ben Smith or Tom Yager at BYTE Magazine
+#	bensmith@bytepb.byte.com    tyager@bytepb.byte.com
+#
+##############################################################################
+#  Modification Log: 7/28/89 cleaned out workload files
+#                    4/17/90 added routines for installing from shar mess
+#                    7/23/90 added compile for dhrystone version 2.1
+#                          (this is not part of Run file. still use old)
+#                          removed HZ from everything but dhry.
+#                          HZ is read from the environment, if not
+#                          there, you must define it in this file
+#                    10/30/90 moved new dhrystone into standard set
+#                          new pgms (dhry included) run for a specified
+#                          time rather than specified number of loops
+#                    4/5/91 cleaned out files not needed for
+#                          release 3 -- added release 3 files -ben
+#                    10/22/97 added compiler options for strict ANSI C
+#                          checking for gcc and DEC's cc on
+#                          Digital Unix 4.x (kahn@zk3.dec.com)
+#                    09/26/07 changes for UnixBench 5.0
+#                    09/30/07 adding ubgears, GRAPHIC_TESTS switch
+#                    10/14/07 adding large.txt
+##############################################################################
+
+##############################################################################
+# CONFIGURATION
+##############################################################################
+
+SHELL = /bin/sh
+
+# GRAPHICS TESTS: Uncomment the definition of "GRAPHIC_TESTS" to enable
+# the building of the graphics benchmarks.  This will require the
+# X11 libraries on your system.
+#
+# Comment the line out to disable these tests.
+# GRAPHIC_TESTS = defined
+
+# Set "GL_LIBS" to the libraries needed to link a GL program.
+GL_LIBS = -lGL -lXext -lX11
+
+# OPTIMISATION SETTINGS:
+
+## Very generic
+OPTON = -O
+
+## For Linux 486/Pentium, GCC 2.7.x and 2.8.x
+#OPTON = -O2 -fomit-frame-pointer -fforce-addr -fforce-mem -ffast-math \
+#	-m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2
+
+## For Linux, GCC previous to 2.7.0
+#OPTON = -O2 -fomit-frame-pointer -fforce-addr -fforce-mem -ffast-math -m486
+
+#OPTON = -O2 -fomit-frame-pointer -fforce-addr -fforce-mem -ffast-math \
+#	-m386 -malign-loops=1 -malign-jumps=1 -malign-functions=1
+
+## For Solaris 2, or general-purpose GCC 2.7.x
+#OPTON = -O2 -fomit-frame-pointer -fforce-addr -ffast-math -Wall
+
+## For Digital Unix v4.x, with DEC cc v5.x
+#OPTON = -O4
+#CFLAGS = -DTIME -std1 -verbose -w0
+
+## generic gcc CFLAGS.  -DTIME must be included.
+CFLAGS += $(CPPFLAGS) -DTIME -DMINIX=1 -D_MINIX=1 -D_POSIX_SOURCE=1
+
+
+##############################################################################
+# END CONFIGURATION
+##############################################################################
+
+
+# local directories
+PROGDIR = ./pgms
+SRCDIR = ./src
+TESTDIR = ./testdir
+RESULTDIR = ./results
+TMPDIR = ./tmp
+# other directories
+INCLDIR = /usr/include
+LIBDIR = /lib
+SCRIPTS = unixbench.logo multi.sh tst.sh index.base
+SOURCES = arith.c big.c context1.c \
+	dummy.c execl.c \
+	fstime.c hanoi.c \
+	pipe.c spawn.c \
+	syscall.c looper.c timeit.c time-polling.c \
+	dhry_1.c dhry_2.c dhry.h whets.c ubgears.c
+TESTS = sort.src cctest.c dc.dat large.txt
+
+# ifdef GRAPHIC_TESTS
+# GRAPHIC_BINS = $(PROGDIR)/ubgears
+# else
+GRAPHIC_BINS =
+# endif
+
+# Program binaries.
+BINS = $(PROGDIR)/arithoh $(PROGDIR)/register $(PROGDIR)/short \
+	$(PROGDIR)/int $(PROGDIR)/long $(PROGDIR)/float $(PROGDIR)/double \
+	$(PROGDIR)/hanoi $(PROGDIR)/syscall $(PROGDIR)/context1 \
+	$(PROGDIR)/pipe $(PROGDIR)/spawn $(PROGDIR)/execl \
+	$(PROGDIR)/dhry2 $(PROGDIR)/dhry2reg  $(PROGDIR)/looper \
+	$(PROGDIR)/fstime $(PROGDIR)/whetstone-double $(GRAPHIC_BINS)
+## These compile only on some platforms...
+# $(PROGDIR)/poll $(PROGDIR)/poll2 $(PROGDIR)/select
+
+# Required non-binary files.
+REQD = $(BINS) $(PROGDIR)/unixbench.logo \
+	$(PROGDIR)/multi.sh $(PROGDIR)/tst.sh $(PROGDIR)/index.base \
+	$(PROGDIR)/gfx-x11 \
+	$(TESTDIR)/sort.src $(TESTDIR)/cctest.c $(TESTDIR)/dc.dat \
+	$(TESTDIR)/large.txt
+
+# ######################### the big ALL ############################
+all: distr programs
+## Ick!!!  What is this about???  How about let's not chmod everything bogusly.
+#	@chmod 744 * $(SRCDIR)/* $(PROGDIR)/* $(TESTDIR)/* $(DOCDIR)/*
+
+# ####################### a check for Run ######################
+check: $(REQD)
+	make all
+# ##############################################################
+# distribute the files out to subdirectories if they are in this one
+distr:
+	@echo "Checking distribution of files"
+# scripts
+	@if  test ! -d  $(PROGDIR) \
+        ; then  \
+           mkdir $(PROGDIR) \
+           ; mv $(SCRIPTS) $(PROGDIR) \
+        ; else \
+           echo "$(PROGDIR)  exists" \
+        ; fi
+# C sources
+	@if  test ! -d  $(SRCDIR) \
+        ; then  \
+           mkdir $(SRCDIR) \
+           ; mv $(SOURCES) $(SRCDIR) \
+        ; else \
+           echo "$(SRCDIR)  exists" \
+        ; fi
+# test data
+	@if  test ! -d  $(TESTDIR) \
+        ; then  \
+           mkdir $(TESTDIR) \
+           ; mv $(TESTS) $(TESTDIR) \
+        ; else \
+           echo "$(TESTDIR)  exists" \
+        ; fi
+# temporary work directory
+	@if  test ! -d  $(TMPDIR) \
+        ; then  \
+           mkdir $(TMPDIR) \
+        ; else \
+           echo "$(TMPDIR)  exists" \
+        ; fi
+# directory for results
+	@if  test ! -d  $(RESULTDIR) \
+        ; then  \
+           mkdir $(RESULTDIR) \
+        ; else \
+           echo "$(RESULTDIR)  exists" \
+        ; fi
+
+programs: $(BINS)
+
+# Individual programs
+$(PROGDIR)/arithoh:	$(SRCDIR)/arith.c
+	$(CC) -o $(PROGDIR)/arithoh ${CFLAGS} ${OPTON} -Darithoh $(SRCDIR)/arith.c
+$(PROGDIR)/register: $(SRCDIR)/arith.c
+	$(CC) -o $(PROGDIR)/register ${CFLAGS} ${OPTON} -Ddatum='register int' $(SRCDIR)/arith.c
+$(PROGDIR)/short: $(SRCDIR)/arith.c
+	$(CC) -o $(PROGDIR)/short ${CFLAGS} ${OPTON} -Ddatum=short $(SRCDIR)/arith.c
+$(PROGDIR)/int: $(SRCDIR)/arith.c
+	$(CC) -o $(PROGDIR)/int ${CFLAGS} ${OPTON} -Ddatum=int $(SRCDIR)/arith.c
+$(PROGDIR)/long: $(SRCDIR)/arith.c
+	$(CC) -o $(PROGDIR)/long ${CFLAGS} ${OPTON} -Ddatum=long $(SRCDIR)/arith.c
+$(PROGDIR)/float: $(SRCDIR)/arith.c
+	$(CC) -o $(PROGDIR)/float ${CFLAGS} ${OPTON} -Ddatum=float $(SRCDIR)/arith.c
+$(PROGDIR)/double: $(SRCDIR)/arith.c
+	$(CC) -o $(PROGDIR)/double ${CFLAGS} ${OPTON} -Ddatum=double $(SRCDIR)/arith.c
+$(PROGDIR)/whetstone-double: $(SRCDIR)/whets.c
+	$(CC) -o $(PROGDIR)/whetstone-double ${CFLAGS} ${OPTON} -DDP -DUNIX -DUNIXBENCH $(SRCDIR)/whets.c -lm
+$(PROGDIR)/hanoi: $(SRCDIR)/hanoi.c
+	$(CC) -o $(PROGDIR)/hanoi ${CFLAGS} ${OPTON} $(SRCDIR)/hanoi.c
+
+$(PROGDIR)/poll: $(SRCDIR)/time-polling.c
+	$(CC) -DHAS_POLL -DUNIXBENCH -o $(PROGDIR)/poll ${CFLAGS} ${OPTON} $(SRCDIR)/time-polling.c
+
+$(PROGDIR)/poll2: $(SRCDIR)/time-polling.c
+	$(CC) -DHAS_POLL2 -DUNIXBENCH -o $(PROGDIR)/poll2 ${CFLAGS} ${OPTON} $(SRCDIR)/time-polling.c
+
+$(PROGDIR)/select: $(SRCDIR)/time-polling.c
+	$(CC) -DHAS_SELECT -DUNIXBENCH -o $(PROGDIR)/select ${CFLAGS} ${OPTON} $(SRCDIR)/time-polling.c
+
+$(PROGDIR)/fstime: $(SRCDIR)/fstime.c
+	$(CC) -o $(PROGDIR)/fstime ${CFLAGS} ${OPTON} $(SRCDIR)/fstime.c
+
+$(PROGDIR)/syscall: $(SRCDIR)/syscall.c
+	$(CC) -o $(PROGDIR)/syscall ${CFLAGS} ${OPTON} $(SRCDIR)/syscall.c
+$(PROGDIR)/context1: $(SRCDIR)/context1.c
+	$(CC) -o $(PROGDIR)/context1 ${CFLAGS} ${OPTON} $(SRCDIR)/context1.c
+$(PROGDIR)/pipe: $(SRCDIR)/pipe.c
+	$(CC) -o $(PROGDIR)/pipe ${CFLAGS} ${OPTON} $(SRCDIR)/pipe.c
+$(PROGDIR)/spawn: $(SRCDIR)/spawn.c
+	$(CC) -o $(PROGDIR)/spawn ${CFLAGS} ${OPTON} $(SRCDIR)/spawn.c
+$(PROGDIR)/execl: $(SRCDIR)/execl.c $(SRCDIR)/big.c
+	$(CC) -o $(PROGDIR)/execl ${CFLAGS} ${OPTON} $(SRCDIR)/execl.c
+
+$(PROGDIR)/dhry2: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
+	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_1.c
+	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DHZ=${HZ} ${OPTON} dhry_2.c
+	$(CC) -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o
+	cd $(SRCDIR); rm -f dhry_1.o dhry_2.o
+$(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h
+	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_1.c
+	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_2.c
+	$(CC) -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o
+	cd $(SRCDIR); rm -f dhry_1.o dhry_2.o
+
+$(PROGDIR)/looper: $(SRCDIR)/looper.c
+	$(CC) -o $(PROGDIR)/looper ${CFLAGS} ${OPTON} $(SRCDIR)/looper.c
+
+$(PROGDIR)/ubgears: $(SRCDIR)/ubgears.c
+	$(CC) -o $(PROGDIR)/ubgears ${CFLAGS} ${OPTON} $(SRCDIR)/ubgears.c $(GL_LIBS)
+
+# Run the benchmarks and create the reports
+run:
+	sh ./Run
+
+clean:
+	rm -f $(BINS) core *~ */*~
+
+spotless:	clean
+	rm -f $(RESULTDIR)/* $(TMPDIR)/*
+
+## END ##
--- a/benchmarks/unixbench-5.1.2/Makefile.inc
+++ b/benchmarks/unixbench-5.1.2/Makefile.inc
@@ -1 +0,0 @@
-BINDIR=/usr/benchmarks/unixbench
--- a/benchmarks/unixbench-5.1.2/Run
+++ b/benchmarks/unixbench-5.1.2/Run
@@ -796,7 +796,6 @@ sub preChecks {
    $ENV{'LANG'} = $language;

    # Check that the required files are in the proper places.
-   if (!$ENV{MINIX}) {
    system("make check");
    if ($? != 0) {
        system("make all");
@@ -804,7 +803,6 @@ sub preChecks {
            abortRun("\"make all\" failed");
        }
    }
-   }

    # Create a script to kill this run.
    system("echo \"kill -9 $$\" > \"${TMPDIR}/kill_run\"");
--- a/benchmarks/unixbench-5.1.2/pgms/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/Makefile
@@ -1,6 +0,0 @@
-
-SUBDIR=arithoh register short int long float double whetstone-double hanoi \
-	poll select fstime syscall context1 pipe spawn execl dhry2 \
-	dhry2reg looper multi.sh tst.sh unixbench.logo index.base # ubgears poll2BB 
-
-.include <bsd.subdir.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/Makefile.inc
+++ b/benchmarks/unixbench-5.1.2/pgms/Makefile.inc
@@ -1,5 +0,0 @@
-CPPFLAGS+=-DTIME -DMINIX=1 -I../../src/
-HZ=60
-BINDIR=/usr/benchmarks/unixbench/pgms
-
-.PATH: ${.CURDIR}/../../src
--- a/benchmarks/unixbench-5.1.2/pgms/arithoh/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/arithoh/Makefile
@@ -1,7 +0,0 @@
-
-PROG=arithoh
-SRCS=arith.c
-CPPFLAGS+=-Darithoh
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/context1/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/context1/Makefile
@@ -1,5 +0,0 @@
-
-PROG=context1
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/dhry2/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/dhry2/Makefile
@@ -1,7 +0,0 @@
-
-PROG=dhry2
-SRCS=dhry_1.c dhry_2.c
-CPPFLAGS+=-DHZ=${HZ}
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/dhry2reg/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/dhry2reg/Makefile
@@ -1,7 +0,0 @@
-
-PROG=dhry2reg
-SRCS=dhry_1.c dhry_2.c
-CPPFLAGS+=-DHZ=${HZ} -DREG=register
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/double/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/double/Makefile
@@ -1,7 +0,0 @@
-
-PROG=double
-SRCS=arith.c
-CPPFLAGS=-Ddatum='double'
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/execl/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/execl/Makefile
@@ -1,5 +0,0 @@
-
-PROG=execl
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/float/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/float/Makefile
@@ -1,7 +0,0 @@
-
-PROG=float
-SRCS=arith.c
-CPPFLAGS=-Ddatum='float'
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/fstime/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/fstime/Makefile
@@ -1,5 +0,0 @@
-
-PROG=fstime
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/hanoi/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/hanoi/Makefile
@@ -1,5 +0,0 @@
-
-PROG=hanoi
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/index.base/index.base
+++ b/benchmarks/unixbench-5.1.2/pgms/index.base/index.base
--- a/benchmarks/unixbench-5.1.2/pgms/index.base/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/index.base/Makefile
@@ -1,3 +0,0 @@
-SCRIPTS=index.base
-SCRIPTSNAME=index.base
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/int/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/int/Makefile
@@ -1,7 +0,0 @@
-
-PROG=int
-SRCS=arith.c
-CPPFLAGS=-Ddatum='int'
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/long/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/long/Makefile
@@ -1,7 +0,0 @@
-
-PROG=long
-SRCS=arith.c
-CPPFLAGS=-Ddatum='long'
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/looper/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/looper/Makefile
@@ -1,5 +0,0 @@
-
-PROG=looper
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/multi.sh/multi.sh
+++ b/benchmarks/unixbench-5.1.2/pgms/multi.sh/multi.sh
--- a/benchmarks/unixbench-5.1.2/pgms/multi.sh/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/multi.sh/Makefile
@@ -1,3 +0,0 @@
-SCRIPTS=multi.sh
-SCRIPTSNAME=multi.sh
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/pipe/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/pipe/Makefile
@@ -1,5 +0,0 @@
-
-PROG=pipe
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/poll/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/poll/Makefile
@@ -1,7 +0,0 @@
-
-PROG=poll
-SRCS=time-polling.c
-CPPFLAGS+=-DHAS_POLL -DUNIXBENCH
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/poll2/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/poll2/Makefile
@@ -1,7 +0,0 @@
-
-PROG=poll2
-SRCS=time-polling.c
-CPPFLAGS+=-DHAS_POLL2 -DUNIXBENCH
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/register/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/register/Makefile
@@ -1,7 +0,0 @@
-
-PROG=register
-SRCS=arith.c
-CPPFLAGS=-Ddatum='register int'
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/select/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/select/Makefile
@@ -1,7 +0,0 @@
-
-PROG=select
-SRCS=time-polling.c
-CPPFLAGS+=-DHAS_SELECT -DUNIXBENCH
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/short/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/short/Makefile
@@ -1,7 +0,0 @@
-
-PROG=short
-SRCS=arith.c
-CPPFLAGS=-Ddatum='short'
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/spawn/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/spawn/Makefile
@@ -1,5 +0,0 @@
-
-PROG=spawn
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/syscall/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/syscall/Makefile
@@ -1,5 +0,0 @@
-
-PROG=syscall
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/tst.sh/tst.sh
+++ b/benchmarks/unixbench-5.1.2/pgms/tst.sh/tst.sh
--- a/benchmarks/unixbench-5.1.2/pgms/tst.sh/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/tst.sh/Makefile
@@ -1,3 +0,0 @@
-SCRIPTS=tst.sh
-SCRIPTSNAME=tst.sh
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/ubgears/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/ubgears/Makefile
@@ -1,5 +0,0 @@
-
-PROG=ubgears
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/unixbench.logo/unixbench.logo
+++ b/benchmarks/unixbench-5.1.2/pgms/unixbench.logo/unixbench.logo
--- a/benchmarks/unixbench-5.1.2/pgms/unixbench.logo/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/unixbench.logo/Makefile
@@ -1,3 +0,0 @@
-SCRIPTS=unixbench.logo
-SCRIPTSNAME=unixbench.logo
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/pgms/whetstone-double/Makefile
+++ b/benchmarks/unixbench-5.1.2/pgms/whetstone-double/Makefile
@@ -1,8 +0,0 @@
-
-PROG=whetstone-double
-SRCS=whets.c
-CPPFLAGS+= -DDP -DUNIX -DUNIXBENCH
-LDADD+=-lm
-MAN=
-
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/run.sh/run.sh
+++ b/benchmarks/unixbench-5.1.2/run.sh/run.sh
--- a/benchmarks/unixbench-5.1.2/run.sh/Makefile
+++ b/benchmarks/unixbench-5.1.2/run.sh/Makefile
@@ -1,3 +0,0 @@
-SCRIPTS=run.sh
-SCRIPTSNAME=run.sh
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/src/big.c
+++ b/benchmarks/unixbench-5.1.2/src/big.c
@@ -581,7 +581,7 @@ void dumpwork(void)
 void fatal(char *s)
 {
    int	i;
-    fprintf(stderr, "%s", s);
+    fprintf(stderr, s);
    fflush(stderr);
    perror("Reason?");
    fflush(stderr);
--- a/benchmarks/unixbench-5.1.2/src/fstime.c
+++ b/benchmarks/unixbench-5.1.2/src/fstime.c
@@ -53,6 +53,8 @@ char SCCSid[] = "@(#) @(#)fstime.c:3.5 -- 5/15/91 19:30:19";

 #ifndef MINIX
 extern void sync(void);
+#else
+extern int sync(void);
 #endif

 int w_test(int timeSecs);
--- a/benchmarks/unixbench-5.1.2/src/time-polling.c
+++ b/benchmarks/unixbench-5.1.2/src/time-polling.c
@@ -62,9 +62,6 @@
 #ifdef HAS_POLL2
 #  include <linux/poll2.h>
 #endif
-#ifdef HAS_SELECT
-#  include <sys/select.h>
-#endif
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -83,7 +80,6 @@
 typedef int flag;

    
-#ifndef HAS_POLL
 /*
 static inline int find_first_set_bit (CONST void *array, int size)
 */
@@ -147,7 +143,6 @@ static int find_next_set_bit (CONST void *array, int size, int offset)
    index += ul_size - offset;
    return (find_first_set_bit (++ul_array, size - index) + index);
 }   /*  End Function find_next_set_bit  */
-#endif


 struct callback_struct
--- a/benchmarks/unixbench-5.1.2/testdir/Makefile
+++ b/benchmarks/unixbench-5.1.2/testdir/Makefile
@@ -1,2 +0,0 @@
-SUBDIR=cctest.c dc.dat large.txt sort.src
-.include <bsd.subdir.mk>
--- a/benchmarks/unixbench-5.1.2/testdir/Makefile.inc
+++ b/benchmarks/unixbench-5.1.2/testdir/Makefile.inc
@@ -1 +0,0 @@
-BINDIR=/usr/benchmarks/unixbench/testdir
--- a/benchmarks/unixbench-5.1.2/testdir/cctest.c/cctest.c
+++ b/benchmarks/unixbench-5.1.2/testdir/cctest.c/cctest.c
--- a/benchmarks/unixbench-5.1.2/testdir/cctest.c/Makefile
+++ b/benchmarks/unixbench-5.1.2/testdir/cctest.c/Makefile
@@ -1,3 +0,0 @@
-SCRIPTS=cctest.c
-SCRIPTSNAME=cctest.c
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/testdir/dc.dat/dc.dat
+++ b/benchmarks/unixbench-5.1.2/testdir/dc.dat/dc.dat
--- a/benchmarks/unixbench-5.1.2/testdir/dc.dat/Makefile
+++ b/benchmarks/unixbench-5.1.2/testdir/dc.dat/Makefile
@@ -1,3 +0,0 @@
-SCRIPTS=dc.dat
-SCRIPTSNAME=dc.dat
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/testdir/large.txt/large.txt
+++ b/benchmarks/unixbench-5.1.2/testdir/large.txt/large.txt
--- a/benchmarks/unixbench-5.1.2/testdir/large.txt/Makefile
+++ b/benchmarks/unixbench-5.1.2/testdir/large.txt/Makefile
@@ -1,3 +0,0 @@
-SCRIPTS=large.txt
-SCRIPTSNAME=large.txt
-.include <bsd.prog.mk>
--- a/benchmarks/unixbench-5.1.2/testdir/sort.src/sort.src
+++ b/benchmarks/unixbench-5.1.2/testdir/sort.src/sort.src
--- a/benchmarks/unixbench-5.1.2/testdir/sort.src/Makefile
+++ b/benchmarks/unixbench-5.1.2/testdir/sort.src/Makefile
@@ -1,3 +0,0 @@
-SCRIPTS=sort.src
-SCRIPTSNAME=sort.src
-.include <bsd.prog.mk>
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.22 2007/12/31 15:31:24 ad Exp $
-#	@(#)Makefile	8.1 (Berkeley) 5/31/93
+# Makefile for bin

-SUBDIR=	cat date echo ed expr kill ksh ln ls \
-	mkdir pax pwd rm rmdir sync test
+.include <bsd.own.mk>
+
+SUBDIR= mkdir rm rmdir date

 .include <bsd.subdir.mk>
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -1,11 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.17 2012/03/21 05:47:53 matt Exp $
-#	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
+CPPFLAGS+= -D_NETBSD_SOURCE

-.include <bsd.own.mk>		# for MKDYNAMICROOT definition
+BINDIR?=/bin

-WARNS?=		5
-BINDIR?=	/bin
-
-.if (${MKDYNAMICROOT} == "no")
-LDSTATIC?=	-static
-.endif
--- a/bin/cat/Makefile
+++ b/bin/cat/Makefile
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile,v 1.12 2003/05/18 07:57:31 lukem Exp $
-#	@(#)Makefile	8.1 (Berkeley) 5/31/93
-
-PROG=	cat
-
-.include <bsd.prog.mk>
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -1,209 +0,0 @@
-.\"	$NetBSD: cat.1,v 1.32 2006/09/23 11:24:44 wiz Exp $
-.\"
-.\" Copyright (c) 1989, 1990, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Institute of Electrical and Electronics Engineers, Inc.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\"
-.Dd September 23, 2006
-.Dt CAT 1
-.Os
-.Sh NAME
-.Nm cat
-.Nd concatenate and print files
-.Sh SYNOPSIS
-.Nm
-.Op Fl beflnstuv
-.Op Fl
-.Op Ar
-.Sh DESCRIPTION
-The
-.Nm
-utility reads files sequentially, writing them to the standard output.
-The
-.Ar file
-operands are processed in command line order.
-A single dash represents the standard input,
-and may appear multiple times in the
-.Ar file
-list.
-.Pp
-The word
-.Dq concatenate
-is just a verbose synonym for
-.Dq catenate .
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl b
-Implies the
-.Fl n
-option but doesn't number blank lines.
-.It Fl e
-Implies the
-.Fl v
-option, and displays a dollar sign
-.Pq Ql \&$
-at the end of each line
-as well.
-.It Fl f
-Only attempt to display regular files.
-.It Fl l
-Set an exclusive advisory lock on the standard output file descriptor.
-This lock is set using
-.Xr fcntl 2
-with the
-.Dv F_SETLKW
-command.
-If the output file is already locked,
-.Nm
-will block until the lock is acquired.
-.It Fl n
-Number the output lines, starting at 1.
-.It Fl s
-Squeeze multiple adjacent empty lines, causing the output to be
-single spaced.
-.It Fl t
-Implies the
-.Fl v
-option, and displays tab characters as
-.Ql ^I
-as well.
-.It Fl u
-The
-.Fl u
-option guarantees that the output is unbuffered.
-.It Fl v
-Displays non-printing characters so they are visible.
-Control characters print as
-.Ql ^X
-for control-X; the delete
-character (octal 0177) prints as
-.Ql ^? .
-Non-ascii characters (with the high bit set) are printed as
-.Ql M-
-(for meta) followed by the character for the low 7 bits.
-.El
-.Sh EXIT STATUS
-The
-.Nm
-utility exits 0 on success, and \*[Gt]0 if an error occurs.
-.Sh EXAMPLES
-The command:
-.Bd -literal -offset indent
-.Ic cat file1
-.Ed
-.Pp
-will print the contents of
-.Ar file1
-to the standard output.
-.Pp
-The command:
-.Bd -literal -offset indent
-.Ic cat file1 file2 \*[Gt] file3
-.Ed
-.Pp
-will sequentially print the contents of
-.Ar file1
-and
-.Ar file2
-to the file
-.Ar file3 ,
-truncating
-.Ar file3
-if it already exists.
-See the manual page for your shell (i.e.,
-.Xr sh 1 )
-for more information on redirection.
-.Pp
-The command:
-.Bd -literal -offset indent
-.Ic cat file1 - file2 - file3
-.Ed
-.Pp
-will print the contents of
-.Ar file1 ,
-print data it receives from the standard input until it receives an
-.Dv EOF
-.Pq Sq ^D
-character, print the contents of
-.Ar file2 ,
-read and output contents of the standard input again, then finally output
-the contents of
-.Ar file3 .
-Note that if the standard input referred to a file, the second dash
-on the command-line would have no effect, since the entire contents of the file
-would have already been read and printed by
-.Nm
-when it encountered the first
-.Ql \&-
-operand.
-.Sh SEE ALSO
-.Xr head 1 ,
-.Xr hexdump 1 ,
-.Xr lpr 1 ,
-.Xr more 1 ,
-.Xr pr 1 ,
-.Xr tail 1 ,
-.Xr view 1 ,
-.Xr vis 1 ,
-.Xr fcntl 2
-.Rs
-.%A Rob Pike
-.%T "UNIX Style, or cat -v Considered Harmful"
-.%J "USENIX Summer Conference Proceedings"
-.%D 1983
-.Re
-.Sh STANDARDS
-The
-.Nm
-utility is expected to conform to the
-.St -p1003.2-92
-specification.
-.Pp
-The flags
-.Op Fl belnstv
-are extensions to the specification.
-.Sh HISTORY
-A
-.Nm
-utility appeared in
-.At v1 .
-Dennis Ritchie designed and wrote the first man page.
-It appears to have been
-.Xr cat 1 .
-.Sh BUGS
-Because of the shell language mechanism used to perform output
-redirection, the command
-.Dq Li cat file1 file2 \*[Gt] file1
-will cause the original data in file1 to be destroyed!
-This is performed by the shell before
-.Nm
-is run.
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -1,316 +0,0 @@
-/* $NetBSD: cat.c,v 1.47 2008/07/20 00:52:39 lukem Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Kevin Fall.
- *
- * 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. 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.
- */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/cdefs.h>
-#if !defined(lint)
-__COPYRIGHT(
-"@(#) Copyright (c) 1989, 1993\
- The Regents of the University of California.  All rights reserved.");
-#if 0
-static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
-#else
-__RCSID("$NetBSD: cat.c,v 1.47 2008/07/20 00:52:39 lukem Exp $");
-#endif
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-int bflag, eflag, fflag, lflag, nflag, sflag, tflag, vflag;
-int rval;
-const char *filename;
-
-int main(int, char *[]);
-void cook_args(char *argv[]);
-void cook_buf(FILE *);
-void raw_args(char *argv[]);
-void raw_cat(int);
-
-int
-main(int argc, char *argv[])
-{
-	int ch;
-	struct flock stdout_lock;
-
-	setprogname(argv[0]);
-	(void)setlocale(LC_ALL, "");
-
-	while ((ch = getopt(argc, argv, "beflnstuv")) != -1)
-		switch (ch) {
-		case 'b':
-			bflag = nflag = 1;	/* -b implies -n */
-			break;
-		case 'e':
-			eflag = vflag = 1;	/* -e implies -v */
-			break;
-		case 'f':
-			fflag = 1;
-			break;
-		case 'l':
-			lflag = 1;
-			break;
-		case 'n':
-			nflag = 1;
-			break;
-		case 's':
-			sflag = 1;
-			break;
-		case 't':
-			tflag = vflag = 1;	/* -t implies -v */
-			break;
-		case 'u':
-			setbuf(stdout, NULL);
-			break;
-		case 'v':
-			vflag = 1;
-			break;
-		default:
-		case '?':
-			(void)fprintf(stderr,
-			    "usage: cat [-beflnstuv] [-] [file ...]\n");
-			exit(EXIT_FAILURE);
-			/* NOTREACHED */
-		}
-	argv += optind;
-
-	if (lflag) {
-		stdout_lock.l_len = 0;
-		stdout_lock.l_start = 0;
-		stdout_lock.l_type = F_WRLCK;
-		stdout_lock.l_whence = SEEK_SET;
-		if (fcntl(STDOUT_FILENO, F_SETLKW, &stdout_lock) == -1)
-			err(EXIT_FAILURE, "stdout");
-	}
-
-	if (bflag || eflag || nflag || sflag || tflag || vflag)
-		cook_args(argv);
-	else
-		raw_args(argv);
-	if (fclose(stdout))
-		err(EXIT_FAILURE, "stdout");
-	return (rval);
-}
-
-void
-cook_args(char **argv)
-{
-	FILE *fp;
-
-	fp = stdin;
-	filename = "stdin";
-	do {
-		if (*argv) {
-			if (!strcmp(*argv, "-"))
-				fp = stdin;
-			else if ((fp = fopen(*argv,
-			    fflag ? "rf" : "r")) == NULL) {
-				warn("%s", *argv);
-				rval = EXIT_FAILURE;
-				++argv;
-				continue;
-			}
-			filename = *argv++;
-		}
-		cook_buf(fp);
-		if (fp != stdin)
-			(void)fclose(fp);
-		else
-			clearerr(fp);
-	} while (*argv);
-}
-
-void
-cook_buf(FILE *fp)
-{
-	int ch, gobble, line, prev;
-
-	line = gobble = 0;
-	for (prev = '\n'; (ch = getc(fp)) != EOF; prev = ch) {
-		if (prev == '\n') {
-			if (ch == '\n') {
-				if (sflag) {
-					if (!gobble && nflag && !bflag)
-						(void)fprintf(stdout,
-							"%6d\t\n", ++line);
-					else if (!gobble && putchar(ch) == EOF)
-						break;
-					gobble = 1;
-					continue;
-				}
-				if (nflag) {
-					if (!bflag) {
-						(void)fprintf(stdout,
-						    "%6d\t", ++line);
-						if (ferror(stdout))
-							break;
-					} else if (eflag) {
-						(void)fprintf(stdout,
-						    "%6s\t", "");
-						if (ferror(stdout))
-							break;
-					}
-				}
-			} else if (nflag) {
-				(void)fprintf(stdout, "%6d\t", ++line);
-				if (ferror(stdout))
-					break;
-			}
-		}
-		gobble = 0;
-		if (ch == '\n') {
-			if (eflag)
-				if (putchar('$') == EOF)
-					break;
-		} else if (ch == '\t') {
-			if (tflag) {
-				if (putchar('^') == EOF || putchar('I') == EOF)
-					break;
-				continue;
-			}
-		} else if (vflag) {
-			if (!isascii(ch)) {
-				if (putchar('M') == EOF || putchar('-') == EOF)
-					break;
-				ch = toascii(ch);
-			}
-			if (iscntrl(ch)) {
-				if (putchar('^') == EOF ||
-				    putchar(ch == '\177' ? '?' :
-				    ch | 0100) == EOF)
-					break;
-				continue;
-			}
-		}
-		if (putchar(ch) == EOF)
-			break;
-	}
-	if (ferror(fp)) {
-		warn("%s", filename);
-		rval = EXIT_FAILURE;
-		clearerr(fp);
-	}
-	if (ferror(stdout))
-		err(EXIT_FAILURE, "stdout");
-}
-
-void
-raw_args(char **argv)
-{
-	int fd;
-
-	fd = fileno(stdin);
-	filename = "stdin";
-	do {
-		if (*argv) {
-			if (!strcmp(*argv, "-"))
-				fd = fileno(stdin);
-			else if (fflag) {
-				struct stat st;
-				fd = open(*argv, O_RDONLY|O_NONBLOCK, 0);
-				if (fd < 0)
-					goto skip;
-
-				if (fstat(fd, &st) == -1) {
-					close(fd);
-					goto skip;
-				}
-				if (!S_ISREG(st.st_mode)) {
-					close(fd);
-					warnx("%s: not a regular file", *argv);
-					goto skipnomsg;
-				}
-			}
-			else if ((fd = open(*argv, O_RDONLY, 0)) < 0) {
-skip:
-				warn("%s", *argv);
-skipnomsg:
-				rval = EXIT_FAILURE;
-				++argv;
-				continue;
-			}
-			filename = *argv++;
-		}
-		raw_cat(fd);
-		if (fd != fileno(stdin))
-			(void)close(fd);
-	} while (*argv);
-}
-
-void
-raw_cat(int rfd)
-{
-	static char *buf;
-	static char fb_buf[BUFSIZ];
-	static size_t bsize;
-
-	ssize_t nr, nw, off;
-	int wfd;
-
-	wfd = fileno(stdout);
-	if (buf == NULL) {
-		struct stat sbuf;
-
-		if (fstat(wfd, &sbuf) == 0 &&
-		    sbuf.st_blksize > sizeof(fb_buf)) {
-			bsize = sbuf.st_blksize;
-			buf = malloc(bsize);
-		}
-		if (buf == NULL) {
-			bsize = sizeof(fb_buf);
-			buf = fb_buf;
-		}
-	}
-	while ((nr = read(rfd, buf, bsize)) > 0)
-		for (off = 0; nr; nr -= nw, off += nw)
-			if ((nw = write(wfd, buf + off, (size_t)nr)) < 0)
-				err(EXIT_FAILURE, "stdout");
-	if (nr < 0) {
-		warn("%s", filename);
-		rval = EXIT_FAILURE;
-	}
-}
--- a/bin/echo/Makefile
+++ b/bin/echo/Makefile
@@ -1,6 +0,0 @@
-#	$NetBSD: Makefile,v 1.8 1997/07/20 22:36:53 christos Exp $
-#	@(#)Makefile	8.1 (Berkeley) 5/31/93
-
-PROG=	echo
-
-.include <bsd.prog.mk>
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -1,68 +0,0 @@
-.\"	$NetBSD: echo.1,v 1.13 2003/08/07 09:05:12 agc Exp $
-.\"
-.\" Copyright (c) 1990, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Institute of Electrical and Electronics Engineers, Inc.
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\"
-.Dd July 22, 1993
-.Dt ECHO 1
-.Os
-.Sh NAME
-.Nm echo
-.Nd write arguments to the standard output
-.Sh SYNOPSIS
-.Nm
-.Op Fl n
-.Op Ar string ...
-.Sh DESCRIPTION
-The
-.Nm
-utility writes any specified operands, separated by single blank (`` '')
-characters and followed by a newline (``\en'') character, to the standard
-output.
-.Pp
-The following option is available:
-.Bl -tag -width flag
-.It Fl n
-Do not print the trailing newline character.
-.El
-.Sh EXIT STATUS
-The
-.Nm
-utility exits 0 on success, and \*[Gt]0 if an error occurs.
-.Sh SEE ALSO
-.Xr printf 1
-.Sh STANDARDS
-The
-.Nm
-utility is expected to be
-.St -p1003.2
-compatible.
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -1,83 +0,0 @@
-/* $NetBSD: echo.c,v 1.18 2008/09/18 05:42:08 dholland Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  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. 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT(
-"@(#) Copyright (c) 1989, 1993\
- The Regents of the University of California.  All rights reserved.");
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)echo.c	8.1 (Berkeley) 5/31/93";
-#else
-__RCSID("$NetBSD: echo.c,v 1.18 2008/09/18 05:42:08 dholland Exp $");
-#endif
-#endif /* not lint */
-
-#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int main(int, char *[]);
-
-/* ARGSUSED */
-int
-main(int argc, char *argv[])
-{
-	int nflag;
-
-	setprogname(argv[0]);
-	(void)setlocale(LC_ALL, "");
-
-	/* This utility may NOT do getopt(3) option parsing. */
-	if (*++argv && !strcmp(*argv, "-n")) {
-		++argv;
-		nflag = 1;
-	}
-	else
-		nflag = 0;
-
-	while (*argv) {
-		(void)printf("%s", *argv);
-		if (*++argv)
-			(void)putchar(' ');
-	}
-	if (nflag == 0)
-		(void)putchar('\n');
-	fflush(stdout);
-	if (ferror(stdout))
-		exit(1);
-	exit(0);
-	/* NOTREACHED */
-}
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,20 +0,0 @@
-#	$NetBSD: Makefile,v 1.36 2009/07/26 01:58:20 dholland Exp $
-
-.include <bsd.own.mk>
-
-PROG=	ed
-CPPFLAGS+=-DBACKWARDS
-
-.if (${MKCRYPTO} != "no")
-CPPFLAGS+=-DDES
-.endif
-
-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>
--- a/bin/ed/POSIX
+++ b/bin/ed/POSIX
@@ -1,103 +0,0 @@
-$NetBSD: POSIX,v 1.10 1999/11/18 19:16:34 kristerw 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 occurrences 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.
--- a/bin/ed/README
+++ b/bin/ed/README
@@ -1,24 +0,0 @@
-$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.
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -1,319 +0,0 @@
-/*	$NetBSD: buf.c,v 1.26 2006/03/17 14:37:14 rumble Exp $	*/
-
-/* buf.c: This file contains the scratch-file buffer 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
-#else
-__RCSID("$NetBSD: buf.c,v 1.26 2006/03/17 14:37:14 rumble Exp $");
-#endif
-#endif /* not lint */
-
-#include <sys/file.h>
-#include <sys/stat.h>
-
-#include <paths.h>
-#include <stdio.h>
-#include <err.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(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(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");
-		free(lp);
-		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");
-			free(lp);
-			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");
-		free(lp);
-		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(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(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(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;
-}
-
-
-char *sfn = NULL;				/* scratch file name */
-
-/* open_sbuf: open scratch file */
-int
-open_sbuf(void)
-{
-	int u, fd;
-	const char *tmp;
-	size_t s;
-
-	isbinary = newline_added = 0;
-	fd = -1;
-	u = umask(077);
-
-	if ((tmp = getenv("TMPDIR")) == NULL)
-		tmp = _PATH_TMP;
-	
-	if ((s = strlen(tmp)) == 0 || tmp[s - 1] == '/')
-		(void)asprintf(&sfn, "%sed.XXXXXX", tmp);
-	else
-		(void)asprintf(&sfn, "%s/ed.XXXXXX", tmp);
-	if (sfn == NULL) {
-		warn(NULL);
-		sprintf(errmsg, "could not allocate memory");
-		umask(u);
-		return ERR;
-	}
-		
-
-	if ((fd = mkstemp(sfn)) == -1 || (sfp = fdopen(fd, "w+")) == NULL) {
-		if (fd != -1)
-			close(fd);
-		warn("%s", sfn);
-		sprintf(errmsg, "cannot open temp file");
-		umask(u);
-		return ERR;
-	}
-	umask(u);
-	return 0;
-}
-
-
-/* close_sbuf: close scratch file */
-int
-close_sbuf(void)
-{
-	if (sfp) {
-		if (fclose(sfp) < 0) {
-			fprintf(stderr, "%s: %s\n", sfn, strerror(errno));
-			sprintf(errmsg, "cannot close temp file");
-			return ERR;
-		}
-		sfp = NULL;
-		if (sfn) {
-			unlink(sfn);
-			free(sfn);
-			sfn = NULL;
-		}
-	}
-	sfseek = seek_write = 0;
-	return 0;
-}
-
-
-/* quit: remove_lines scratch file and exit */
-void
-quit(int n)
-{
-	if (sfp) {
-		fclose(sfp);
-		if (sfn) {
-			unlink(sfn);
-			free(sfn);
-			sfn = NULL;
-		}
-	}
-	exit(n);
-	/* NOTREACHED */
-}
-
-
-unsigned char ctab[256];		/* character translation table */
-
-/* init_buffers: open scratch buffer; initialize line queue */
-void
-init_buffers(void)
-{
-	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(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;
-}
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -1,460 +0,0 @@
-/*	$NetBSD: cbc.c,v 1.22 2010/06/09 19:20:18 riz 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.
- *
- * 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. 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
- */
-
-/*-
- * 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
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
-#else
-__RCSID("$NetBSD: cbc.c,v 1.22 2010/06/09 19:20:18 riz Exp $");
-#endif
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <ctype.h>
-#include <errno.h>
-#include <pwd.h>
-#ifdef DES
-#include <time.h>
-#endif
-
-#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)
-
-#ifdef DES
-/*
- * global variables and related macros
- */
-
-static Desbuf ivec;			/* initialization vector */
-static Desbuf pvec;			/* padding vector */
-static char bits[] = {			/* used to extract bits from a char */
-	'\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001'
-};
-static int pflag;			/* 1 to preserve parity bits */
-
-static char des_buf[8];	/* shared buffer for get_des_char/put_des_char */
-static int des_ct = 0;		/* count for get_des_char/put_des_char */
-static int des_n = 0;		/* index for put_des_char/get_des_char */
-#endif
-
-
-#ifdef DES
-static void des_error(const char *);
-static int hex_to_binary(int, int);
-static void expand_des_key(char *, char *);
-static void set_des_key(char *);
-static int cbc_decode(char *, FILE *);
-static int cbc_encode(char *, int, FILE *);
-#endif
-
-
-/* init_des_cipher: initialize DES */
-void
-init_des_cipher(void)
-{
-#ifdef DES
-	int i;
-
-	des_ct = des_n = 0;
-
-	/* initialize the initialization vector */
-	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(FILE *fp)
-{
-#ifdef DES
-	if (des_n >= des_ct) {
-		des_n = 0;
-		des_ct = cbc_decode(des_buf, fp);
-	}
-	return (des_ct > 0) ? (unsigned char) des_buf[des_n++] : EOF;
-#else
-	return EOF;
-#endif
-}
-
-
-/* put_des_char: write a char to an encrypted file; return char written */
-int
-put_des_char(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) ? (unsigned char) (des_buf[des_n++] = c) : EOF;
-#else
-	return EOF;
-#endif
-}
-
-
-/* flush_des_file: flush an encrypted file's output; return status */
-int
-flush_des_file(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;
-#else
-	return EOF;
-#endif
-}
-
-#ifdef DES
-/*
- * get keyword from tty or stdin
- */
-int
-get_keyword(void)
-{
-	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
- */
-static void
-des_error(const char *s /* the message */)
-{
-	(void)sprintf(errmsg, "%s", s ? s : strerror(errno));
-}
-
-/*
- * map a hex character to an integer
- */
-static int
-hex_to_binary(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
- */
-static void
-expand_des_key(char *obuf /* bit pattern */, char *inbuf /* the key itself */)
-{
-	int i, j;			/* counter in a for loop */
-	int nbuf[64];			/* used for hex/key translation */
-
-	/*
-	 * leading '0x' or '0X' == hex key
-	 */
-	if (inbuf[0] == '0' && (inbuf[1] == 'x' || inbuf[1] == 'X')) {
-		inbuf = &inbuf[2];
-		/*
-		 * now translate it, bombing on any illegal hex digit
-		 */
-		for (i = 0; inbuf[i] && i < 16; i++)
-			if ((nbuf[i] = hex_to_binary((int) inbuf[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 (inbuf[0] == '0' && (inbuf[1] == 'b' || inbuf[1] == 'B')) {
-		inbuf = &inbuf[2];
-		/*
-		 * now translate it, bombing on any illegal binary digit
-		 */
-		for (i = 0; inbuf[i] && i < 16; i++)
-			if ((nbuf[i] = hex_to_binary((int) inbuf[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, inbuf, 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.
- */
-static void
-set_des_key(Desbuf buf /* key block */)
-{
-	int i, j;				/* counter in a for loop */
-	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
- */
-static int
-cbc_encode(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
- */
-static int
-cbc_decode(char *msgbuf /* I/O buffer */,
-	   FILE *fp /* input file descriptor */)
-{
-	Desbuf inbuf;	/* temp buffer for initialization vector */
-	int n;		/* number of bytes actually read */
-	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(inbuf), BUFFER(msgbuf), 8);
-		DES_XFORM(UBUFFER(msgbuf));
-		for (c = 0; c < 8; c++)
-			UCHAR(msgbuf, c) ^= UCHAR(ivec, c);
-		MEMCPY(BUFFER(ivec), BUFFER(inbuf), 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 */
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,972 +0,0 @@
-.\"	$NetBSD: ed.1,v 1.30 2010/05/14 02:09:58 joerg Exp $
-.\"	$OpenBSD: ed.1,v 1.42 2003/07/27 13:25:43 jmc Exp $
-.\"
-.\" 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.
-.\"
-.Dd January 23, 2002
-.Dt ED 1
-.Os
-.Sh NAME
-.Nm ed
-.Nd text editor
-.Sh SYNOPSIS
-.Nm
-.Op Fl
-.Op Fl Esx
-.Op Fl p Ar string
-.Op Ar file
-.Sh DESCRIPTION
-.Nm
-is a line-oriented text editor.
-It is used to create, display, modify, and otherwise manipulate text files.
-If invoked with a
-.Ar file
-argument, then a copy of
-.Ar file
-is read into the editor's buffer.
-Changes are made to this copy and not directly to
-.Ar file
-itself.
-Upon quitting
-.Nm ,
-any changes not explicitly saved with a
-.Ic w
-command are lost.
-.Pp
-Editing is done in two distinct modes:
-.Em command
-and
-.Em input .
-When first invoked,
-.Nm
-is in command mode.
-In this mode, commands are read from the standard input and
-executed to manipulate the contents of the editor buffer.
-.Pp
-A typical command might look like:
-.Bd -literal -offset indent
-,s/old/new/g
-.Ed
-.Pp
-which replaces all occurrences of the string
-.Pa old
-with
-.Pa new .
-.Pp
-When an input command, such as
-.Ic a
-(append),
-.Ic i
-(insert),
-or
-.Ic c
-(change) is given,
-.Nm
-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 newline character.
-Input mode is terminated by entering a single period
-.Pq Ql \&.
-on a line.
-.Pp
-All
-.Nm
-commands operate on whole lines or ranges of lines; e.g.,
-the
-.Ic d
-command deletes lines; the
-.Ic 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
-.Ic s
-command is applied to whole lines at a time.
-.Pp
-In general,
-.Nm
-commands consist of zero or more line addresses, followed by a single
-character command and possibly additional parameters; i.e.,
-commands have the structure:
-.Bd -literal -offset indent
-[address [,address]]command[parameters]
-.Ed
-.Pp
-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.
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl
-Same as the
-.Fl s
-option (deprecated).
-.It Fl E
-Enables the use of extended regular expressions instead of the basic
-regular expressions that are normally used.
-.It Fl p Ar string
-Specifies a command prompt.
-This may be toggled on and off with the
-.Ic P
-command.
-.It Fl s
-Suppress diagnostics.
-This should be used if
-.Nm
-standard input is from a script.
-.It Fl x
-Prompt for an encryption key to be used in subsequent reads and writes
-(see the
-.Ic x
-command).
-.It Ar file
-Specifies the name of a file to read.
-If
-.Ar file
-is prefixed with a
-bang
-.Pq Ql \&! ,
-then it is interpreted as a shell command.
-In this case, what is read is the standard output of
-.Ar file
-executed via
-.Xr sh 1 .
-To read a file whose name begins with a bang, prefix the
-name with a backslash
-.Pq Ql \e .
-The default filename is set to
-.Ar file
-only if it is not prefixed with a bang.
-.El
-.Ss LINE ADDRESSING
-An address represents the number of a line in the buffer.
-.Nm
-maintains a
-.Em 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.
-.Pp
-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.,
-.Sq + ,
-.Sq - ,
-and
-.Sq ^ ) ,
-and whitespace.
-Addresses are read from left to right, and their values are computed
-relative to the current address.
-.Pp
-One exception to the rule that addresses represent line numbers is the
-address
-.Em 0
-(zero).
-This means
-.Dq before the first line ,
-and is legal wherever it makes sense.
-.Pp
-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 second.
-If only one address is given in a range,
-then the second address is set to the given address.
-If an
-.Em n Ns No -tuple
-of addresses is given where
-.Em n \*[Gt] 2 ,
-then the corresponding range is determined by the last two addresses in the
-.Em n Ns No -tuple.
-If only one address is expected, then the last address is used.
-.Pp
-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.
-.Pp
-The following address symbols are recognized:
-.Bl -tag -width Ds
-.It Em \&.
-The current line (address) in the buffer.
-.It Em $
-The last line in the buffer.
-.It Em n
-The
-.Em n Ns No th
-line in the buffer where
-.Em n
-is a number in the range
-.Em [0,$] .
-.It Em - No or Em ^
-The previous line.
-This is equivalent to
-.Em -1
-and may be repeated with cumulative effect.
-.It Em -n No or Em ^n
-The
-.Em n Ns No th
-previous line, where
-.Em n
-is a non-negative number.
-.It Em +
-The next line.
-This is equivalent to
-.Em +1
-and may be repeated with cumulative effect.
-.It Em +n
-The
-.Em n Ns No th
-next line, where
-.Em n
-is a non-negative number.
-.It Em whitespace Em n
-.Em whitespace
-followed by a number
-.Em n
-is interpreted as
-.Sq Em +n .
-.It Em \&, No or Em %
-The first through last lines in the buffer.
-This is equivalent to the address range
-.Em 1,$ .
-.It Em \&;
-The current through last lines in the buffer.
-This is equivalent to the address range
-.Em .,$ .
-.It Em / Ns Ar re Ns Em /
-The next line containing the regular expression
-.Ar re .
-The search wraps to the beginning of the buffer and continues down to the
-current line, if necessary.
-.Em //
-repeats the last search.
-.It Em \&? Ns Ar re Ns Em \&?
-The previous line containing the regular expression
-.Ar re .
-The search wraps to the end of the buffer and continues up to the
-current line, if necessary.
-.Em ??
-repeats the last search.
-.It Em \&\' Ns Ar lc
-The line previously marked by a
-.Ic k
-(mark) command, where
-.Ar lc
-is a lower case letter.
-.El
-.Ss REGULAR EXPRESSIONS
-Regular expressions are patterns used in selecting text.
-For example, the
-.Nm
-command
-.Bd -literal -offset indent
-g/string/
-.Ed
-.Pp
-prints all lines containing
-.Em string .
-Regular expressions are also used by the
-.Ic s
-command for selecting old text to be replaced with new.
-.Pp
-In addition to 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 leftmost longest match is the one selected.
-.Pp
-The following symbols are used in constructing regular expressions:
-.Bl -tag -width Dsasdfsd
-.It Em c
-Any character
-.Em c
-not listed below, including
-.Sq { ,
-.Sq } ,
-.Sq \&( ,
-.Sq \&) ,
-.Sq \*[Lt] ,
-and
-.Sq \*[Gt]
-matches itself.
-.It Em \ec
-Any backslash-escaped character
-.Em c ,
-except for
-.Sq { ,
-.Sq } ,
-.Sq \&( ,
-.Sq \&) ,
-.Sq \*[Lt] ,
-and
-.Sq \*[Gt]
-matches itself.
-.It Em \&.
-Matches any single character.
-.It Em [char-class]
-Matches any single character in the character class
-.Em char-class .
-See
-.Sx CHARACTER CLASSES
-below for further information.
-.It Em [^char-class]
-Matches any single character, other than newline, not in the
-character class
-.Em char-class .
-.It Em ^
-If
-.Em ^
-is the first character of a regular expression, then it
-anchors the regular expression to the beginning of a line.
-Otherwise, it matches itself.
-.It Em $
-If
-.Em $
-is the last character of a regular expression,
-it anchors the regular expression to the end of a line.
-Otherwise, it matches itself.
-.It Em \e\*[Lt]
-Anchors the single character regular expression or subexpression
-immediately following it to the beginning of a word.
-(This may not be available.)
-.It Em \e\*[Gt]
-Anchors the single character regular expression or subexpression
-immediately following it to the end of a word.
-(This may not be available.)
-.It Em \e( Ns Ar re Ns Em \e)
-Defines a subexpression
-.Ar re .
-Subexpressions may be nested.
-A subsequent backreference of the form
-.Em \en ,
-where
-.Em n
-is a number in the range [1,9], expands to the text matched by the
-.Em n Ns No th
-subexpression.
-For example, the regular expression
-.Em \e(.*\e)\e1
-matches any string consisting of identical adjacent substrings.
-Subexpressions are ordered relative to their left delimiter.
-.It Em *
-Matches the single character regular expression or subexpression
-immediately preceding it zero or more times.
-If
-.Em *
-is the first character of a regular expression or subexpression,
-then it matches itself.
-The
-.Em *
-operator sometimes yields unexpected results.
-For example, the regular expression
-.Em b*
-matches the beginning of the string
-.Em abbb
-(as opposed to the substring
-.Em bbb ) ,
-since a null match is the only leftmost match.
-.Sm off
-.It Em \e{ No n,m Em \e}\ \e{ No n, Em \e}\ \& Em \e{ No n Em \e}
-.Sm on
-Matches the single character regular expression or subexpression
-immediately preceding it at least
-.Em n
-and at most
-.Em m
-times.
-If
-.Em m
-is omitted, then it matches at least
-.Em n
-times.
-If the comma is also omitted, then it matches exactly
-.Em n
-times.
-.El
-.Pp
-Additional regular expression operators may be defined depending on the
-particular
-.Xr regex 3
-implementation.
-.Ss CHARACTER CLASSES
-A character class specifies a set of characters. It is written within
-square brackets
-.Pq []
-and in its most basic form contains just the characters in the set.
-.Pp
-To include a
-.Sq \&]
-in a character class, it must be the first character.
-A range of characters may be specified by separating the end characters
-of the range with a
-.Sq \&- ,
-e.g.,
-.Sq a-z
-specifies the lower case characters.
-.Pp
-The following literals can also be used within character classes as
-shorthand for particular sets of characters:
-.Bl -tag -offset indent -compact -width [:blahblah:]
-.It [:alnum:]
-Alphanumeric characters.
-.It [:cntrl:]
-Control characters.
-.It [:lower:]
-Lowercase alphabetic characters.
-.It [:space:]
-Whitespace (space, tab, newline, form feed, etc.)
-.It [:alpha:]
-Alphabetic characters.
-.It [:digit:]
-Numeric characters (digits).
-.It [:print:]
-Printable characters.
-.It [:upper:]
-Uppercase alphabetic characters.
-.It [:blank:]
-Blank characters (space and tab).
-.It [:graph:]
-Graphical characters (printing nonblank characters).
-.It [:punct:]
-Punctuation characters.
-.It [:xdigit:]
-Hexadecimal digits.
-.El
-If
-.Sq \&-
-appears as the first or last character of a character class, then
-it matches itself.
-All other characters in a character class match themselves.
-.Pp
-Patterns in
-a character class
-of the form
-.Em [.col-elm.]
-or
-.Em [=col-elm=]
-where
-.Em col-elm
-is a
-.Em collating element
-are interpreted according to
-.Xr locale 5
-(not currently supported).
-See
-.Xr regex 3
-for an explanation of these constructs.
-.Ss COMMANDS
-All
-.Nm
-commands are single characters, though some require additional parameters.
-If a command's parameters extend over several lines, then
-each line except for the last must be terminated with a backslash
-.Pq Ql \e .
-.Pp
-In general, at most one command is allowed per line.
-However, most commands accept a print suffix, which is any of
-.Ic p
-(print),
-.Ic l
-(list),
-or
-.Ic n
-(enumerate), to print the last line affected by the command.
-.Pp
-An interrupt (typically ^C) has the effect of aborting the current command
-and returning the editor to command mode.
-.Pp
-.Nm
-recognizes the following commands.
-The commands are shown together with
-the default address or address range supplied if none is
-specified (in parentheses), and other possible arguments on the right.
-.Bl -tag -width Dxxs
-.It (.) Ns Ic 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.
-.It (.,.) Ns Ic 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.
-.It (.,.) Ns Ic 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.
-.It Ic e Ar file
-Edits
-.Ar file ,
-and sets the default filename.
-If
-.Ar 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.
-.It Ic e Ar !command
-Edits the standard output of
-.Ar command ,
-(see
-.Ic \&! Ar command
-below).
-The default filename is unchanged.
-Any lines in the buffer are deleted before the output of
-.Em command
-is read.
-The current address is set to the last line read.
-.It Ic E Ar file
-Edits
-.Ar file
-unconditionally.
-This is similar to the
-.Ic e
-command, except that unwritten changes are discarded without warning.
-The current address is set to the last line read.
-.It Ic f Ar file
-Sets the default filename to
-.Ar file .
-If
-.Ar file
-is not specified, then the default unescaped filename is printed.
-.It (1,$) Ns Ic g Ns Ar /re/command-list
-Applies
-.Ar command-list
-to each of the addressed lines matching a regular expression
-.Ar re .
-The current address is set to the line currently matched before
-.Ar command-list
-is executed.
-At the end of the
-.Ic g
-command, the current address is set to the last line affected by
-.Ar command-list .
-.Pp
-Each command in
-.Ar command-list
-must be on a separate line,
-and every line except for the last must be terminated by a backslash
-.Pq Sq \e .
-Any commands are allowed, except for
-.Ic g ,
-.Ic G ,
-.Ic v ,
-and
-.Ic V .
-A newline alone in
-.Ar command-list
-is equivalent to a
-.Ic p
-command.
-.It (1,$) Ns Ic G Ns Ar /re/
-Interactively edits the addressed lines matching a regular expression
-.Ar re .
-For each matching line, the line is printed, the current address is set,
-and the user is prompted to enter a
-.Ar command-list .
-At the end of the
-.Ic G
-command, the current address is set to the last line affected by (the last)
-.Ar command-list .
-.Pp
-The format of
-.Ar command-list
-is the same as that of the
-.Ic g
-command.
-A newline alone acts as a null command list.
-A single
-.Sq \*[Am]
-repeats the last non-null command list.
-.It Ic H
-Toggles the printing of error explanations.
-By default, explanations are not printed.
-It is recommended that
-.Nm
-scripts begin with this command to aid in debugging.
-.It Ic h
-Prints an explanation of the last error.
-.It (.) Ns Ic 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.
-.It (.,.+1) Ns Ic 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.
-.It (.) Ns Ic k Ns Ar lc
-Marks a line with a lower case letter
-.Ar lc .
-The line can then be addressed as
-.Ar \&'lc
-(i.e., a single quote followed by
-.Ar lc )
-in subsequent commands.
-The mark is not cleared until the line is deleted or otherwise modified.
-.It (.,.) Ns Ic l
-Prints the addressed lines unambiguously.
-If a single line fills more than one screen (as might be the case
-when viewing a binary file, for instance), a
-.Dq --More--
-prompt is printed on the last line.
-.Nm
-waits until the RETURN key is pressed before displaying the next screen.
-The current address is set to the last line printed.
-.It (.,.) Ns Ic m Ns No (.)
-Moves lines in the buffer.
-The addressed lines are moved to after the
-right-hand destination address, which may be the address
-.Em 0
-(zero).
-The current address is set to the last line moved.
-.It (.,.) Ns Ic n
-Prints the addressed lines along with their line numbers.
-The current address is set to the last line printed.
-.It (.,.) Ns Ic p
-Prints the addressed lines.
-The current address is set to the last line printed.
-.It Ic P
-Toggles the command prompt on and off.
-Unless a prompt was specified with the command-line option
-.Fl p Ar string ,
-the command prompt is by default turned off.
-.It Ic q
-Quits
-.Nm .
-.It Ic Q
-Quits
-.Nm
-unconditionally.
-This is similar to the
-.Ic q
-command, except that unwritten changes are discarded without warning.
-.It ($) Ns Ic r Ar file
-Reads
-.Ar file
-to after the addressed line.
-If
-.Ar 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
-.Ar file .
-Otherwise, the default filename is unchanged.
-The current address is set to the last line read.
-.It ($) Ns Ic r Ar !command
-Reads to after the addressed line the standard output of
-.Ar command ,
-(see the
-.Ic \&!
-command below).
-The default filename is unchanged.
-The current address is set to the last line read.
-.Sm off
-.It (.,.) Ic s Ar /re/replacement/ , \ (.,.) \
-Ic s Ar /re/replacement/ Em g , Ar \ (.,.) \
-Ic s Ar /re/replacement/ Em n
-.Sm on
-Replaces text in the addressed lines matching a regular expression
-.Ar re
-with
-.Ar replacement .
-By default, only the first match in each line is replaced.
-If the
-.Em g
-(global) suffix is given, then every match to be replaced.
-The
-.Em n
-suffix, where
-.Em n
-is a positive number, causes only the
-.Em n Ns No 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.
-.Pp
-.Ar re
-and
-.Ar replacement
-may be delimited by any character other than space and newline
-(see the
-.Ic 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
-.Em p
-were specified.
-.Pp
-An unescaped
-.Ql \*[Am]
-in
-.Ar replacement
-is replaced by the currently matched text.
-The character sequence
-.Em \em ,
-where
-.Em m
-is a number in the range [1,9], is replaced by the
-.Em m Ns No th
-backreference expression of the matched text.
-If
-.Ar replacement
-consists of a single
-.Ql % ,
-then
-.Ar replacement
-from the last substitution is used.
-Newlines may be embedded in
-.Ar replacement
-if they are escaped with a backslash
-.Pq Ql \e .
-.It (.,.) Ns Ic s
-Repeats the last substitution.
-This form of the
-.Ic s
-command accepts a count suffix
-.Em n ,
-or any combination of the characters
-.Em r ,
-.Em g ,
-and
-.Em p .
-If a count suffix
-.Em n
-is given, then only the
-.Em n Ns No th
-match is replaced.
-The
-.Em r
-suffix causes
-the regular expression of the last search to be used instead of
-that of the last substitution.
-The
-.Em g
-suffix toggles the global suffix of the last substitution.
-The
-.Em p
-suffix toggles the print suffix of the last substitution.
-The current address is set to the last line affected.
-.It (.,.) Ns Ic t Ns No (.)
-Copies (i.e., transfers) the addressed lines to after the right-hand
-destination address, which may be the address
-.Em 0
-(zero).
-The current address is set to the last line copied.
-.It Ic u
-Undoes the last command and restores the current address
-to what it was before the command.
-The global commands
-.Ic g ,
-.Ic G ,
-.Ic v ,
-and
-.Ic V
-are treated as a single command by undo.
-.Ic u
-is its own inverse.
-.It (1,$) Ns Ic v Ns Ar /re/command-list
-Applies
-.Ar command-list
-to each of the addressed lines not matching a regular expression
-.Ar re .
-This is similar to the
-.Ic g
-command.
-.It (1,$) Ns Ic V Ns Ar /re/
-Interactively edits the addressed lines not matching a regular expression
-.Ar re .
-This is similar to the
-.Ic G
-command.
-.It (1,$) Ns Ic w Ar file
-Writes the addressed lines to
-.Ar file .
-Any previous contents of
-.Ar file
-are lost without warning.
-If there is no default filename, then the default filename is set to
-.Ar file ,
-otherwise it is unchanged.
-If no filename is specified, then the default filename is used.
-The current address is unchanged.
-.It (1,$) Ns Ic wq Ar file
-Writes the addressed lines to
-.Ar file ,
-and then executes a
-.Ic q
-command.
-.It (1,$) Ns Ic w Ar !command
-Writes the addressed lines to the standard input of
-.Ar command ,
-(see the
-.Ic \&!
-command below).
-The default filename and current address are unchanged.
-.It (1,$) Ns Ic W Ar file
-Appends the addressed lines to the end of
-.Ar file .
-This is similar to the
-.Ic w
-command, except that the previous contents of file are not clobbered.
-The current address is unchanged.
-.It Ic 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
-.Xr bdes 1
-algorithm.
-.It (.+1) Ns Ic z Ns Ar n
-Scrolls
-.Ar n
-lines at a time starting at addressed line.
-If
-.Ar n
-is not specified, then the current window size is used.
-The current address is set to the last line printed.
-.It ($) Ns Ic =
-Prints the line number of the addressed line.
-.It (.+1) Ns Ic newline
-Prints the addressed line, and sets the current address to that line.
-.It Ic \&! Ns Ar command
-Executes
-.Ar command
-via
-.Xr sh 1 .
-If the first character of
-.Ar command
-is
-.Ic \&! ,
-then it is replaced by text of the previous
-.Ic !command .
-.Nm
-does not process
-.Ar command
-for
-.Sq \e
-(backslash) escapes.
-However, an unescaped
-.Sq %
-is replaced by the default filename.
-When the shell returns from execution, a
-.Sq \&!
-is printed to the standard output.
-The current line is unchanged.
-.El
-.Sh LIMITATIONS
-.Nm
-processes
-.Em file
-arguments for backslash escapes, i.e., in a filename,
-any characters preceded by a backslash
-.Pq Ql \e
-are interpreted literally.
-.Pp
-If a text (non-binary) file is not terminated by a newline character,
-then
-.Nm
-appends one on reading/writing it.
-In the case of a binary file,
-.Nm
-does not append a newline on reading/writing.
-.Sh ENVIRONMENT
-.Bl -tag -width iTMPDIR
-.It Ev TMPDIR
-The location used to store temporary files.
-.El
-.Sh FILES
-.Bl -tag -width /tmp/ed.* -compact
-.It Pa /tmp/ed.*
-buffer file
-.It Pa ed.hup
-where
-.Nm
-attempts to write the buffer if the terminal hangs up
-.El
-.Sh DIAGNOSTICS
-When an error occurs,
-.Nm
-prints a
-.Dq \&?
-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
-.Ic h
-(help) command.
-.Pp
-Since the
-.Ic g
-(global) command masks any errors from failed searches and substitutions,
-it can be used to perform conditional operations in scripts; e.g.,
-.Bd -literal -offset indent
-g/old/s//new/
-.Ed
-.Pp
-replaces any occurrences of
-.Em old
-with
-.Em new .
-.Pp
-If the
-.Ic u
-(undo) command occurs in a global command list, then
-the command list is executed only once.
-.Pp
-If diagnostics are not disabled, attempting to quit
-.Nm
-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.
-.Sh SEE ALSO
-.Xr bdes 1 ,
-.Xr sed 1 ,
-.Xr sh 1 ,
-.Xr vi 1 ,
-.Xr regex 3
-.Pp
-USD:09-10
-.Rs
-.%A B. W. Kernighan
-.%A P. J. Plauger
-.%B Software Tools in Pascal
-.%I Addison-Wesley
-.%D 1981
-.Re
-.Sh HISTORY
-An
-.Nm
-command appeared in
-.At v1 .
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -1,293 +0,0 @@
-/*	$NetBSD: ed.h,v 1.35 2011/08/29 14:51:18 joerg 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__) || defined(__APPLE__) || \
-    defined(__minix)
-# 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) { \
-	errno = 0 ; \
-	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')
-
-#if defined(sun) && !defined(__SVR4)
-# define strerror(n) sys_errlist[n]
-#endif
-
-/* Local Function Declarations */
-void add_line_node(line_t *);
-int append_lines(long);
-int apply_subst_template(char *, regmatch_t *, int, int);
-int build_active_list(int);
-int check_addr_range(long, long);
-void clear_active_list(void);
-void clear_undo_stack(void);
-int close_sbuf(void);
-int copy_lines(long);
-int delete_lines(long, long);
-int display_lines(long, long, int);
-line_t *dup_line_node(line_t *);
-int exec_command(void);
-long exec_global(int, int);
-int extract_addr_range(void);
-char *extract_pattern(int);
-int extract_subst_tail(int *, long *);
-char *extract_subst_template(void);
-int filter_lines(long, long, char *);
-int flush_des_file(FILE *);
-line_t *get_addressed_line_node(long);
-pattern_t *get_compiled_pattern(void);
-int get_des_char(FILE *);
-char *get_extended_line(int *, int);
-char *get_filename(void);
-int get_keyword(void);
-long get_line_node_addr(line_t *);
-long get_matching_node_addr(pattern_t *, int);
-long get_marked_node_addr(int);
-char *get_sbuf_line(line_t *);
-int get_shell_command(void);
-int get_stream_line(FILE *);
-int get_tty_line(void);
-__dead void handle_hup(int);
-__dead void handle_int(int);
-void handle_winch(int);
-int has_trailing_escape(char *, char *);
-void init_buffers(void);
-void init_des_cipher(void);
-int is_legal_filename(char *);
-int join_lines(long, long);
-int mark_line_node(line_t *, int);
-int move_lines(long);
-line_t *next_active_node(void);
-long next_addr(void);
-int open_sbuf(void);
-char *parse_char_class(char *);
-int pop_undo_stack(void);
-undo_t *push_undo_stack(int, long, long);
-int put_des_char(int, FILE *);
-char *put_sbuf_line(char *);
-int put_stream_line(FILE *, char *, int);
-int put_tty_line(char *, int, long, int);
-__dead void quit(int);
-long read_file(char *, long);
-long read_stream(FILE *, long);
-int search_and_replace(pattern_t *, int, int);
-int set_active_node(line_t *);
-void signal_hup(int);
-void signal_int(int);
-char *strip_escapes(const char *);
-int substitute_matching_text(pattern_t *, line_t *, int, int);
-char *translit_text(char *, int, int, int);
-void unmark_line_node(line_t *);
-void unset_active_nodes(line_t *, line_t *);
-long write_file(const char *, const char *, long, long);
-long write_stream(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 long first_addr;
-extern int lineno;
-extern long second_addr;
-extern long rows;
-extern int cols;
-extern int scripted;
-extern int ere;
-extern int des;
-extern int newline_added;	/* io.c */
-extern int patlock;
-extern char errmsg[];		/* re.c */
-extern long u_current_addr;	/* undo.c */
-extern long u_addr_last;	/* undo.c */
-#if defined(sun) && !defined(__SVR4)
-extern char *sys_errlist[];
-#endif
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -1,227 +0,0 @@
-/*	$NetBSD: glbl.c,v 1.6 2005/06/26 19:10:49 christos 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)glob.c,v 1.1 1994/02/01 00:34:40 alm Exp";
-#else
-__RCSID("$NetBSD: glbl.c,v 1.6 2005/06/26 19:10:49 christos 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(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(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
-	char cmdp[] = "p\n";
-
-	if (!interact) {
-		if (!strcmp(ibufp, "\n"))
-			cmd = cmdp;		/* 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(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(line_t *np, line_t *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(void)
-{
-	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(void)
-{
-	SPL1();
-	active_size = active_last = active_ptr = active_ndx = 0;
-	free(active_list);
-	active_list = NULL;
-	SPL0();
-}
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -1,358 +0,0 @@
-/*	$NetBSD: io.c,v 1.9 2011/05/23 23:13:10 joerg 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp";
-#else
-__RCSID("$NetBSD: io.c,v 1.9 2011/05/23 23:13:10 joerg Exp $");
-#endif
-#endif /* not lint */
-
-#include "ed.h"
-
-
-/* read_file: read a named file/pipe into the buffer; return line count */
-long
-read_file(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;
-	}
-	if (!scripted)
-		fprintf(stderr, "%lu\n", size);
-	return current_addr - n;
-}
-
-
-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(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(FILE *fp)
-{
-	int c;
-	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(const char *fn, const 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;
-	}
-	if (!scripted)
-		fprintf(stderr, "%lu\n", size);
-	return n ? m - n + 1 : 0;
-}
-
-
-/* write_stream: write a range of lines to a stream; return status */
-long
-write_stream(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(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(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(void)
-{
-	int oi = 0;
-	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\\"
-
-/* put_tty_line: print text to stdout */
-int
-put_tty_line(char *s, int l, long n, int gflag)
-{
-	int col = 0;
-	char *cp;
-#ifndef BACKWARDS
-	int lc = 0;
-#endif
-
-	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;
-}
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -1,135 +0,0 @@
-/*	$NetBSD: re.c,v 1.19 2005/02/17 16:29:26 xtraeme 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
-#else
-__RCSID("$NetBSD: re.c,v 1.19 2005/02/17 16:29:26 xtraeme Exp $");
-#endif
-#endif /* not lint */
-
-#include "ed.h"
-
-
-char errmsg[MAXPATHLEN + 40] = "";
-
-/* get_compiled_pattern: return pointer to compiled pattern from command 
-   buffer */
-pattern_t *
-get_compiled_pattern(void)
-{
-	static pattern_t *expr = 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 (!expr) sprintf(errmsg, "no previous pattern");
-		return expr;
-	} else if ((exps = extract_pattern(delimiter)) == NULL)
-		return NULL;
-	/* buffer alloc'd && not reserved */
-	if (expr && !patlock)
-		regfree(expr);
-	else if ((expr = (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(expr, exps, ere)) != 0) {
-		regerror(n, expr, errmsg, sizeof errmsg);
-		free(expr);
-		return expr = NULL;
-	}
-	return expr;
-}
-
-
-/* extract_pattern: copy a pattern string from the command buffer; return
-   pointer to the copy */
-char *
-extract_pattern(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(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;
-}
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -1,260 +0,0 @@
-/*	$NetBSD: sub.c,v 1.6 2005/02/17 16:29:26 xtraeme 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)sub.c,v 1.1 1994/02/01 00:34:44 alm Exp";
-#else
-__RCSID("$NetBSD: sub.c,v 1.6 2005/02/17 16:29:26 xtraeme 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(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(void)
-{
-	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(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(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(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;
-}
--- a/bin/ed/test/=.err
+++ b/bin/ed/test/=.err
@@ -1 +0,0 @@
-1,$=
--- a/bin/ed/test/Makefile
+++ b/bin/ed/test/Makefile
@@ -1,28 +0,0 @@
-#	$NetBSD: Makefile,v 1.12 2003/10/26 03:50:07 lukem Exp $
-
-.include <bsd.own.mk>
-
-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) ..."; \
-		${HOST_SH} ${.CURDIR}/mkscripts.sh $(ED); \
-	fi
-
-test: build ckscripts.sh
-	@echo testing $(ED) ...
-	@${HOST_SH} ckscripts.sh $(ED)
-
-clean:
-	rm -f *.ed *.red *.[oz] *~
-
-.include <bsd.prog.mk>
--- a/bin/ed/test/README
+++ b/bin/ed/test/README
@@ -1,32 +0,0 @@
-$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
--- a/bin/ed/test/TODO
+++ b/bin/ed/test/TODO
@@ -1,17 +0,0 @@
-$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
--- a/bin/ed/test/a.r
+++ b/bin/ed/test/a.r
@@ -1,8 +0,0 @@
-hello world
-line 1
-hello world!
-line 2
-line 3
-line 4
-line5
-hello world!!
--- a/bin/ed/test/a.t
+++ b/bin/ed/test/a.t
@@ -1,9 +0,0 @@
-0a
-hello world
-.
-2a
-hello world!
-.
-$a
-hello world!!
-.
--- a/bin/ed/test/a1.err
+++ b/bin/ed/test/a1.err
@@ -1,3 +0,0 @@
-1,$a
-hello world
-.
--- a/bin/ed/test/a2.err
+++ b/bin/ed/test/a2.err
@@ -1,3 +0,0 @@
-aa
-hello world
-.
--- a/bin/ed/test/addr.r
+++ b/bin/ed/test/addr.r
@@ -1,2 +0,0 @@
-line 2
-line9
--- a/bin/ed/test/addr.t
+++ b/bin/ed/test/addr.t
@@ -1,5 +0,0 @@
-1 d
-1 1 d
-1,2,d
-1;+ + ,d
-1,2;., + 2d
--- a/bin/ed/test/addr1.err
+++ b/bin/ed/test/addr1.err
@@ -1 +0,0 @@
-100
--- a/bin/ed/test/addr2.err
+++ b/bin/ed/test/addr2.err
@@ -1 +0,0 @@
-100
--- a/bin/ed/test/ascii.r
+++ b/bin/ed/test/ascii.r
--- a/bin/ed/test/bang1.err
+++ b/bin/ed/test/bang1.err
@@ -1 +0,0 @@
-.!date
--- a/bin/ed/test/bang1.r
+++ b/bin/ed/test/bang1.r
@@ -1 +0,0 @@
-okay
--- a/bin/ed/test/bang1.t
+++ b/bin/ed/test/bang1.t
@@ -1,5 +0,0 @@
-!read one
-hello, world
-a
-okay
-.
--- a/bin/ed/test/bang2.err
+++ b/bin/ed/test/bang2.err
@@ -1 +0,0 @@
-!!
--- a/bin/ed/test/c.r
+++ b/bin/ed/test/c.r
@@ -1,4 +0,0 @@
-at the top
-between top/middle
-in the middle
-at the bottom
--- a/bin/ed/test/c.t
+++ b/bin/ed/test/c.t
@@ -1,12 +0,0 @@
-1c
-at the top
-.
-4c
-in the middle
-.
-$c
-at the bottom
-.
-2,3c
-between top/middle
-.
--- a/bin/ed/test/c1.err
+++ b/bin/ed/test/c1.err
@@ -1,3 +0,0 @@
-cc
-hello world
-.
--- a/bin/ed/test/c2.err
+++ b/bin/ed/test/c2.err
@@ -1,3 +0,0 @@
-0c
-hello world
-.
--- a/bin/ed/test/ckscripts.sh
+++ b/bin/ed/test/ckscripts.sh
@@ -1,37 +0,0 @@
-#!/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
--- a/bin/ed/test/d.err
+++ b/bin/ed/test/d.err
@@ -1 +0,0 @@
-dd
--- a/bin/ed/test/d.r
+++ b/bin/ed/test/d.r
@@ -1 +0,0 @@
-line 2
--- a/bin/ed/test/d.t
+++ b/bin/ed/test/d.t
@@ -1,3 +0,0 @@
-1d
-2;+1d
-$d
--- a/bin/ed/test/e1.err
+++ b/bin/ed/test/e1.err
@@ -1 +0,0 @@
-ee e1.err
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ben Gras	116fcea5be	include netdrv_tg3 on cd	2012-02-26 23:36:00 +01:00
Tomas Hruby	d991abdd34	Revert "SMP - no_apic=0 and acpi=1 set when CONFIG_SMP=y" This reverts commit `c468f4efa5`. Since we use the new boot loader, this hack is no longer necessary.	2012-02-24 14:58:48 +01:00
Antoine Leca	dd9c147444	Cosmetic boot fix. The NetBSD boot loader loads automatically the kernel module appropriate for the detected root file system; it is preset at "ffs". The MINIX3fs support does not reset the underlying global variable, since there are no use for this on MINIX. As a result, the boot loader searches for /ffs.kmod, and issues two warnings about "module failure to open/load."	2012-02-24 13:29:58 +01:00
Ben Gras	60a4f87b0b	fix for -lsys assert(): call panic() . call panic() instead of abort() so that stacktraces are printed . also call printf(..) instead of fprintf(stderr, ..)	2012-02-24 13:10:27 +01:00
Ben Gras	16a468ccec	start modules at 16MB . keep more memory free below 16MB for e.g. lance	2012-02-24 11:51:07 +01:00
Arun Thomas	f55f1f3e52	kernel: Update copyright date	2012-02-22 16:39:41 +01:00
Ben Gras	47627954a0	allow elvis to be invoked as ex	2012-02-22 01:52:20 +01:00
Arun Thomas	72cab7a281	mkimage: use a lower start address	2012-02-21 15:52:18 +01:00
Thomas Veerman	93a8d9f260	VFS: fix last_dir not returning last directory If the provided path was only a single component (i.e., without slashes), then last_dir would return early and skip the symlink detection (i.e., check whether the path ends in a symlink and resolve that first before returning). This bug triggered an assert in open which expects that an advance after an last_dir (with VMNT_WRITE lock) does not yield another vmnt lock.	2012-02-21 10:22:45 +00:00
Ben Gras	665ce9d4e1	try multiple reset methods . fixes reboot-hang under vbox . makes experience nicer under vmware . taken from netbsd reset code	2012-02-20 23:54:28 +01:00
Thomas Veerman	3b3ea9dc32	VFS: remove erroneous assert The assert was meant as an additional check to the assert in link.c:198. The reasoning behind the assert in link.c:198 is that once you've obtained a write lock on a vmnt, you can't get an additional read lock on the same vmnt. However, that does not always hold for the assert in path.c:281 where the situation could be that you've obtained a read lock and managed to get another read lock (this is possible). In other words, the assert in path.c:281 is not the right place to check for that situation.	2012-02-20 14:16:19 +00:00