MFC: rev 1.4: forward compatability with cvs-1.12 repository

MFC: Don't set the COMPLETE flag in an inodedep structure before the
related inode has been written.
2026-10-28 19:34:43 +01:00 · 2008-01-07 09:11:23 +00:00 · 2005-08-26 20:40:31 +00:00 · 2003-12-02 06:18:37 +00:00 · 2003-12-01 13:21:47 +00:00 · 2003-09-17 20:22:03 +00:00
11204 changed files with 750173 additions and 380656 deletions
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94

 All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite
@@ -63,3 +63,35 @@ The views and conclusions contained in the software and documentation are
 those of the authors and should not be interpreted as representing official
 policies, either expressed or implied, of the Regents of the University
 of California.
+
+
+NOTE: The copyright of UC Berkeley's Berkeley Software Distribution ("BSD")
+source has been updated.  The copyright addendum may be found at
+ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change and is
+included below.
+
+July 22, 1999
+
+To All Licensees, Distributors of Any Version of BSD:
+
+As you know, certain of the Berkeley Software Distribution ("BSD") source
+code files require that further distributions of products containing all or
+portions of the software, acknowledge within their advertising materials
+that such products contain software developed by UC Berkeley and its
+contributors.
+
+Specifically, the provision reads:
+
+"     * 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."
+
+Effective immediately, licensees and distributors are no longer required to
+include the acknowledgement within advertising materials.  Accordingly, the
+foregoing paragraph of those BSD Unix files containing it is hereby deleted
+in its entirety.
+
+William Hoskins
+Director, Office of Technology Licensing
+University of California, Berkeley
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.221 1998/10/17 15:25:26 bde Exp $
+# $FreeBSD$
 #
 # The user-driven targets are:
 #
@@ -8,6 +8,7 @@
 # installworld        - Install everything built by "buildworld".
 # world               - buildworld + installworld.
 # update              - Convenient way to update your source tree (cvs).
+# upgrade             - Upgrade a.out (2.2.x/3.0) system to the new ELF way
 # most                - Build user commands, no libraries or include files.
 # installmost         - Install user commands, no libraries or include files.
 # aout-to-elf         - Upgrade an system from a.out to elf format (see below).
@@ -51,7 +52,7 @@
 # or 3.0. If OBJFORMAT is set as an environment variable or in /etc/make.conf,
 # this overrides /etc/objformat.
 #
-# Unless -DNOAOUT is specified, a `make world' with OBJFORMAT=elf will
+# If -DWANT_AOUT is specified, a `make world' with OBJFORMAT=elf will
 # update the legacy support for aout. This includes all libraries, ld.so
 # and boot objects. This part of build should be regarded as
 # deprecated and you should _not_ expect to be able to do this past the
@@ -63,25 +64,19 @@
 #           Upgrading an i386 system from a.out to elf format
 #
 #
-# The aout->elf transition build is performed by doing a `make aout-to-elf'
-# or a `make aout-to-elf-build' followed by a `make aout-to-elf-install'.
+# The aout->elf transition build is performed by doing a `make upgrade' (or
+# `make aout-to-elf') or in two steps by a `make aout-to-elf-build' followed
+# by a `make aout-to-elf-install', depending on user preference.
 # You need to have at least 320 Mb of free space for the object tree.
 #
 # The upgrade process checks the installed release. If this is 3.0-CURRENT,
 # it is assumed that your kernel contains all the syscalls required by the
 # current sources.
 #
-# For installed systems where `uname -r' reports something other than
-# 3.0-CURRENT, the upgrade process expects to build a kernel using the
-# kernel configuration file sys/i386/conf/GENERICupgrade. This file is
-# defaulted to the GENERIC kernel configuration file on the assumption that
-# it will be suitable for most systems. Before performing the upgrade,
-# replace sys/i386/conf/GENERICupgrade with your own version if your
-# hardware requires a different configuration.
-#
 # The upgrade procedure will stop and ask for confirmation to proceed
 # several times. On each occasion, you can type Ctrl-C to abort the
-# upgrade.
+# upgrade.  Optionally, you can also start it with NOCONFIRM=yes and skip
+# the confirmation steps.
 #
 # At the end of the upgrade procedure, /etc/objformat is created or
 # updated to contain OBJFORMAT=elf. From then on, you're elf by default.
@@ -102,7 +97,7 @@ TGTS =	afterdistribute all buildworld checkdpadd clean cleandepend cleandir \
 #
 ${TGTS} : upgrade_checks
 	@cd ${.CURDIR}; \
-		make -f Makefile.inc0 -m ${.CURDIR}/share/mk ${.TARGET}
+		${MAKE} -f Makefile.inc0 -m ${.CURDIR}/share/mk ${.TARGET}

 # Set a reasonable default
 .MAIN:	all
@@ -116,7 +111,7 @@ ${TGTS} : upgrade_checks
 # the system to current.
 #
 upgrade_checks :
-	@cd ${.CURDIR}; if `make -m ${.CURDIR}/share/mk test > /dev/null 2>&1`; then ok=1; else make -f Makefile.upgrade make; fi;
+	@cd ${.CURDIR}; if `make -m ${.CURDIR}/share/mk test > /dev/null 2>&1`; then ok=1; else ${MAKE} -f Makefile.upgrade make; fi;

 #
 # A simple test target used as part of the test to see if make supports
@@ -134,6 +129,9 @@ UPGRADE =	aout-to-elf aout-to-elf-build aout-to-elf-install \
 #
 # Handle the upgrade targets, using the source relative mk files.
 #
+
+upgrade:	aout-to-elf
+
 ${UPGRADE} : upgrade_checks
 	@cd ${.CURDIR}; \
-		make -f Makefile.upgrade -m ${.CURDIR}/share/mk ${.TARGET}
+		${MAKE} -f Makefile.upgrade -m ${.CURDIR}/share/mk ${.TARGET}
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.inc0,v 1.13 1998/12/20 14:30:08 jhay Exp $
+# $FreeBSD$
 #
 # This makefile ensures that the object directory is set according to the
 # object format to avoid mixing aout and elf formatted files during the
@@ -59,6 +59,7 @@ LEGACY_ENV=	PATH=${ELFTMPPATH} OBJFORMAT=aout NOTOOLS=1 TOOLROOT=${ELFTMP} \
 		MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/aout
 XMAKE=		${ELFTMP}/usr/bin/${MAKE}

+STARTTIME!= LC_TIME=C date
 #
 # world
 #
@@ -68,7 +69,7 @@ XMAKE=		${ELFTMP}/usr/bin/${MAKE}
 #
 world:
 	@echo "--------------------------------------------------------------"
-	@echo ">>> ${OBJFORMAT} make world started on `LC_TIME=C date`"
+	@echo ">>> ${OBJFORMAT} make world started on ${STARTTIME}"
 	@echo "--------------------------------------------------------------"
 .if target(pre-world)
 	@echo
@@ -78,11 +79,11 @@ world:
 	@cd ${.CURDIR}; ${MK_ENV} ${MAKE} pre-world
 .endif
 	@cd ${.CURDIR}; ${MK_ENV} ${MAKE} buildworld
-.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT)
+.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT)
 	@cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} legacy-build
 .endif
 	@cd ${.CURDIR}; ${MK_ENV} ${MAKE} -B installworld
-.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT)
+.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT)
 	@cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} legacy-install
 .endif
 .if target(post-world)
@@ -94,6 +95,7 @@ world:
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
+	@echo ">>> ${OBJFORMAT} make world started on ${STARTTIME}"
 	@echo ">>> ${OBJFORMAT} make world completed on `LC_TIME=C date`"
 	@echo "--------------------------------------------------------------"

@@ -105,7 +107,7 @@ world:
 #
 buildworld	:
 	@cd ${.CURDIR}; ${MK_ENV} ${MAKE} buildworld
-.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT)
+.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT)
 	@cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} legacy-build
 .endif

@@ -117,6 +119,6 @@ buildworld	:
 #
 installworld	:
 	@cd ${.CURDIR}; ${MK_ENV} ${MAKE} installworld
-.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT)
+.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT)
 	@cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} -DNOMAN -DNOINFO legacy-install
 .endif
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.inc1,v 1.58 1999/01/07 13:09:15 eivind Exp $
+# $FreeBSD$
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
@@ -183,13 +183,15 @@ TMPPATH=	${STRICTTMPPATH}:${PATH}
 COMPILER_ENV=	BISON_SIMPLE=${TOOLROOT}/usr/share/misc/bison.simple \
 		COMPILER_PATH=${TOOLROOT}/usr/libexec:${TOOLROOT}/usr/bin \
 		GCC_EXEC_PREFIX=${WORLDTMP}${SHLIBDIR}:${WORLDTMP}/usr/lib/ \
+		GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \
+		GROFF_TMAC_PATH=${WORLDTMP}/usr/share/tmac \
 		LD_LIBRARY_PATH=${TOOLROOT}${SHLIBDIR} \
 		LIBRARY_PATH=${WORLDTMP}${SHLIBDIR}:${WORLDTMP}/usr/lib

 BMAKEENV=	PATH=${TMPPATH} ${COMPILER_ENV} NOEXTRADEPEND=t \
 		OBJFORMAT_PATH=${TOOLROOT}/usr/libexec:/usr/libexec
 XMAKEENV=	PATH=${STRICTTMPPATH} ${COMPILER_ENV} \
-		PERL5LIB=${DESTDIR}/usr/libdata/perl/5.00502 \
+		PERL5LIB=${DESTDIR}/usr/libdata/perl/5.00503 \
 		OBJFORMAT_PATH=${TOOLROOT}/usr/libexec \
 		CFLAGS="-nostdinc ${CFLAGS}"	# XXX -nostdlib

@@ -226,7 +228,7 @@ buildworld: check-objformat
 	@echo ">>> Cleaning up the temporary ${OBJFORMAT} build tree"
 	@echo "--------------------------------------------------------------"
 	mkdir -p ${WORLDTMP}
-	chflags -R noschg ${WORLDTMP}/
+	-chflags -R noschg ${WORLDTMP}/
 	rm -rf ${WORLDTMP}
 .endif
 .if !defined(NOTOOLS)
@@ -363,13 +365,15 @@ reinstall:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Re-scanning the shared libraries.."
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; /sbin/ldconfig -R
+	-cd ${.CURDIR}; /sbin/ldconfig -R
 .endif
+.if !defined(NOMAN)
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo ">>> Rebuilding man page indexes"
+	@echo ">>> Rebuilding man page indices"
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}/share/man; ${MAKE} makedb
+.endif

 #
 # update
@@ -394,7 +398,7 @@ update:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Updating /usr/src from cvs repository" ${CVSROOT}
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; cvs -q update -P -d
+	cd ${.CURDIR}; cvs -q update -rRELENG_3 -P -d
 .endif

 #
@@ -550,10 +554,11 @@ includes:
 	cd ${.CURDIR}/lib/libftpio;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmd;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmytinfo;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libncurses;		${MAKE} beforeinstall
 .if !defined(WANT_CSRG_LIBM)
 	cd ${.CURDIR}/lib/msun;			${MAKE} beforeinstall
 .endif
+	cd ${.CURDIR}/lib/libncurses;		${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libnetgraph;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libopie;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libpam/libpam;	${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libpcap;		${MAKE} beforeinstall
@@ -567,6 +572,7 @@ includes:
 	cd ${.CURDIR}/lib/libss;		${MAKE} -B hdrs beforeinstall
 	cd ${.CURDIR}/lib/libutil;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libvgl;		${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libwrap;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libz;			${MAKE} beforeinstall
 	cd ${.CURDIR}/usr.bin/f2c;		${MAKE} beforeinstall
 	cd ${.CURDIR}/usr.bin/lex;		${MAKE} beforeinstall
@@ -1,10 +1,15 @@
 #
-#	$Id: Makefile.upgrade,v 1.8 1999/01/07 06:30:14 peter Exp $
+# $FreeBSD$
 #
 # This makefile contains rules for preforming upgrades that are outside
 # the scope of the normal build world process.
 #

+#
+# Make sure the PATH is set correctly
+#
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
 #
 # Build things relative to the user's preferred object directory,
 # defaulting to /usr/obj if not defined.
@@ -39,15 +44,23 @@ make	:
 # with them (in case the installed kernel is an older version), then 
 # install the elf world.
 #
-aout-to-elf aout-to-elf-install :				\
+aout-to-elf aout-to-elf-install :	/var/db/update.cfg	\
 		${MAKEOBJDIRPREFIX}/do_aout_buildworld		\
 		${MAKEOBJDIRPREFIX}/do_elf_buildworld		\
 		${MAKEOBJDIRPREFIX}/do_move_aout_libs		\
 		${MAKEOBJDIRPREFIX}/do_aout_installworld	\
-		${MAKEOBJDIRPREFIX}/do_aout_kernel		\
 		${MAKEOBJDIRPREFIX}/do_elf_installworld		\
+		${MAKEOBJDIRPREFIX}/do_elf_kernel		\
 		${MAKEOBJDIRPREFIX}/do_set_objformat		\
-		${MAKEOBJDIRPREFIX}/do_install_kernel_reboot
+		${MAKEOBJDIRPREFIX}/do_reboot
+
+# front-load all the information we're going to need.
+/var/db/update.cfg:
+	@if [ -f ${.CURDIR}/tools/tools/upgrade/doupgrade.sh ]; then \
+	    env MACHINE=${MACHINE} CURDIR=${.CURDIR} sh ${.CURDIR}/tools/tools/upgrade/doupgrade.sh 1 /var/db/update.cfg; \
+	else \
+	    echo "Your source tree must not be fully populated; unable to find upgrade script"; echo "in ${.CURDIR}/tools/tools/upgrade/doupgrade.sh."; exit 1; \
+	fi

 #
 # Just do the build parts of the transition build.
@@ -68,7 +81,7 @@ ${MAKEOBJDIRPREFIX}/do_aout_buildworld :
 	@echo "--------------------------------------------------------------"
 	@cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/aout \
 		OBJFORMAT=aout REALLY_WANT_DEPRECIATED_AOUT=yes \
-		make -f Makefile.inc1 -m ${.CURDIR}/share/mk buildworld
+		${MAKE} -f Makefile.inc1 -m ${.CURDIR}/share/mk buildworld
 	@touch ${MAKEOBJDIRPREFIX}/do_aout_buildworld

 #
@@ -88,7 +101,8 @@ ${MAKEOBJDIRPREFIX}/do_elf_buildworld :
 	@cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/elf \
 		PATH=${AOUTTMPPATH} OBJFORMAT=elf NOTOOLS=1 \
 		TOOLROOT=${MAKEOBJDIRPREFIX}/aout${.CURDIR}/tmp \
-		make -f Makefile.inc1 -m ${.CURDIR}/share/mk buildworld
+		X11BASE=/nonexistent \
+		${MAKE} -f Makefile.inc1 -m ${.CURDIR}/share/mk buildworld
 	@touch ${MAKEOBJDIRPREFIX}/do_elf_buildworld

 #
@@ -157,15 +171,6 @@ ${MAKEOBJDIRPREFIX}/do_move_aout_libs move-aout-libs :
 # elf world will be updated.
 #
 ${MAKEOBJDIRPREFIX}/do_aout_installworld :
-.if !defined(NOCONFIRM)
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " You are about to update the installed system (or the system"
-	@echo " that your DESTDIR points to). You can type Ctrl-C to abort"
-	@echo " now or press return to start the first phase of the update."
-	@echo "--------------------------------------------------------------"
-	@/bin/sh -c "read -p \"Return to continue or Ctrl-C to abort: \" _e"
-.endif
 .if	${INSTALLEDVERSION} < 300003
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -174,51 +179,18 @@ ${MAKEOBJDIRPREFIX}/do_aout_installworld :
 	@cp /bin/sh ${MAKEOBJDIRPREFIX}
 	@cp /sbin/reboot ${MAKEOBJDIRPREFIX}
 .endif
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Doing an aout installworld using the aout tools in the aout"
-	@echo " obj tree."
-	@echo "--------------------------------------------------------------"
-	@cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/aout \
-		PATH=${AOUTTMPPATH} OBJFORMAT=aout NOTOOLS=1 \
-		TOOLROOT=${MAKEOBJDIRPREFIX}/aout${.CURDIR}/tmp \
-		make -f Makefile.inc1 -m ${.CURDIR}/share/mk installworld
 	@touch ${MAKEOBJDIRPREFIX}/do_aout_installworld

 #
-# The installed kernel may not match the world that is installed, so build
-# a generic kernel, but don't install it. The user can decide if the kernel
-# needs to be installed. Perhaps we should install it in the root
-# directory as an obscure name just in case a reboot is required?
+# Build and install a new kernel, as well as the boot blocks necessary to
+# boot it.
 #
-${MAKEOBJDIRPREFIX}/do_aout_kernel :
-.if	${INSTALLEDVERSION} >= 300003
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " You are already running 3.0, so a kernel build"
-	@echo " is probably not required."
-	@echo "--------------------------------------------------------------"
-.else
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Building a generic kernel using the new aout tools"
-	@echo "--------------------------------------------------------------"
-.if	exists(${.CURDIR}/sys/compile/GENERICupgrade)
-	@rm -rf ${.CURDIR}/sys/compile/GENERICupgrade
-.endif
-.if	!exists(${.CURDIR}/sys/${MACHINE}/conf/GENERICupgrade)
-	-cp ${.CURDIR}/sys/${MACHINE}/conf/GENERIC \
-		${.CURDIR}/sys/${MACHINE}/conf/GENERICupgrade
-.endif
-	@cd ${.CURDIR}/sys/${MACHINE}/conf; config GENERICupgrade
-	@-cd ${.CURDIR}/sys/compile/GENERICupgrade; \
-		OBJFORMAT=aout make KERNFORMAT=aout depend && \
-		OBJFORMAT=aout make KERNFORMAT=aout all
-	@cd ${.CURDIR}/sys/compile/GENERICupgrade; \
-		OBJFORMAT=aout make KERNFORMAT=aout depend && \
-		OBJFORMAT=aout make KERNFORMAT=aout all
-.endif
-	@touch ${MAKEOBJDIRPREFIX}/do_aout_kernel
+${MAKEOBJDIRPREFIX}/do_elf_kernel :
+	@if [ -f /var/db/update.cfg -a -f ${.CURDIR}/tools/tools/upgrade/doupgrade.sh ]; then \
+	     env MACHINE=${MACHINE} CURDIR=${.CURDIR} sh ${.CURDIR}/tools/tools/upgrade/doupgrade.sh 2 /var/db/update.cfg; \
+	fi
+	@touch ${MAKEOBJDIRPREFIX}/do_elf_kernel
+	@rm -f /var/db/update.cfg

 #
 # Install the elf world overwriting just about all the previously installed
@@ -245,7 +217,10 @@ ${MAKEOBJDIRPREFIX}/do_elf_installworld :
 	@cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/elf \
 		PATH=${AOUTTMPPATH} OBJFORMAT=elf NOTOOLS=1 \
 		TOOLROOT=${MAKEOBJDIRPREFIX}/aout${.CURDIR}/tmp \
-		make -f Makefile.inc1 -m ${.CURDIR}/share/mk installworld
+		${MAKE} -f Makefile.inc1 -m ${.CURDIR}/share/mk installworld
+	@if [ ! -f /etc/pam.conf ]; then cp ${.CURDIR}/etc/pam.conf /etc; fi
+	@if [ ! -f /etc/auth.conf ]; then cp ${.CURDIR}/etc/auth.conf /etc; fi
+	@if [ ! -f /etc/login.conf ]; then cp ${.CURDIR}/etc/login.conf /etc; fi
 	@touch ${MAKEOBJDIRPREFIX}/do_elf_installworld

 #
@@ -261,42 +236,20 @@ ${MAKEOBJDIRPREFIX}/do_set_objformat	:
 	@touch ${MAKEOBJDIRPREFIX}/do_set_objformat

 #
-# If not already running a current kernel, install the GENERICupgrade kernel
-# and reboot.
-#
-${MAKEOBJDIRPREFIX}/do_install_kernel_reboot	:
-.if	${INSTALLEDVERSION} >= 300003
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Your system has been updated to run elf by default!"
-	@echo
-	@echo " You should reboot your system now."
-	@echo "--------------------------------------------------------------"
-	@touch ${MAKEOBJDIRPREFIX}/do_install_kernel_reboot
-.else
+# Time to reboot!
+${MAKEOBJDIRPREFIX}/do_reboot	:
 .if !defined(NOCONFIRM)
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo " Your system has been updated to run elf by default!"
+	@echo " Your system has now been fully updated to elf!"
 	@echo
-	@echo " Since you are running ${INSTALLEDNAME}, the kernel must"
-	@echo " be installed before the system is rebooted. You can type"
-	@echo " Ctrl-C to abort the kernel installation (at your own risk),"
-	@echo " or press return for the kernel to be installed and the"
-	@echo " system rebooted."
+	@echo " It's now time to reboot from your new ELF kernel."
+	@echo " You can type Ctrl-C to abort this (at your own risk)"
+	@echo " or press return to reboot the system."
 	@echo "--------------------------------------------------------------"
 	@${MAKEOBJDIRPREFIX}/sh -c "read -p \"Return to continue or Ctrl-C to abort: \" _e"
 .endif
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Installing a new GENERICupgrade kernel"
-	@echo "--------------------------------------------------------------"
-	@cd ${.CURDIR}/sys/compile/GENERICupgrade; make install
-	@echo
-	@echo "--------------------------------------------------------------"
 	@echo " Rebooting......."
 	@echo "--------------------------------------------------------------"
-	@touch ${MAKEOBJDIRPREFIX}/do_install_kernel_reboot
+	@touch ${MAKEOBJDIRPREFIX}/do_reboot
 	@-${MAKEOBJDIRPREFIX}/reboot
-.endif
-
@@ -1,5 +1,6 @@
 This is the top level of the FreeBSD source directory.  This file
-was last revised on: $Id: README,v 1.13 1998/09/13 09:38:34 markm Exp $
+was last revised on:
+$FreeBSD$

 For copyright information, please see the file COPYRIGHT in this
 directory (additional copyright information also exists for some
@@ -34,7 +35,7 @@ bin		System/User commands.

 contrib		Packages contributed by 3rd parties.

-crypto		Export controlled stuff (see crypto/README).
+crypto		Cryptography stuff (see crypto/README).

 etc		Template files for /etc

@@ -1,88 +1,6 @@
-Updating Information for FreeBSD current users
+Updating Information for FreeBSD Stable users

-This file is maintainted by [email protected].  Please send new entries
-in it to him.  It contains a list, in reverse chronologocal order, of
-major breakages in tracking -current.  Not all things will be listed
-here, and it only starts on Novemeber 18, 1998.  If you have an
-earlier version of FreeBSD, you are on your own to get to November 18,
-1998.
+When updating to 4.x-stable from 3.x-stable, please read src/UPDATING
+after updating to the new sources for important information.

-19990119:
-	More work on the syscons driver has been committed.  Since
-	files moved around, you will need to reconfigure your kernel,
-	and make clean; make depend before rebuilding the kernel.  No
-	config file changes are needed.
-
-19990111:
-	New keyboard and video card drivers are introduced as the first
-	stage of console driver reorganization.  You are required to
-	update the kernel configuration file and rebuild the kernel.
-	kbdcontrol, vidcontrol, and screen savers also need recompilation.
-	The instruction can be found in
-
-		http://www.freebsd.org/~yokota/sc_update.txt
-
-	It has notes on splash screen too.
-
-19990106:
-	Robert Nordier was kind enough to make this page to enable people to
-	install the new bootblocks:
-
-		http://www.freebsd.org/~rnordier/boot.txt
-
-	When updating to ELF, make sure that you have updated your
-	/etc/rc files which have different ldconfig invocations for
-	elf and aout.  Otherwise things like X will stop working with
-	messages about being unable to find library files.  The
-	mergemaster utility in ports/sysutils/mergemaster helps to
-	keep critical files like this in sync, and its use is
-	recommended.
-
-19990104:
-	Information about ELF day (see 19981230) can be found in
-
-		http://www.freebsd.org/~peter/elfday.html
-
-	about the upcoming change, its motivations and instructions
-	for doing the upgrade.
-
-19981230:
-	You should install new bootblocks now.  The ELF kernel will
-	become default soon.  In addition, you'll need to upgrade
-	your userland programs to ELF before then as well.  Use
-	make aout-to-elf to upgrade your userland programs (old
-	a.out programs in, for example, /usr/local/bin will
-	continue to work, even after the upgrade).  See src/Makefile
-	for more details.
-
-19981224:
-	The old wcd driver has been deleted from the kernel.  The
-	driver that replaces it is named acd.  You'll need to change
-	this in your configuration files.
-
-	Failure to do this will result in "ATAPI CD-ROMs not
-	configured" at boot time.
-
-	The floppy tape driver (ft) has been removed from the kernel,
-	with no replacement driver.
-
-19981202:
-	New groups from 19981201 commented out of mtree, so they
-	aren't strictly needed, but still a good idea to have.
-
-19981201:
-	New user/group added: bind.  From src/etc/master.passwd and
-	src/etc/group:
-		% grep <newstuff> /usr/src/etc/group 
-		bind:*:53:
-		% grep <newstuff> /usr/src/etc/master.passwd 
-		tty:*:4:65533::0:0:Tty Sandbox:/:/sbin/nologin
-		kmem:*:5:65533::0:0:KMem Sandbox:/:/sbin/nologin
-		bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin
-
-19981118:
-	PAM integrated into the tree.   Requires new /etc/pam.conf file
-	to silence warnings from authentication programs (login, etc).
-	See src/etc/pam.conf for a sample.
-
-$Id: UPDATING,v 1.13 1999/01/17 17:39:32 imp Exp $
+$FreeBSD$
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.13 1998/08/15 12:27:23 jb Exp $
+# $FreeBSD$

 SUBDIR= cat \
 	chio \
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile.inc,v 1.9 1997/02/22 14:01:23 peter Exp $
+# $FreeBSD$

 BINDIR?=	/bin
 CFLAGS+=	-Wall -Wformat
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$

 PROG=	cat

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\"	$Id: cat.1,v 1.7 1998/05/06 06:49:13 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1995
 .Dt CAT 1
@@ -91,7 +91,7 @@ characters (with the high bit set) are printed as
 .Ql M-
 (for meta) followed by the character for the low 7 bits.
 .El
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-	"$Id: cat.c,v 1.12 1998/09/11 05:48:06 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1997/09/12 15:00:06 jkh Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93

 CFLAGS+=-I${.CURDIR}/../../sys
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: chio.1,v 1.7 1998/09/15 07:48:51 gibbs Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 14, 1998
 .Dt CHIO 1
@@ -135,7 +135,7 @@ respectively.
 .Pp
 Note that not all medium changers support the
 .Ic exchange
-operation; The changer must have multiple free pickers or emulate
+operation; the changer must have multiple free pickers or emulate
 multiple free pickers with transient storage.
 .It Xo Nm position
 .Ar <to ET> <to EU>
@@ -34,11 +34,12 @@
 * Additional Copyright (c) 1997, by Matthew Jacob, for NASA/Ames Research Ctr.
 */

-#include <sys/cdefs.h>
 #ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1996 Jason R. Thorpe.  All rights reserved.");
-__RCSID("$NetBSD: chio.c,v 1.6 1998/01/04 23:53:58 thorpej Exp $");
-#endif
+static const char copyright[] =
+	"@(#) Copyright (c) 1996 Jason R. Thorpe.  All rights reserved.";
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */

 #include <sys/param.h>
 #include <sys/chio.h> 
@@ -55,45 +56,44 @@ __RCSID("$NetBSD: chio.c,v 1.6 1998/01/04 23:53:58 thorpej Exp $");
 extern	char *__progname;	/* from crt0.o */
 extern int optreset;		/* from getopt.o */

-int	main(int, char *[]);
-static	void usage(void);
-static	void cleanup(void);
-static	int parse_element_type(char *);
-static	int parse_element_unit(char *);
-static	const char * element_type_name(int et);
-static	int parse_special(char *);
-static	int is_special(char *);
-static	char *bits_to_string(int, const char *);
+static	void usage __P((void));
+static	void cleanup __P((void));
+static	int parse_element_type __P((char *));
+static	int parse_element_unit __P((char *));
+static	const char * element_type_name __P((int et));
+static	int parse_special __P((char *));
+static	int is_special __P((char *));
+static	const char *bits_to_string __P((int, const char *));

-static	int do_move(char *, int, char **);
-static	int do_exchange(char *, int, char **);
-static	int do_position(char *, int, char **);
-static	int do_params(char *, int, char **);
-static	int do_getpicker(char *, int, char **);
-static	int do_setpicker(char *, int, char **);
-static	int do_status(char *, int, char **);
-static	int do_ielem(char *, int, char **);
-static	int do_voltag(char *, int, char **);
+static	int do_move __P((char *, int, char **));
+static	int do_exchange __P((char *, int, char **));
+static	int do_position __P((char *, int, char **));
+static	int do_params __P((char *, int, char **));
+static	int do_getpicker __P((char *, int, char **));
+static	int do_setpicker __P((char *, int, char **));
+static	int do_status __P((char *, int, char **));
+static	int do_ielem __P((char *, int, char **));
+static	int do_voltag __P((char *, int, char **));

 /* Valid changer element types. */
 const struct element_type elements[] = {
-	{ "picker",		CHET_MT },
-	{ "slot",		CHET_ST },
-	{ "portal",		CHET_IE },
 	{ "drive",		CHET_DT },
+	{ "picker",		CHET_MT },
+	{ "portal",		CHET_IE },
+	{ "slot",		CHET_ST },
 	{ NULL,			0 },
 };

 /* Valid commands. */
 const struct changer_command commands[] = {
-	{ "move",		do_move },
 	{ "exchange",		do_exchange },
-	{ "position",		do_position },
-	{ "params",		do_params },
 	{ "getpicker",		do_getpicker },
+	{ "ielem", 		do_ielem },
+	{ "move",		do_move },
+	{ "params",		do_params },
+	{ "position",		do_position },
 	{ "setpicker",		do_setpicker },
 	{ "status",		do_status },
-	{ "ielem", 		do_ielem },
 	{ "voltag",		do_voltag },
 	{ NULL,			0 },
 };
@@ -107,10 +107,12 @@ const struct special_word specials[] = {
 };

 static	int changer_fd;
-static	char *changer_name;
+static	const char *changer_name;

 int
-main(int argc, char *argv[])
+main(argc, argv)
+	int argc;
+	char **argv;
 {
 	int ch, i;

@@ -147,15 +149,26 @@ main(int argc, char *argv[])
 	for (i = 0; commands[i].cc_name != NULL; ++i)
 		if (strcmp(*argv, commands[i].cc_name) == 0)
 			break;
+	if (commands[i].cc_name == NULL) {
+		/* look for abbreviation */
+		for (i = 0; commands[i].cc_name != NULL; ++i)
+			if (strncmp(*argv, commands[i].cc_name,
+			    strlen(*argv)) == 0)
+				break;
+	}
+
 	if (commands[i].cc_name == NULL)
 		errx(1, "unknown command: %s", *argv);

-	exit((*commands[i].cc_handler)(commands[i].cc_name, argc, argv));
+	exit ((*commands[i].cc_handler)(commands[i].cc_name, argc, argv));
 	/* NOTREACHED */
 }

 static int
-do_move(char *cname, int argc, char **argv)
+do_move(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
 {
 	struct changer_move cmd;
 	int val;
@@ -223,7 +236,10 @@ do_move(char *cname, int argc, char **argv)
 }

 static int
-do_exchange(char *cname, int argc, char **argv)
+do_exchange(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
 {
 	struct changer_exchange cmd;
 	int val;
@@ -318,7 +334,10 @@ do_exchange(char *cname, int argc, char **argv)
 }

 static int
-do_position(char *cname, int argc, char **argv)
+do_position(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
 {
 	struct changer_position cmd;
 	int val;
@@ -379,7 +398,10 @@ do_position(char *cname, int argc, char **argv)

 /* ARGSUSED */
 static int
-do_params(char *cname, int argc, char **argv)
+do_params(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
 {
 	struct changer_params data;
 	int picker;
@@ -422,7 +444,10 @@ do_params(char *cname, int argc, char **argv)

 /* ARGSUSED */
 static int
-do_getpicker(char *cname, int argc, char **argv)
+do_getpicker(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
 {
 	int picker;

@@ -449,7 +474,10 @@ do_getpicker(char *cname, int argc, char **argv)
 }

 static int
-do_setpicker(char *cname, int argc, char **argv)
+do_setpicker(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
 {
 	int picker;

@@ -477,7 +505,10 @@ do_setpicker(char *cname, int argc, char **argv)
 }

 static int
-do_status(char *cname, int argc, char **argv)
+do_status(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
 {
 	struct changer_params cp;
 	struct changer_element_status_request cesr;
@@ -496,7 +527,7 @@ do_status(char *cname, int argc, char **argv)
 	description = NULL;

 	optind = optreset = 1;
-	while ((c = getopt(argc, argv, "vVsSbaI")) != EOF) {
+	while ((c = getopt(argc, argv, "vVsSbaI")) != -1) {
 		switch (c) {
 		case 'v':
 			pvoltag = 1;
@@ -656,7 +687,7 @@ do_status(char *cname, int argc, char **argv)
 				printf(" avoltag: <%s:%d>", 
 				       ces->ces_avoltag.cv_volid,
 				       ces->ces_avoltag.cv_serial);
-			if (source)
+			if (source) {
 				if (ces->ces_flags & CES_SOURCE_VALID)
 					printf(" source: <%s %d>", 
 					       element_type_name(
@@ -664,6 +695,7 @@ do_status(char *cname, int argc, char **argv)
 					       ces->ces_source_addr);
 				else
 					printf(" source: <>");
+			}
 			if (intaddr)
 				printf(" intaddr: <%d>", ces->ces_int_addr);
 			if (scsi) {
@@ -695,7 +727,10 @@ do_status(char *cname, int argc, char **argv)
 }

 static int
-do_ielem(char *cname, int argc, char **argv)
+do_ielem(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
 {
 	int timeout = 0;

@@ -718,7 +753,10 @@ do_ielem(char *cname, int argc, char **argv)
 }

 static int
-do_voltag(char *cname, int argc, char **argv)
+do_voltag(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
 {
 	int force = 0;
 	int clear = 0;
@@ -729,7 +767,7 @@ do_voltag(char *cname, int argc, char **argv)
 	bzero(&csvr, sizeof(csvr));

 	optind = optreset = 1;
-	while ((c = getopt(argc, argv, "fca")) != EOF) {
+	while ((c = getopt(argc, argv, "fca")) != -1) {
 		switch (c) {
 		case 'f':
 			force = 1;
@@ -803,7 +841,8 @@ do_voltag(char *cname, int argc, char **argv)
 }

 static int
-parse_element_type(char *cp)
+parse_element_type(cp)
+	char *cp;
 {
 	int i;

@@ -816,7 +855,8 @@ parse_element_type(char *cp)
 }

 static const char *
-element_type_name(int et)
+element_type_name(et)
+	int et;
 {
 	int i;

@@ -828,7 +868,8 @@ element_type_name(int et)
 }

 static int
-parse_element_unit(char *cp)
+parse_element_unit(cp)
+	char *cp;
 {
 	int i;
 	char *p;
@@ -841,7 +882,8 @@ parse_element_unit(char *cp)
 }

 static int
-parse_special(char *cp)
+parse_special(cp)
+	char *cp;
 {
 	int val;

@@ -854,7 +896,8 @@ parse_special(char *cp)
 }

 static int
-is_special(char *cp)
+is_special(cp)
+	char *cp;
 {
 	int i;

@@ -865,8 +908,10 @@ is_special(char *cp)
 	return (0);
 }

-static char *
-bits_to_string(int v, const char *cp)
+static const char *
+bits_to_string(v, cp)
+	int v;
+	const char *cp;
 {
 	const char *np;
 	char f, sep, *bp;
@@ -880,7 +925,9 @@ bits_to_string(int v, const char *cp)
 			np++;
 		if ((v & (1 << (f - 1))) == 0)
 			continue;
-		bp += sprintf(bp, "%c%.*s", sep, (int)(long)(np - cp), cp);
+		(void) snprintf(bp, sizeof(buf) - (bp - &buf[0]),
+			"%c%.*s", sep, (int)(long)(np - cp), cp);
+		bp += strlen(bp);
 		sep = ',';
 	}
 	if (sep != '<')
@@ -899,11 +946,7 @@ cleanup()
 static void
 usage()
 {
-
-	(void) fprintf(stderr, "usage: %s command arg1 arg2 ...\n", __progname);
-	(void) fprintf(stderr, "Examples:\n");
-	(void) fprintf(stderr, "\tchio -f /dev/ch0 move slot 1 drive 0\n");
-	(void) fprintf(stderr, "\tchio ielem\n");
-	(void) fprintf(stderr, "\tchio -f /dev/ch1 status\n");
+	(void) fprintf(stderr, "usage: %s [-f changer] command [-<flags>] "
+		"arg1 arg2 [arg3 [...]]\n", __progname);
 	exit(1);
 }
@@ -1,4 +1,4 @@
-/*	$Id: $	*/
+/* $FreeBSD$	*/

 /*
 * Copyright (c) 1996 Jason R. Thorpe <[email protected]>
@@ -1,4 +1,4 @@
-/*	$Id: $	*/
+/* $FreeBSD$	*/

 /*
 * Copyright (c) 1996 Jason R. Thorpe <[email protected]>
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$

 PROG=	chmod

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"	$Id: chmod.1,v 1.9 1998/05/06 06:50:06 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
@@ -44,8 +44,10 @@
 .Sh SYNOPSIS
 .Nm chmod
 .Oo
+.Fl f
 .Fl R
 .Op Fl H | Fl L | Fl P
+.Fl v
 .Oc
 .Ar mode
 .Ar file ...
@@ -63,7 +65,8 @@ The options are as follows:
 If the
 .Fl R
 option is specified, symbolic links on the command line are followed.
-(Symbolic links encountered in the tree traversal are not followed.)
+(Symbolic links encountered in the tree traversal are not followed by
+default.)
 .It Fl L
 If the
 .Fl R
@@ -75,6 +78,15 @@ option is specified, no symbolic links are followed.
 .It Fl R
 Change the modes of the file hierarchies rooted in the files
 instead of just the files themselves.
+.It Fl f
+Do not display a diagnostic message if
+.Nm
+could not modify the mode for
+.Va file .
+.It Fl v
+Cause
+.Nm
+to be verbose, showing files as the mode is modified.
 .El
 .Pp
 Symbolic links do not have modes, so unless the
@@ -97,7 +109,7 @@ command's actions are determined by the last one specified.
 .Pp
 Only the owner of a file or the super-user is permitted to change
 the mode of a file.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
@@ -118,7 +130,7 @@ system supports this feature: see
 and the 
 .Ar suiddir
 option to
-.Xr mount 1 .
+.Xr mount 8 .
 .It Li 2000
 (the set-group-ID-on-execution bit)  Executable files with this bit set 
 will run with effective gid set to the gid of the file owner.  
@@ -160,9 +172,8 @@ others, and no set-uid or set-gid behaviour is 755
 The symbolic mode is described by the following grammar:
 .Bd -literal -offset indent
 mode         ::= clause [, clause ...]
-clause       ::= [who ...] [action ...] last_action
+clause       ::= [who ...] [action ...] action
 action       ::= op [perm ...]
-last_action  ::= op [perm ...]
 who          ::= a | u | g | o
 op           ::= + | \- | =
 perm         ::= r | s | t | w | x | X | u | g | o
@@ -301,10 +312,13 @@ set the group bits equal to the user bits, but clear the group write bit.
 There's no
 .Ar perm
 option for the naughty bits.
+.Sh COMPATIBILITY
+The
+.Fl v
+option is non-standard and its use in scripts is not recommended.
 .Sh SEE ALSO
 .Xr chflags 1 ,
 .Xr install 1 ,
-.Xr mount 1 ,
 .Xr chmod 2 ,
 .Xr stat 2 ,
 .Xr umask 2 ,
@@ -312,6 +326,7 @@ option for the naughty bits.
 .Xr setmode 3 ,
 .Xr symlink 7 ,
 .Xr chown 8 ,
+.Xr mount 8 ,
 .Xr sticky 8
 .Sh STANDARDS
 The
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: chmod.c,v 1.11 1998/05/13 07:22:11 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/types.h>
@@ -70,12 +70,13 @@ main(argc, argv)
 	long val;
 	int oct, omode;
 	int Hflag, Lflag, Pflag, Rflag, ch, fflag, fts_options, hflag, rval;
+	int vflag;
 	char *ep, *mode;

 	set = NULL;
 	omode = 0;
-	Hflag = Lflag = Pflag = Rflag = fflag = hflag = 0;
-	while ((ch = getopt(argc, argv, "HLPRXfgorstuwx")) != -1)
+	Hflag = Lflag = Pflag = Rflag = fflag = hflag = vflag = 0;
+	while ((ch = getopt(argc, argv, "HLPRXfgorstuvwx")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
@@ -92,7 +93,7 @@ main(argc, argv)
 		case 'R':
 			Rflag = 1;
 			break;
-		case 'f':		/* XXX: undocumented. */
+		case 'f':
 			fflag = 1;
 			break;
 		case 'h':
@@ -118,6 +119,9 @@ main(argc, argv)
 			    argv[optind - 1][2] == '\0')
 				--optind;
 			goto done;
+		case 'v':
+			vflag = 1;
+			break;
 		case '?':
 		default:
 			usage();
@@ -191,6 +195,9 @@ done:	argv += optind;
 		    getmode(set, p->fts_statp->st_mode)) && !fflag) {
 			warn(p->fts_path);
 			rval = 1;
+		} else {
+		    	if (vflag)
+				(void)printf("%s\n", p->fts_accpath);
 		}
 	}
 	if (errno)
@@ -203,6 +210,6 @@ void
 usage()
 {
 	(void)fprintf(stderr,
-	    "usage: chmod [-R [-H | -L | -P]] mode file ...\n");
+	    "usage: chmod [-fv] [-R [-H | -L | -P]] mode file ...\n");
 	exit(1);
 }
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.4 1997/02/22 14:01:32 peter Exp $
+# $FreeBSD$

 PROG=	cp
 SRCS=	cp.c utils.c
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: cp.1,v 1.10 1998/05/06 06:50:19 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt CP 1
@@ -48,7 +48,7 @@
 .Op Fl H | Fl L | Fl P
 .Oc
 .Op Fl f | i
-.Op Fl p
+.Op Fl pv
 .Ar source_file target_file
 .Nm cp
 .Oo
@@ -56,7 +56,7 @@
 .Op Fl H | Fl L | Fl P
 .Oc
 .Op Fl f | i
-.Op Fl p
+.Op Fl pv
 .Ar source_file ... target_directory
 .Sh DESCRIPTION
 In the first synopsis form, the
@@ -145,6 +145,10 @@ If the source file has both its set user ID and set group ID bits on,
 and either the user ID or group ID cannot be preserved, neither
 the set user ID nor set group ID bits are preserved in the copy's
 permissions.
+.It Fl v
+Cause
+.Nm
+to be verbose, showing files as they are copied.
 .El
 .Pp
 For each destination file that already exists, its contents are
@@ -197,9 +201,10 @@ options are ignored unless the
 option is specified.
 In addition, these options override each other and the
 command's actions are determined by the last one specified.
-.Pp
-.Nm Cp
-exits 0 on success, >0 if an error occurred.
+.Sh DIAGNOSTICS
+The
+.Nm
+utility exits 0 on success, and >0 if an error occurs.
 .Sh COMPATIBILITY
 Historic versions of the
 .Nm
@@ -209,6 +214,10 @@ option.
 This implementation supports that option, however, its use is strongly
 discouraged, as it does not correctly copy special files, symbolic links
 or fifo's.
+.Pp
+The
+.Fl v
+option is non-standard and its use in scripts is not recommended.
 .Sh SEE ALSO
 .Xr mv 1 ,
 .Xr rcp 1 ,
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: cp.c,v 1.16 1998/05/13 07:25:14 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 /*
@@ -69,6 +69,7 @@ static const char rcsid[] =
 #include <err.h>
 #include <errno.h>
 #include <fts.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>

@@ -79,10 +80,10 @@ static const char rcsid[] =
                *--(p).p_end = 0;					\
 }

-PATH_T to = { to.p_path, "" };
+PATH_T to = { to.p_path, "", "" };

 uid_t myuid;
-int Rflag, iflag, pflag, rflag, fflag;
+int Rflag, iflag, pflag, rflag, fflag, vflag;
 int myumask;

 enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE };
@@ -101,7 +102,7 @@ main(argc, argv)
 	char *target;

 	Hflag = Lflag = Pflag = 0;
-	while ((ch = getopt(argc, argv, "HLPRfipr")) != -1)
+	while ((ch = getopt(argc, argv, "HLPRfiprv")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
@@ -132,6 +133,9 @@ main(argc, argv)
 		case 'r':
 			rflag = 1;
 			break;
+		case 'v':
+			vflag = 1;
+			break;
 		default:
 			usage();
 			break;
@@ -249,23 +253,23 @@ copy(argv, type, fts_options)
 	struct stat to_stat;
 	FTS *ftsp;
 	FTSENT *curr;
-	int base = 0, dne, nlen, rval;
+	int base = 0, dne, badcp, nlen, rval;
 	char *p, *target_mid;

 	if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL)
 		err(1, NULL);
-	for (rval = 0; (curr = fts_read(ftsp)) != NULL;) {
+	for (badcp = rval = 0; (curr = fts_read(ftsp)) != NULL; badcp = 0) {
 		switch (curr->fts_info) {
 		case FTS_NS:
 		case FTS_DNR:
 		case FTS_ERR:
 			warnx("%s: %s",
 			    curr->fts_path, strerror(curr->fts_errno));
-			rval = 1;
+			badcp = rval = 1;
 			continue;
 		case FTS_DC:			/* Warn, continue. */
 			warnx("%s: directory causes a cycle", curr->fts_path);
-			rval = 1;
+			badcp = rval = 1;
 			continue;
 		case FTS_DP:			/* Ignore, continue. */
 			continue;
@@ -286,7 +290,7 @@ copy(argv, type, fts_options)
 			 * is the case where the target exists.
 			 *
 			 * Also, check for "..".  This is for correct path
-			 * concatentation for paths ending in "..", e.g.
+			 * concatenation for paths ending in "..", e.g.
 			 *	cp -R .. /tmp
 			 * Paths ending in ".." are changed to ".".  This is
 			 * tricky, but seems the easiest way to fix the problem.
@@ -295,7 +299,7 @@ copy(argv, type, fts_options)
 			 * Since the first level MUST be FTS_ROOTLEVEL, base
 			 * is always initialized.
 			 */
-			if (curr->fts_level == FTS_ROOTLEVEL)
+			if (curr->fts_level == FTS_ROOTLEVEL) {
 				if (type != DIR_TO_DNE) {
 					p = strrchr(curr->fts_path, '/');
 					base = (p == NULL) ? 0 :
@@ -306,6 +310,7 @@ copy(argv, type, fts_options)
 						base += 1;
 				} else
 					base = curr->fts_pathlen;
+			}

 			p = &curr->fts_path[base];
 			nlen = curr->fts_pathlen - base;
@@ -316,7 +321,7 @@ copy(argv, type, fts_options)
 			if (target_mid - to.p_path + nlen > MAXPATHLEN) {
 				warnx("%s%s: name too long (not copied)",
 				    to.p_path, p);
-				rval = 1;
+				badcp = rval = 1;
 				continue;
 			}
 			(void)strncat(target_mid, p, nlen);
@@ -333,7 +338,7 @@ copy(argv, type, fts_options)
 			    to_stat.st_ino == curr->fts_statp->st_ino) {
 				warnx("%s and %s are identical (not copied).",
 				    to.p_path, curr->fts_path);
-				rval = 1;
+				badcp = rval = 1;
 				if (S_ISDIR(curr->fts_statp->st_mode))
 					(void)fts_set(ftsp, curr, FTS_SKIP);
 				continue;
@@ -342,7 +347,7 @@ copy(argv, type, fts_options)
 			    S_ISDIR(to_stat.st_mode)) {
 		warnx("cannot overwrite directory %s with non-directory %s",
 				    to.p_path, curr->fts_path);
-				rval = 1;
+				badcp = rval = 1;
 				continue;
 			}
 			dne = 0;
@@ -351,14 +356,14 @@ copy(argv, type, fts_options)
 		switch (curr->fts_statp->st_mode & S_IFMT) {
 		case S_IFLNK:
 			if (copy_link(curr, !dne))
-				rval = 1;
+				badcp = rval = 1;
 			break;
 		case S_IFDIR:
 			if (!Rflag && !rflag) {
 				warnx("%s is a directory (not copied).",
 				    curr->fts_path);
 				(void)fts_set(ftsp, curr, FTS_SKIP);
-				rval = 1;
+				badcp = rval = 1;
 				break;
 			}
 			/*
@@ -384,7 +389,7 @@ copy(argv, type, fts_options)
                         * forever.
 			 */
 			if (pflag && setfile(curr->fts_statp, 0))
-				rval = 1;
+				badcp = rval = 1;
 			else if (dne)
 				(void)chmod(to.p_path,
 				    curr->fts_statp->st_mode);
@@ -393,26 +398,28 @@ copy(argv, type, fts_options)
 		case S_IFCHR:
 			if (Rflag) {
 				if (copy_special(curr->fts_statp, !dne))
-					rval = 1;
+					badcp = rval = 1;
 			} else {
 				if (copy_file(curr, dne))
-					rval = 1;
+					badcp = rval = 1;
 			}
 			break;
 		case S_IFIFO:
 			if (Rflag) {
 				if (copy_fifo(curr->fts_statp, !dne))
-					rval = 1;
+					badcp = rval = 1;
 			} else {
 				if (copy_file(curr, dne))
-					rval = 1;
+					badcp = rval = 1;
 			}
 			break;
 		default:
 			if (copy_file(curr, dne))
-				rval = 1;
+				badcp = rval = 1;
 			break;
 		}
+		if (vflag && !badcp)
+			(void)printf("%s -> %s\n", curr->fts_path, to.p_path);
 	}
 	if (errno)
 		err(1, "fts_read");
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- *	$Id$
+ * $FreeBSD$
 */

 typedef struct {
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: utils.c,v 1.20 1998/06/10 06:29:23 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -50,6 +50,7 @@ static const char rcsid[] =
 #include <fcntl.h>
 #include <fts.h>
 #include <stdio.h>
+#include <sysexits.h>
 #include <unistd.h>

 #include "extern.h"
@@ -171,7 +172,7 @@ copy_file(entp, dne)
 	/*
 	 * Don't remove the target even after an error.  The target might
 	 * not be a regular file, or its attributes might be important,
-	 * or its contents might be irreplacable.  It would only be safe
+	 * or its contents might be irreplaceable.  It would only be safe
 	 * to remove it if we created it and its length is 0.
 	 */

@@ -183,7 +184,7 @@ copy_file(entp, dne)
 	 */
 #define	RETAINBITS \
 	(S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)
-	else if (fs->st_mode & (S_ISUID | S_ISGID) && fs->st_uid == myuid)
+	else if (fs->st_mode & (S_ISUID | S_ISGID) && fs->st_uid == myuid) {
 		if (fstat(to_fd, &to_stat)) {
 			warn("%s", to.p_path);
 			rval = 1;
@@ -192,6 +193,7 @@ copy_file(entp, dne)
 			warn("%s", to.p_path);
 			rval = 1;
 		}
+	}
 	(void)close(from_fd);
 	if (close(to_fd)) {
 		warn("%s", to.p_path);
@@ -319,8 +321,9 @@ setfile(fs, fd)
 void
 usage()
 {
+
 	(void)fprintf(stderr, "%s\n%s\n",
-"usage: cp [-R [-H | -L | -P]] [-f | -i] [-p] src target",
-"       cp [-R [-H | -L | -P]] [-f | -i] [-p] src1 ... srcN directory");
-	exit(1);
+"usage: cp [-R [-H | -L | -P]] [-f | -i] [-pv] src target",
+"       cp [-R [-H | -L | -P]] [-f | -i] [-pv] src1 ... srcN directory");
+	exit(EX_USAGE);
 }
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1997/08/07 21:42:01 steve Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@@ -15,10 +15,10 @@ SRCS=	alloc.c char.c const.c csh.c dir.c dol.c err.c exec.c exp.c file.c \
 .PATH:	${.CURDIR}/../../usr.bin/printf

 MAN1=	csh.1
-MLINKS=	csh.1 limit.1 csh.1 alias.1 csh.1 bg.1 csh.1 dirs.1 csh.1 fg.1 \
-	csh.1 foreach.1 csh.1 history.1 csh.1 jobs.1 csh.1 popd.1 \
-	csh.1 pushd.1 csh.1 rehash.1 csh.1 repeat.1 csh.1 suspend.1 \
-	csh.1 stop.1 csh.1 source.1
+# MLINKS for Shell built in commands for which there are no userland
+# utilities of the same name are handled with the associated manpage,
+# builtin.1 in share/man/man1/.
+
 CLEANFILES+=const.h errnum.h

 const.h: errnum.h
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id$
+# $FreeBSD$

 DIR=	usd/04.csh
 SRCS=	tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .EH 'USD:4-%''An Introduction to the C shell'
 .OH 'An Introduction to the C shell''USD:4-%'
@@ -875,7 +875,8 @@ to remind you which command is being continued, and cause the command
 to resume execution.  Unless any input files in use by the suspended
 command have been changed in the meantime, the suspension has no effect
 whatsoever on the execution of the command.  This feature can be very useful
-during editing, when you need to look at another file before continuing. An
+during editing, when you need to look at another file before continuing.
+An
 example of command suspension follows.
 .DS
 % mail harold
@@ -903,7 +904,8 @@ suspended, it typed `Stopped' and prompted for a new command.  Then the
 .I ls
 command was typed to find out the name of the file.  The
 .I jobs
-command was run to find out which command was suspended. At this time the
+command was run to find out which command was suspended.
+At this time the
 .I fg
 command was typed to continue execution of the mail program.  Input
 to the mail program was then continued and ended with a ^D
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 1
 .NH
@@ -678,7 +678,8 @@ the same until the job terminates and then are re-used.
 .PP
 When a job is started in the backgound using `&', its number, as well
 as the process numbers of all its (top level) commands, is typed by the shell
-before prompting you for another command. For example,
+before prompting you for another command.
+For example,
 .DS
 % ls \-s | sort \-n > usage &
 [2] 2034 2035
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 2
 .NH
@@ -224,7 +224,8 @@ is quite special and is replaced by the next line of input read from
 the shell's standard input (not the script it is reading).  This is
 useful for writing shell scripts that are interactive, reading
 commands from the terminal, or even writing a shell script that
-acts as a filter, reading lines from its input file. Thus the sequence
+acts as a filter, reading lines from its input file.
+Thus the sequence
 .DS
 echo 'yes or no?\ec'
 set a=($<)
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 3
 .NH
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .SH
 Appendix \- Special characters
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .SH
 Glossary
@@ -30,6 +30,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)alloc.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: alloc.c,v 1.8 1998/05/06 06:50:37 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)char.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: char.c,v 1.4 1997/02/22 14:01:37 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)char.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
 */

 #include <ctype.h>
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)const.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: const.c,v 1.6 1997/02/22 14:01:39 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\"	$Id: csh.1,v 1.10 1998/05/06 06:50:38 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 21, 1994
 .Dt CSH 1
@@ -55,10 +55,11 @@ job control facilities (see
 interactive file name
 and user name completion (see
 .Sx File Name Completion ) ,
-and a C-like syntax. It is used both as an interactive
-login shell and a shell script command processor.
+and a C-like syntax.
+It is used both as an interactive login shell and
+a shell script command processor.
 .Ss Argument list processing
-If the first argument (argument 0) to the shell is
+If the shell is executed with a program name starting with
 .Ql Fl \& ,
 then this is a login shell.
 A login shell also can be specified by invoking the shell with the 
@@ -131,12 +132,11 @@ variable to be set even before
 .Pa .cshrc
 is executed.
 .It Fl X
-Is to
-.Fl x
-as
-.Fl V
-is to
-.Fl v .
+Cause the
+.Ar echo
+variable to be set even before
+.Pa .cshrc
+is executed.
 .El
 .Pp
 After processing of flag arguments, if arguments remain but none of the
@@ -236,8 +236,9 @@ may be a component of a pipeline, etc.).
 It is also possible to separate pipelines with `\&|\&|' or `&&' showing,
 as in the C language,
 that the second is to be executed only if the first fails or succeeds
-respectively. (See
-.Em Expressions . )
+respectively.
+See
+.Sx Expressions .
 .Ss Jobs
 The shell associates a
 .Ar job
@@ -317,12 +318,15 @@ The job control mechanism requires that the
 .Xr stty 1
 option
 .Ic new
-be set. It is an artifact from a
+be set.
+It is an artifact from a
 .Em new
 implementation
 of the
 tty driver that allows generation of interrupt characters from
-the keyboard to tell jobs to stop.  See stty(1) for details
+the keyboard to tell jobs to stop.  See
+.Xr stty 1
+for details
 on setting options in the new tty driver.
 .Ss Status reporting
 This shell learns immediately whenever a process changes state.
@@ -566,8 +570,8 @@ Repeat the previous substitution.
 Apply the change once on each word, prefixing the above, e.g., `g&'.
 .It a
 Apply the change as many times as possible on a single word, prefixing
-the above. It can be used together with `g' to apply a substitution 
-globally.
+the above.
+It can be used together with `g' to apply a substitution globally.
 .It p
 Print the new command line but do not execute it.
 .It q
@@ -1487,7 +1491,7 @@ entry in the stack.
 The members of the directory stack are numbered from the top starting at 0.
 .Pp
 .It Ic printf Ar format-string values
-Invokes a built-in version of 
+Invokes a builtin version of 
 .Ic printf 
 after evaluating the 
 .Ar format-string 
@@ -2134,9 +2138,18 @@ To detect looping, the shell restricts the number of
 .Ic alias
 substitutions on a single line to 20.
 .Sh SEE ALSO
+.Xr builtin 1 ,
+.Xr echo 1 ,
+.Xr kill 1 ,
+.Xr login 1 ,
+.Xr nice 1 ,
+.Xr nohup 1 ,
+.Xr printenv 1 ,
 .Xr printf 1 ,
 .Xr sh 1 ,
 .Xr su 1 ,
+.Xr time 1 ,
+.Xr which 1 ,
 .Xr access 2 ,
 .Xr execve 2 ,
 .Xr fork 2 ,
@@ -2149,8 +2162,9 @@ substitutions on a single line to 20.
 .Xr tty 4 ,
 .Xr a.out 5 ,
 .Xr environ 7
-.br
-.Em An introduction to the C shell
+.Rs
+.%T "An introduction to the C shell"
+.Re
 .Sh HISTORY
 .Nm Csh
 appeared in
@@ -2167,7 +2181,7 @@ and user name completion (see
 and a C-like syntax.
 There are now many shells that also have these mechanisms, plus
 a few more (and maybe some bugs too), which are available through the
-usenet.
+Usenet.
 .Sh BUGS
 When a command is restarted from a stop,
 the shell prints the directory it started in if this is different
@@ -2194,7 +2208,7 @@ shell procedures should be provided instead of aliases.
 Commands within loops, prompted for by `?', are not placed on the
 .Ic history
 list.
-Control structure should be parsed instead of being recognized as built-in
+Control structure should be parsed instead of being recognized as builtin
 commands.  This would allow control commands to be placed anywhere,
 to be combined with `\&|', and to be used with `&' and `;' metasyntax.
 .Pp
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)csh.c	8.2 (Berkeley) 10/12/93";
 #else
 static const char rcsid[] =
-	"$Id: csh.c,v 1.12 1997/12/10 22:18:21 eivind Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -1223,7 +1223,7 @@ gethdir(home)

 /*
 * When didfds is set, we do I/O from 0, 1, 2 otherwise from 15, 16, 17
- * We also check if the shell has already changed the decriptor to point to
+ * We also check if the shell has already changed the descriptor to point to
 * 0, 1, 2 when didfds is set.
 */
 #define DESC(a) (*((int *) (a)) - (didfds && *((int *) a) >= FSHIN ? FSHIN : 0))
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)csh.h	8.1 (Berkeley) 5/31/93
- *	$Id: csh.h,v 1.5 1997/08/07 21:42:04 steve Exp $
+ * $FreeBSD$
 */

 /*
@@ -306,7 +306,7 @@ Char   *lap;
 *
 * Each command is parsed to a tree of command structures and
 * flags are set bottom up during this process, to be propagated down
- * as needed during the semantics/exeuction pass (sh.sem.c).
+ * as needed during the semantics/execution pass (sh.sem.c).
 */
 struct command {
    short   t_dtyp;		/* Type of node 		 */
@@ -535,7 +535,7 @@ Char  **evalvec;
 Char   *evalp;

 /* word_chars is set by default to WORD_CHARS but can be overridden by
-   the worchars variable--if unset, reverts to WORD_CHARS */
+   the wordchars variable--if unset, reverts to WORD_CHARS */

 Char   *word_chars;

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dir.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: dir.c,v 1.8 1998/06/09 03:38:37 imp Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)dir.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
 */

 /*
@@ -36,10 +36,11 @@
 static char sccsid[] = "@(#)dol.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: dol.c,v 1.7 1998/05/06 06:50:39 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

+#include <sys/time.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -850,13 +851,20 @@ heredoc(term)
    Char  **vp;
    bool    quoted;
    char   *tmp;
+    struct timeval tv;

-    if (creat(tmp = short2str(shtemp), 0600) < 0)
-	stderror(ERR_SYSTEM, tmp, strerror(errno));
-    (void) close(0);
-    if (open(tmp, O_RDWR) < 0) {
+again:
+    tmp = short2str(shtemp);
+    if (open(tmp, O_RDWR|O_CREAT|O_TRUNC|O_EXCL, 0600) < 0) {
 	int     oerrno = errno;
-
+	if (errno == EEXIST) {
+	    if (unlink(tmp) == -1) {
+		(void) gettimeofday(&tv, NULL);
+		shtemp = Strspl(STRtmpsh, putn((((int)tv.tv_sec) ^
+		    ((int)tv.tv_usec) ^ ((int)getpid())) & 0x00ffffff));
+	    }
+	    goto again;
+	}
 	(void) unlink(tmp);
 	errno = oerrno;
 	stderror(ERR_SYSTEM, tmp, strerror(errno));
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: err.c,v 1.7 1998/05/06 06:50:41 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -327,7 +327,7 @@ seterror(id, va_alist)
 *		  in bname
 *
 * This routine always resets or exits.  The flag haderr
- * is set so the routine who catches the unwind can propogate
+ * is set so the routine who catches the unwind can propagate
 * it if they want.
 *
 * Note that any open files at the point of error will eventually
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: exec.c,v 1.9 1998/02/28 10:49:54 jraynard Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)exp.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: exp.c,v 1.6 1998/05/06 06:50:44 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id: extern.h,v 1.4 1997/02/22 14:01:53 peter Exp $
+ * $FreeBSD$
 */

 #include <sys/cdefs.h>
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)file.c	8.2 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id: file.c,v 1.8 1998/02/01 17:11:01 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)func.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: func.c,v 1.10 1998/02/28 10:49:56 jraynard Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -1396,7 +1396,7 @@ dosuspend(v, t)
 /* This is the dreaded EVAL built-in.
 *   If you don't fiddle with file descriptors, and reset didfds,
 *   this command will either ignore redirection inside or outside
- *   its aguments, e.g. eval "date >x"  vs.  eval "date" >x
+ *   its arguments, e.g. eval "date >x"  vs.  eval "date" >x
 *   The stuff here seems to work, but I did it by trial and error rather
 *   than really knowing what was going on.  If tpgrp is zero, we are
 *   probably a background eval, e.g. "eval date &", and we want to
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)glob.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: glob.c,v 1.10 1997/08/08 00:54:03 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hist.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: hist.c,v 1.7 1998/05/06 06:50:50 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: init.c,v 1.4 1997/02/22 14:02:00 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)lex.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: lex.c,v 1.9 1998/05/06 06:50:52 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -1179,7 +1179,7 @@ gethent(sc)
 	case '-':
 	    back = 1;
 	    c = getC(0);
-	    /* FALLSTHROUGH */
+	    /* FALLTHROUGH */

 	default:
 	    if (any("(=~", c)) {
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: misc.c,v 1.7 1998/05/06 06:50:53 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: parse.c,v 1.7 1998/05/06 06:50:56 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$Id: pathnames.h,v 1.4 1997/02/22 14:02:05 peter Exp $
+ * $FreeBSD$
 */

 #define	_PATH_BIN		"/bin"
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)proc.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: proc.c,v 1.8 1998/02/28 10:49:59 jraynard Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -76,7 +76,7 @@ static void	 okpcntl __P((void));
 * pchild - called at interrupt level by the SIGCHLD signal
 *	indicating that at least one child has terminated or stopped
 *	thus at least one wait system call will definitely return a
- *	childs status.  Top level routines (like pwait) must be sure
+ *	child's status.  Top level routines (like pwait) must be sure
 *	to mask interrupts when playing with the proclist data structures!
 */
 /* ARGUSED */
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)proc.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
 */

 /*
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)sem.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: sem.c,v 1.7 1998/02/28 10:50:00 jraynard Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -471,7 +471,7 @@ int i;
 * If more than one word is generated, then update the command vector.
 *
 * This is done differently in all the shells:
- * 1. in the bourne shell and ksh globbing is not performed
+ * 1. in the Bourne shell and ksh globbing is not performed
 * 2. Bash/csh say ambiguous
 * 3. zsh does i/o to/from all the files
 * 4. itcsh concatenates the words.
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)set.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: set.c,v 1.9 1998/05/06 06:51:04 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -163,7 +163,7 @@ doset(v, t)
 	    cp = Strsave(value(vp));	/* get the old value back */

 	    /*
-	     * convert to cononical pathname (possibly resolving symlinks)
+	     * convert to canonical pathname (possibly resolving symlinks)
 	     */
 	    cp = dcanon(cp, cp);

@@ -745,7 +745,7 @@ balance(p, f, d)
 		break;
 	    case 1:		/* was already right heavy */
 		switch (p->v_right->v_bal) {
-		case 1:	/* sigle rotate */
+		case 1:	/* single rotate */
 		    pp->v_link[ff] = rleft(p);
 		    p->v_left->v_bal = 0;
 		    p->v_bal = 0;
@@ -783,7 +783,7 @@ balance(p, f, d)
 		    p->v_right->v_bal = 0;
 		    p->v_bal = 0;
 		    break;
-		case 0:	/* signle rotate */
+		case 0:	/* single rotate */
 		    pp->v_link[ff] = rright(p);
 		    p->v_right->v_bal = -1;
 		    p->v_bal = 1;
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)str.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: str.c,v 1.5 1997/02/22 14:02:09 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: time.c,v 1.7 1997/02/22 14:02:09 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -219,7 +219,7 @@ prusage(r0, r1, e, b)
 		(void) fprintf(cshout, "%ld", r1->ru_oublock - r0->ru_oublock);
 		break;

-	    case 'r':		/* socket messages recieved */
+	    case 'r':		/* socket messages received */
 		(void) fprintf(cshout, "%ld", r1->ru_msgrcv - r0->ru_msgrcv);
 		break;

@@ -227,7 +227,7 @@ prusage(r0, r1, e, b)
 		(void) fprintf(cshout, "%ld", r1->ru_msgsnd - r0->ru_msgsnd);
 		break;

-	    case 'k':		/* number of signals recieved */
+	    case 'k':		/* number of signals received */
 		(void) fprintf(cshout, "%ld", r1->ru_nsignals-r0->ru_nsignals);
 		break;

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.6 1997/08/09 22:34:01 brian Exp $
+# $FreeBSD$

 PROG=	date
 SRCS=	date.c netdate.c vary.c
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\"	$Id: date.1,v 1.25 1998/05/13 07:56:44 phk Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -47,9 +47,9 @@
 .Op Fl d Ar dst
 .Op Fl r Ar seconds
 .Op Fl t Ar minutes_west
-.Op Fl v Ns Ar [+|-]val Ns Op ymwdHM
+.Op Fl v Ns Ar [+|-]val Ns Op ymwdHMS
 .Ar ...
-.Op Fl f Ar fmt Ar date | [[[[yy]mm]dd]HH]MM[\&.ss]
+.Op Fl f Ar fmt Ar date | [[[[[cc]yy]mm]dd]HH]MM[\&.ss]
 .Op Cm + Ns Ar format
 .Sh DESCRIPTION
 .Nm Date
@@ -74,7 +74,7 @@ Use
 .Ar fmt
 as the format string to parse the date provided rather than using
 the default
-.Ar [[[[yy]mm]dd]HH]MM[.ss]
+.Ar [[[[[cc]yy]mm]dd]HH]MM[.ss]
 format.  Parsing is done using
 .Xr strptime 3 .
 .It Fl n
@@ -92,9 +92,14 @@ option stops
 .Nm
 from setting the time for other than the current machine.
 .It Fl r
-Print out the date and time in
+Print out the date and time that is
 .Ar seconds
-from the Epoch.
+from the Epoch
+.Po
+00:00:00 UTC, January 1, 1970;
+see
+.Xr time 3
+.Pc .
 .It Fl t
 Set the kernel's value for minutes west of
 .Tn GMT .
@@ -108,8 +113,8 @@ Display or set the date in
 .Tn UCT
 (universal) time.
 .It Fl v
-Adjust the minute, hour, month day, week day, month or year according to
-.Ar val .
+Adjust the second, minute, hour, month day, week day, month or year according to
+.Ar val .  
 If
 .Ar val
 is preceded with a plus or minus sign, the date is adjusted forwards
@@ -117,10 +122,12 @@ or backwards according to the remaining string, otherwise the relevant
 part of the date is set.  The date can be adjusted as many times as
 required using these flags.  Flags are processed in the order given.
 .Pp
-Minutes are in the range 0-59, hours are in the range 1-12, month days
-are in the range 1-31, week days are in the range 0-6 (Sun-Sat), months
-are in the range 1-12 (Jan-Dec) and years are in the range 80-38 or
-1980-2038.
+When setting values
+.Pq rather than adjusting them ,
+seconds are in the range 0-59, minutes are in the range 0-59, hours are
+in the range 1-12, month days are in the range 1-31, week days are in the
+range 0-6 (Sun-Sat), months are in the range 1-12 (Jan-Dec) and years are
+in the range 80-38 or 1980-2038.
 .Pp
 If
 .Ar val
@@ -129,9 +136,10 @@ is numeric, one of either
 .Ar m ,
 .Ar w ,
 .Ar d ,
-.Ar H
-or
+.Ar H ,
 .Ar M
+or
+.Ar S
 must be used to specify which part of the date is to be adjusted.
 .Pp
 The week day or month may be specified using a name rather than a
@@ -140,6 +148,27 @@ will be put forwards (or backwards) to the next (previous) date that
 matches the given week day or month.  This will not adjust the date
 if the given week day or month is the same as the current one.
 .Pp
+When a date is adjusted to a specific value or in units greater than hours,
+daylight savings time considerations are ignored.
+Adjustments in units of hours or less honour daylight savings time.
+So, assuming the current date is March 26, 0:30 and that the DST adjustment
+means that the clock goes forward at 01:00 to 02:00, using
+.Fl v No +1H
+will adjust the date to March 26, 2:30.
+Likewise, if the date is October 29, 0:30 and the DST adjustment means that
+the clock goes back at 02:00 to 01:00, using
+.Fl v No +3H
+will be necessary to reach October 20, 2:30.
+.Pp
+When the date is adjusted to a specific value that doesn't actually exist
+.Pq for example March 26, 1:30 BST 2000 ,
+the date will be silently adjusted forwards in units of one hour until it
+reaches a valid time.
+When the date is adjusted to a specific value that occurs twice
+.Pq for example October 29, 1:30 2000 ,
+the resulting timezone will be set so that the date matches the earlier of
+the two times.
+.Pp
 Refer to the examples below for further details.
 .El
 .Pp
@@ -161,6 +190,8 @@ a value for setting the system's notion of the current date and time.
 The canonical representation for setting the date and time is:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
+.It Ar cc
+Century (either 19 or 20) prepended to the abbreviated year.
 .It Ar yy
 Year in abbreviated form (e.g. 89 for 1989, 06 for 2006).
 .It Ar mm
@@ -277,7 +308,9 @@ a record of the user setting the time
 .%A S. Zatti
 .Re
 .Sh DIAGNOSTICS
-Exit status is 0 on success, 1 if unable to set the date, and 2
+The
+.Nm
+utility exits 0 on success, 1 if unable to set the date, and 2
 if able to set the local date, but unable to set it globally.
 .Pp
 Occasionally, when
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: date.c,v 1.25 1998/05/13 07:31:39 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -170,6 +170,8 @@ main(argc, argv)
 }

 #define	ATOI2(ar)	((ar)[0] - '0') * 10 + ((ar)[1] - '0'); (ar) += 2;
+#define	ATOI4(ar)	((ar)[0] - '0') * 1000 + ((ar)[1] - '0') * 100 + \
+			    ((ar)[2] - '0') * 10 + ((ar)[3] - '0'); (ar) += 4;
 void
 setthetime(fmt, p)
 	const char *fmt;
@@ -185,8 +187,7 @@ setthetime(fmt, p)
 		if (t == NULL) {
 			fprintf(stderr, "Failed conversion of ``%s''"
 				" using format ``%s''\n", p, fmt);
-			lt = localtime(&tval);
-			return;
+			badformat();
 		} else if (*t != '\0')
 			fprintf(stderr, "Warning: Ignoring %ld extraneous"
 				" characters in date string (%s)\n",
@@ -216,11 +217,16 @@ setthetime(fmt, p)

 		/* if p has a ".ss" field then let's pretend it's not there */
 		switch (strlen(p) - ((dot != NULL) ? 3 : 0)) {
+		case 12:				/* cc */
+			lt->tm_year = -1900 + ATOI4(p);
+			if (lt->tm_year < 0)
+				badformat();
+			goto year_done;
 		case 10:				/* yy */
 			lt->tm_year = ATOI2(p);
 			if (lt->tm_year < 69)		/* hack for 2000 ;-} */
 				lt->tm_year += 100;
-			/* FALLTHROUGH */
+year_done:		/* FALLTHROUGH */
 		case 8:					/* mm */
 			lt->tm_mon = ATOI2(p);
 			if (lt->tm_mon > 12)
@@ -278,7 +284,8 @@ usage()
 {
 	(void)fprintf(stderr, "%s\n%s\n",
 	    "usage: date [-nu] [-d dst] [-r seconds] [-t west] "
-	    "[-v[+|-]val[ymwdHM]] ... ",
-	    "            [-f fmt date | [[[[yy]mm]dd]HH]MM[.ss]] [+format]");
+	    "[-v[+|-]val[ymwdHMS]] ... ",
+	    "            "
+	    "[-f fmt date | [[[[[cc]yy]mm]dd]HH]MM[.ss]] [+format]");
 	exit(1);
 }
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
 */

 int	netsettime __P((time_t));
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)netdate.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id: netdate.c,v 1.9 1998/05/06 06:51:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -26,7 +26,7 @@

 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <time.h>
@@ -41,8 +41,8 @@ struct trans {

 static struct trans trans_mon[] = {
  { 1, "january" }, { 2, "february" }, { 3, "march" }, { 4, "april" },
-  { 6, "june" }, { 7, "july" }, { 8, "august" }, { 9, "september" },
-  { 10, "october" }, { 11, "november" }, { 12, "december" },
+  { 5, "may"}, { 6, "june" }, { 7, "july" }, { 8, "august" },
+  { 9, "september" }, { 10, "october" }, { 11, "november" }, { 12, "december" },
  { -1, NULL }
 };

@@ -53,6 +53,19 @@ static struct trans trans_wday[] = {
 };

 static char digits[] = "0123456789";
+static int adjhour(struct tm *, char, int, int);
+
+static int
+domktime(struct tm *t, char type)
+{
+  time_t ret;
+
+  while ((ret = mktime(t)) == -1 && t->tm_year > 68 && t->tm_year < 138)
+    /* While mktime() fails, adjust by an hour */
+    adjhour(t, type == '-' ? type : '+', 1, 0);
+
+  return ret;
+}

 static int
 trans(const struct trans t[], const char *arg)
@@ -112,7 +125,7 @@ daysinmonth(const struct tm *t)


 static int
-adjyear(struct tm *t, char type, int val)
+adjyear(struct tm *t, char type, int val, int mk)
 {
  switch (type) {
    case '+':
@@ -129,45 +142,51 @@ adjyear(struct tm *t, char type, int val)
        t->tm_year -= 1900;             /* struct tm holds years since 1900 */
      break;
  }
-  return mktime(t) != -1;
+  return !mk || domktime(t, type) != -1;
 }

 static int
-adjmon(struct tm *t, char type, int val, int istext)
+adjmon(struct tm *t, char type, int val, int istext, int mk)
 {
  if (val < 0)
    return 0;

  switch (type) {
    case '+':
-      if (istext)
+      if (istext) {
        if (val <= t->tm_mon)
          val += 11 - t->tm_mon;	/* early next year */
        else
          val -= t->tm_mon + 1;		/* later this year */
-      if (!adjyear(t, '+', (t->tm_mon + val) / 12))
-        return 0;
-      val %= 12;
-      t->tm_mon += val;
-      if (t->tm_mon > 11)
-        t->tm_mon -= 12;
+      }
+      if (val) {
+        if (!adjyear(t, '+', (t->tm_mon + val) / 12, 0))
+          return 0;
+        val %= 12;
+        t->tm_mon += val;
+        if (t->tm_mon > 11)
+          t->tm_mon -= 12;
+      }
      break;

    case '-':
-      if (istext)
+      if (istext) {
        if (val-1 > t->tm_mon)
          val = 13 - val + t->tm_mon;	/* later last year */
        else
          val = t->tm_mon - val + 1;	/* early this year */
-      if (!adjyear(t, '-', val / 12))
-        return 0;
-      val %= 12;
-      if (val > t->tm_mon) {
-        if (!adjyear(t, '-', 1))
-          return 0;
-        val -= 12;
      }
-      t->tm_mon -= val;
+      if (val) {
+        if (!adjyear(t, '-', val / 12, 0))
+          return 0;
+        val %= 12;
+        if (val > t->tm_mon) {
+          if (!adjyear(t, '-', 1, 0))
+            return 0;
+          val -= 12;
+        }
+        t->tm_mon -= val;
+      }
      break;

    default:
@@ -176,13 +195,14 @@ adjmon(struct tm *t, char type, int val, int istext)
      t->tm_mon = --val;
  }

-  return mktime(t) != -1;
+  return !mk || domktime(t, type) != -1;
 }

 static int
-adjday(struct tm *t, char type, int val)
+adjday(struct tm *t, char type, int val, int mk)
 {
  int mdays;
+
  switch (type) {
    case '+':
      while (val) {
@@ -190,7 +210,7 @@ adjday(struct tm *t, char type, int val)
        if (val > mdays - t->tm_mday) {
          val -= mdays - t->tm_mday + 1;
          t->tm_mday = 1;
-          if (!adjmon(t, '+', 1, 0))
+          if (!adjmon(t, '+', 1, 0, 0))
            return 0;
        } else {
          t->tm_mday += val;
@@ -203,7 +223,7 @@ adjday(struct tm *t, char type, int val)
        if (val >= t->tm_mday) {
          val -= t->tm_mday;
          t->tm_mday = 1;
-          if (!adjmon(t, '-', 1, 0))
+          if (!adjmon(t, '-', 1, 0, 0))
            return 0;
          t->tm_mday = daysinmonth(t);
        } else {
@@ -219,11 +239,11 @@ adjday(struct tm *t, char type, int val)
      break;
  }

-  return mktime(t) != -1;
+  return !mk || domktime(t, type) != -1;
 }

 static int
-adjwday(struct tm *t, char type, int val, int istext)
+adjwday(struct tm *t, char type, int val, int istext, int mk)
 {
  if (val < 0)
    return 0;
@@ -236,54 +256,62 @@ adjwday(struct tm *t, char type, int val, int istext)
        else
          val -= t->tm_wday;           /* later this week */
      else
-        val *= 7;                      /* "-W +5" == "5 weeks in the future" */
-      return adjday(t, '+', val);
+        val *= 7;                      /* "-v+5w" == "5 weeks in the future" */
+      return !val || adjday(t, '+', val, mk);
    case '-':
-      if (istext)
+      if (istext) {
        if (val > t->tm_wday)
          val = 7 - val + t->tm_wday;  /* later last week */
        else
          val = t->tm_wday - val;      /* early this week */
-      else
-        val *= 7;                      /* "-W -5" == "5 weeks ago" */
-      return adjday(t, '-', val);
+      } else
+        val *= 7;                      /* "-v-5w" == "5 weeks ago" */
+      return !val || adjday(t, '-', val, mk);
    default:
      if (val < t->tm_wday)
-        return adjday(t, '-', t->tm_wday - val);
+        return adjday(t, '-', t->tm_wday - val, mk);
      else if (val > 6)
        return 0;
      else if (val > t->tm_wday)
-        return adjday(t, '+', val - t->tm_wday);
+        return adjday(t, '+', val - t->tm_wday, mk);
  }
  return 1;
 }

 static int
-adjhour(struct tm *t, char type, int val)
+adjhour(struct tm *t, char type, int val, int mk)
 {
  if (val < 0)
    return 0;

  switch (type) {
    case '+':
-      if (!adjday(t, '+', (t->tm_hour + val) / 24))
-        return 0;
-      val %= 24;
-      t->tm_hour += val;
-      if (t->tm_hour > 23)
-        t->tm_hour -= 24;
+      if (val) {
+        int days;
+
+        days = (t->tm_hour + val) / 24;
+        val %= 24;
+        t->tm_hour += val;
+        t->tm_hour %= 24;
+        if (!adjday(t, '+', days, 0))
+          return 0;
+      }
      break;

    case '-':
-      if (!adjday(t, '-', val / 24))
-        return 0;
-      val %= 24;
-      if (val > t->tm_hour) {
-        if (!adjday(t, '-', 1))
+      if (val) {
+        int days;
+
+        days = val / 24;
+        val %= 24;
+        if (val > t->tm_hour) {
+          days++;
+          val -= 24;
+        }
+        t->tm_hour -= val;
+        if (!adjday(t, '-', days, 0))
          return 0;
-        val -= 24;
      }
-      t->tm_hour -= val;
      break;

    default:
@@ -292,35 +320,39 @@ adjhour(struct tm *t, char type, int val)
      t->tm_hour = val;
  }

-  return mktime(t) != -1;
+  return !mk || domktime(t, type) != -1;
 }

 static int
-adjmin(struct tm *t, char type, int val)
+adjmin(struct tm *t, char type, int val, int mk)
 {
  if (val < 0)
    return 0;

  switch (type) {
    case '+':
-      if (!adjhour(t, '+', (t->tm_min + val) / 60))
-        return 0;
-      val %= 60;
-      t->tm_min += val;
-      if (t->tm_min > 59)
-        t->tm_min -= 60;
+      if (val) {
+        if (!adjhour(t, '+', (t->tm_min + val) / 60, 0))
+          return 0;
+        val %= 60;
+        t->tm_min += val;
+        if (t->tm_min > 59)
+          t->tm_min -= 60;
+      }
      break;

    case '-':
-      if (!adjhour(t, '-', val / 60))
-        return 0;
-      val %= 60;
-      if (val > t->tm_min) {
-        if (!adjhour(t, '-', 1))
+      if (val) {
+        if (!adjhour(t, '-', val / 60, 0))
          return 0;
-        val -= 60;
+        val %= 60;
+        if (val > t->tm_min) {
+          if (!adjhour(t, '-', 1, 0))
+            return 0;
+          val -= 60;
+        }
+        t->tm_min -= val;
      }
-      t->tm_min -= val;
      break;

    default:
@@ -329,7 +361,48 @@ adjmin(struct tm *t, char type, int val)
      t->tm_min = val;
  }

-  return mktime(t) != -1;
+  return !mk || domktime(t, type) != -1;
+}
+
+static int
+adjsec(struct tm *t, char type, int val, int mk)
+{
+  if (val < 0)
+    return 0;
+
+  switch (type) {
+    case '+':
+      if (val) {
+        if (!adjmin(t, '+', (t->tm_sec + val) / 60, 0))
+          return 0;
+        val %= 60;
+        t->tm_sec += val;
+        if (t->tm_sec > 59)
+          t->tm_sec -= 60;
+      }
+      break;
+
+    case '-':
+      if (val) {
+        if (!adjmin(t, '-', val / 60, 0))
+          return 0;
+        val %= 60;
+        if (val > t->tm_sec) {
+          if (!adjmin(t, '-', 1, 0))
+            return 0;
+          val -= 60;
+        }
+        t->tm_sec -= val;
+      }
+      break;
+
+    default:
+      if (val > 59)
+        return 0;
+      t->tm_sec = val;
+  }
+
+  return !mk || domktime(t, type) != -1;
 }

 const struct vary *
@@ -352,15 +425,18 @@ vary_apply(const struct vary *v, struct tm *t)
    if (len < 2)
      return v;

+    if (type == '\0')
+      t->tm_isdst = -1;
+
    if (strspn(arg, digits) != len-1) {
      val = trans(trans_wday, arg);
      if (val != -1) {
-          if (!adjwday(t, type, val, 1))
+          if (!adjwday(t, type, val, 1, 1))
            return v;
      } else {
        val = trans(trans_mon, arg);
        if (val != -1) {
-          if (!adjmon(t, type, val, 1))
+          if (!adjmon(t, type, val, 1, 1))
            return v;
        } else
          return v;
@@ -370,28 +446,36 @@ vary_apply(const struct vary *v, struct tm *t)
      which = arg[len-1];
      
      switch (which) {
+        case 'S':
+          if (!adjsec(t, type, val, 1))
+            return v;
+          break;
        case 'M':
-          if (!adjmin(t, type, val))
+          if (!adjmin(t, type, val, 1))
            return v;
          break;
        case 'H':
-          if (!adjhour(t, type, val))
+          if (!adjhour(t, type, val, 1))
            return v;
          break;
        case 'd':
-          if (!adjday(t, type, val))
+          t->tm_isdst = -1;
+          if (!adjday(t, type, val, 1))
            return v;
          break;
        case 'w':
-          if (!adjwday(t, type, val, 0))
+          t->tm_isdst = -1;
+          if (!adjwday(t, type, val, 0, 1))
            return v;
          break;
        case 'm':
-          if (!adjmon(t, type, val, 0))
+          t->tm_isdst = -1;
+          if (!adjmon(t, type, val, 0, 1))
            return v;
          break;
        case 'y':
-          if (!adjyear(t, type, val))
+          t->tm_isdst = -1;
+          if (!adjyear(t, type, val, 1))
            return v;
          break;
        default:
@@ -23,7 +23,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id$
+ * $FreeBSD$
 */

 struct vary {
@@ -1,7 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.5 1998/01/07 22:31:17 joerg Exp $
+# $FreeBSD$

 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c

+MAINTAINER=	[email protected]
+
 .include <bsd.prog.mk>
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: args.c,v 1.12 1998/05/06 06:51:29 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/types.h>
@@ -67,10 +67,11 @@ static void	f_obs __P((char *));
 static void	f_of __P((char *));
 static void	f_seek __P((char *));
 static void	f_skip __P((char *));
-static u_long	get_bsz __P((char *));
+static quad_t	get_num __P((char *));
+static off_t	get_offset __P((char *));

-static struct arg {
-	char *name;
+static const struct arg {
+	const char *name;
 	void (*f) __P((char *));
 	u_int set, noset;
 } args[] = {
@@ -141,14 +142,14 @@ jcl(argv)
 	 * Ascii/ebcdic and cbs implies block/unblock.
 	 * Block/unblock requires cbs and vice-versa.
 	 */
-	if (ddflags & (C_BLOCK|C_UNBLOCK)) {
+	if (ddflags & (C_BLOCK | C_UNBLOCK)) {
 		if (!(ddflags & C_CBS))
 			errx(1, "record operations require cbs");
 		if (cbsz == 0)
 			errx(1, "cbs cannot be zero");
 		cfunc = ddflags & C_BLOCK ? block : unblock;
 	} else if (ddflags & C_CBS) {
-		if (ddflags & (C_ASCII|C_EBCDIC)) {
+		if (ddflags & (C_ASCII | C_EBCDIC)) {
 			if (ddflags & C_ASCII) {
 				ddflags |= C_UNBLOCK;
 				cfunc = unblock;
@@ -158,23 +159,14 @@ jcl(argv)
 			}
 		} else
 			errx(1, "cbs meaningless if not doing record operations");
-		if (cbsz == 0)
-			errx(1, "cbs cannot be zero");
 	} else
 		cfunc = def;

-	if (in.dbsz == 0 || out.dbsz == 0)
-		errx(1, "buffer sizes cannot be zero");
-
 	/*
-	 * Read, write and seek calls take ints as arguments.  Seek sizes
-	 * could be larger if we wanted to do it in stages or check only
-	 * regular files, but it's probably not worth it.
+	 * Bail out if the calculation of a file offset would overflow.
 	 */
-	if (in.dbsz > INT_MAX || out.dbsz > INT_MAX)
-		errx(1, "buffer sizes cannot be greater than %d", INT_MAX);
-	if (in.offset > INT_MAX / in.dbsz || out.offset > INT_MAX / out.dbsz)
-		errx(1, "seek offsets cannot be larger than %d", INT_MAX);
+	if (in.offset > QUAD_MAX / in.dbsz || out.offset > QUAD_MAX / out.dbsz)
+		errx(1, "seek offsets cannot be larger than %qd", QUAD_MAX);
 }

 static int
@@ -182,23 +174,32 @@ c_arg(a, b)
 	const void *a, *b;
 {

-	return (strcmp(((struct arg *)a)->name, ((struct arg *)b)->name));
+	return (strcmp(((const struct arg *)a)->name,
+	    ((const struct arg *)b)->name));
 }

 static void
 f_bs(arg)
 	char *arg;
 {
+	quad_t res;

-	in.dbsz = out.dbsz = (int)get_bsz(arg);
+	res = get_num(arg);
+	if (res < 1 || res > SSIZE_MAX)
+		errx(1, "bs must be between 1 and %d", SSIZE_MAX);
+	in.dbsz = out.dbsz = (size_t)res;
 }

 static void
 f_cbs(arg)
 	char *arg;
 {
+	quad_t res;

-	cbsz = (int)get_bsz(arg);
+	res = get_num(arg);
+	if (res < 1 || res > SSIZE_MAX)
+		errx(1, "cbs must be between 1 and %d", SSIZE_MAX);
+	cbsz = (size_t)res;
 }

 static void
@@ -206,9 +207,11 @@ f_count(arg)
 	char *arg;
 {

-	cpy_cnt = (u_int)get_bsz(arg);
-	if (!cpy_cnt)
-		terminate(0);
+	cpy_cnt = get_num(arg);
+	if (cpy_cnt < 0)
+		errx(1, "count cannot be negative");
+	if (cpy_cnt == 0)
+		cpy_cnt = -1;
 }

 static void
@@ -216,16 +219,23 @@ f_files(arg)
 	char *arg;
 {

-	files_cnt = (int)get_bsz(arg);
+	files_cnt = get_num(arg);
+	if (files_cnt < 1)
+		errx(1, "files must be between 1 and %qd", QUAD_MAX);
 }

 static void
 f_ibs(arg)
 	char *arg;
 {
+	quad_t res;

-	if (!(ddflags & C_BS))
-		in.dbsz = (int)get_bsz(arg);
+	if (!(ddflags & C_BS)) {
+		res = get_num(arg);
+		if (res < 1 || res > SSIZE_MAX)
+			errx(1, "ibs must be between 1 and %d", SSIZE_MAX);
+		in.dbsz = (size_t)res;
+	}
 }

 static void
@@ -240,9 +250,14 @@ static void
 f_obs(arg)
 	char *arg;
 {
+	quad_t res;

-	if (!(ddflags & C_BS))
-		out.dbsz = (int)get_bsz(arg);
+	if (!(ddflags & C_BS)) {
+		res = get_num(arg);
+		if (res < 1 || res > SSIZE_MAX)
+			errx(1, "obs must be between 1 and %d", SSIZE_MAX);
+		out.dbsz = (size_t)res;
+	}
 }

 static void
@@ -258,7 +273,7 @@ f_seek(arg)
 	char *arg;
 {

-	out.offset = (u_int)get_bsz(arg);
+	out.offset = get_offset(arg);
 }

 static void
@@ -266,13 +281,13 @@ f_skip(arg)
 	char *arg;
 {

-	in.offset = (u_int)get_bsz(arg);
+	in.offset = get_offset(arg);
 }

-static struct conv {
-	char *name;
+static const struct conv {
+	const char *name;
 	u_int set, noset;
-	u_char *ctab;
+	const u_char *ctab;
 } clist[] = {
 	{ "ascii",	C_ASCII,	C_EBCDIC,	e2a_POSIX },
 	{ "block",	C_BLOCK,	C_UNBLOCK,	NULL },
@@ -300,9 +315,9 @@ f_conv(arg)

 	while (arg != NULL) {
 		tmp.name = strsep(&arg, ",");
-		if (!(cp = (struct conv *)bsearch(&tmp, clist,
-		    sizeof(clist)/sizeof(struct conv), sizeof(struct conv),
-		    c_conv)))
+		cp = bsearch(&tmp, clist, sizeof(clist) / sizeof(struct conv),
+		    sizeof(struct conv), c_conv);
+		if (cp == NULL)
 			errx(1, "unknown conversion %s", tmp.name);
 		if (ddflags & cp->noset)
 			errx(1, "%s: illegal conversion combination", tmp.name);
@@ -317,34 +332,38 @@ c_conv(a, b)
 	const void *a, *b;
 {

-	return (strcmp(((struct conv *)a)->name, ((struct conv *)b)->name));
+	return (strcmp(((const struct conv *)a)->name,
+	    ((const struct conv *)b)->name));
 }

 /*
- * Convert an expression of the following forms to an unsigned long.
+ * Convert an expression of the following forms to a quad_t.
 * 	1) A positive decimal number.
- *	2) A positive decimal number followed by a b (mult by 512).
- *	3) A positive decimal number followed by a k (mult by 1024).
- *	4) A positive decimal number followed by a m (mult by 512).
- *	5) A positive decimal number followed by a w (mult by sizeof int)
- *	6) Two or more positive decimal numbers (with/without k,b or w).
- *	   seperated by x (also * for backwards compatibility), specifying
+ *	2) A positive decimal number followed by a b (mult by 512.)
+ *	3) A positive decimal number followed by a k (mult by 1 << 10.)
+ *	4) A positive decimal number followed by a m (mult by 1 << 20.)
+ *	5) A positive decimal number followed by a g (mult by 1 << 30.)
+ *	5) A positive decimal number followed by a w (mult by sizeof int.)
+ *	6) Two or more positive decimal numbers (with/without [bkmgw])
+ *	   separated by x (also * for backwards compatibility), specifying
 *	   the product of the indicated values.
 */
-static u_long
-get_bsz(val)
+static quad_t
+get_num(val)
 	char *val;
 {
-	u_long num, t;
+	quad_t num, t;
 	char *expr;

-	num = strtoul(val, &expr, 0);
-	if (num == ULONG_MAX)			/* Overflow. */
+	errno = 0;
+	num = strtoq(val, &expr, 0);
+	if (errno != 0)				/* Overflow or underflow. */
 		err(1, "%s", oper);
-	if (expr == val)			/* No digits. */
+	
+	if (expr == val)			/* No valid digits. */
 		errx(1, "%s: illegal numeric value", oper);

-	switch(*expr) {
+	switch (*expr) {
 	case 'b':
 		t = num;
 		num *= 512;
@@ -354,14 +373,21 @@ get_bsz(val)
 		break;
 	case 'k':
 		t = num;
-		num *= 1024;
+		num *= 1 << 10;
 		if (t > num)
 			goto erange;
 		++expr;
 		break;
 	case 'm':
 		t = num;
-		num *= 1048576;
+		num *= 1 << 20;
+		if (t > num)
+			goto erange;
+		++expr;
+		break;
+	case 'g':
+		t = num;
+		num *= 1 << 30;
 		if (t > num)
 			goto erange;
 		++expr;
@@ -375,18 +401,31 @@ get_bsz(val)
 		break;
 	}

-	switch(*expr) {
+	switch (*expr) {
 		case '\0':
 			break;
 		case '*':			/* Backward compatible. */
 		case 'x':
 			t = num;
-			num *= get_bsz(expr + 1);
-			if (t > num)
-erange:				errx(1, "%s: %s", oper, strerror(ERANGE));
-			break;
+			num *= get_num(expr + 1);
+			if (t <= num)
+				break;
+erange:
+			errx(1, "%s: %s", oper, strerror(ERANGE));
 		default:
 			errx(1, "%s: illegal numeric value", oper);
 	}
 	return (num);
 }
+
+static off_t
+get_offset(val)
+	char *val;
+{
+	quad_t num;
+
+	num = get_num(val);
+	if (num > QUAD_MAX || num < 0)		/* XXX quad_t != off_t */
+		errx(1, "%s: illegal offset", oper);	/* Too big/negative. */
+	return ((off_t)num);
+}
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: conv.c,v 1.9 1998/05/06 06:51:30 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -60,8 +60,9 @@ static const char rcsid[] =
 void
 def()
 {
-	int cnt;
-	u_char *inp, *t;
+	u_char *inp;
+	const u_char *t;
+	size_t cnt;

 	if ((t = ctab) != NULL)
 		for (inp = in.dbp - (cnt = in.dbrcnt); cnt--; ++inp)
@@ -103,9 +104,11 @@ def_close()
 void
 block()
 {
+	u_char *inp, *outp;
+	const u_char *t;
+	size_t cnt, maxlen;
 	static int intrunc;
-	int ch, cnt, maxlen;
-	u_char *inp, *outp, *t;
+	int ch;

 	/*
 	 * Record truncation can cross block boundaries.  If currently in a
@@ -114,8 +117,8 @@ block()
 	 * left empty.
 	 */
 	if (intrunc) {
-		for (inp = in.db, cnt = in.dbrcnt;
-		    cnt && *inp++ != '\n'; --cnt);
+		for (inp = in.db, cnt = in.dbrcnt; cnt && *inp++ != '\n'; --cnt)
+			;
 		if (!cnt) {
 			in.dbcnt = 0;
 			in.dbp = in.db;
@@ -135,19 +138,19 @@ block()
 	for (inp = in.dbp - in.dbcnt, outp = out.dbp; in.dbcnt;) {
 		maxlen = MIN(cbsz, in.dbcnt);
 		if ((t = ctab) != NULL)
-			for (cnt = 0;
-			    cnt < maxlen && (ch = *inp++) != '\n'; ++cnt)
+			for (cnt = 0; cnt < maxlen && (ch = *inp++) != '\n';
+			    ++cnt)
 				*outp++ = t[ch];
 		else
-			for (cnt = 0;
-			    cnt < maxlen && (ch = *inp++) != '\n'; ++cnt)
+			for (cnt = 0; cnt < maxlen && (ch = *inp++) != '\n';
+			    ++cnt)
 				*outp++ = ch;
 		/*
 		 * Check for short record without a newline.  Reassemble the
 		 * input block.
 		 */
 		if (ch != '\n' && in.dbcnt < cbsz) {
-			memmove(in.db, in.dbp - in.dbcnt, in.dbcnt);
+			(void)memmove(in.db, in.dbp - in.dbcnt, in.dbcnt);
 			break;
 		}

@@ -197,9 +200,9 @@ block_close()
 	 */
 	if (in.dbcnt) {
 		++st.trunc;
-		memmove(out.dbp, in.dbp - in.dbcnt, in.dbcnt);
-		(void)memset(out.dbp + in.dbcnt,
-		    ctab ? ctab[' '] : ' ', cbsz - in.dbcnt);
+		(void)memmove(out.dbp, in.dbp - in.dbcnt, in.dbcnt);
+		(void)memset(out.dbp + in.dbcnt, ctab ? ctab[' '] : ' ',
+		    cbsz - in.dbcnt);
 		out.dbcnt += cbsz;
 	}
 }
@@ -214,8 +217,9 @@ block_close()
 void
 unblock()
 {
-	int cnt;
-	u_char *inp, *t;
+	u_char *inp;
+	const u_char *t;
+	size_t cnt;

 	/* Translation and case conversion. */
 	if ((t = ctab) != NULL)
@@ -227,35 +231,36 @@ unblock()
 	 * spaces.
 	 */
 	for (inp = in.db; in.dbcnt >= cbsz; inp += cbsz, in.dbcnt -= cbsz) {
-		for (t = inp + cbsz - 1; t >= inp && *t == ' '; --t);
+		for (t = inp + cbsz - 1; t >= inp && *t == ' '; --t)
+			;
 		if (t >= inp) {
 			cnt = t - inp + 1;
-			memmove(out.dbp, inp, cnt);
+			(void)memmove(out.dbp, inp, cnt);
 			out.dbp += cnt;
 			out.dbcnt += cnt;
 		}
-		++out.dbcnt;
 		*out.dbp++ = '\n';
-		if (out.dbcnt >= out.dbsz)
+		if (++out.dbcnt >= out.dbsz)
 			dd_out(0);
 	}
 	if (in.dbcnt)
-		memmove(in.db, in.dbp - in.dbcnt, in.dbcnt);
+		(void)memmove(in.db, in.dbp - in.dbcnt, in.dbcnt);
 	in.dbp = in.db + in.dbcnt;
 }

 void
 unblock_close()
 {
-	int cnt;
 	u_char *t;
+	size_t cnt;

 	if (in.dbcnt) {
 		warnx("%s: short input record", in.name);
-		for (t = in.db + in.dbcnt - 1; t >= in.db && *t == ' '; --t);
+		for (t = in.db + in.dbcnt - 1; t >= in.db && *t == ' '; --t)
+			;
 		if (t >= in.db) {
 			cnt = t - in.db + 1;
-			memmove(out.dbp, in.db, cnt);
+			(void)memmove(out.dbp, in.db, cnt);
 			out.dbp += cnt;
 			out.dbcnt += cnt;
 		}
@@ -40,16 +40,13 @@
 static char sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id: conv_tab.c,v 1.7 1998/05/06 06:51:32 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/types.h>

 /*
- * There are currently eight tables:
- *
- *	lower-case	-> upper-case			conv=upper
- *	upper-case	-> lower-case			conv=lower
+ * There are currently six tables:
 *
 *	ebcdic		-> ascii	32V		conv=oldascii
 *	ascii		-> ebcdic	32V		conv=oldebcdic
@@ -72,14 +69,10 @@ static const char rcsid[] =
 * ACM, Volume 11, Number 11, November 1968, pp. 783-789.
 */

-/* Lower-case to upper-case */
-u_char l2u[256];
-
-/* Upper-case to lower-case */
-u_char u2l[256];
+u_char casetab[256];

 /* EBCDIC to ASCII -- 32V compatible. */
-u_char e2a_32V[] = {
+const u_char e2a_32V[] = {
 	0000, 0001, 0002, 0003, 0234, 0011, 0206, 0177,		/* 0000 */
 	0227, 0215, 0216, 0013, 0014, 0015, 0016, 0017,		/* 0010 */
 	0020, 0021, 0022, 0023, 0235, 0205, 0010, 0207,		/* 0020 */
@@ -115,7 +108,7 @@ u_char e2a_32V[] = {
 };

 /* ASCII to EBCDIC -- 32V compatible. */
-u_char a2e_32V[] = {
+const u_char a2e_32V[] = {
 	0000, 0001, 0002, 0003, 0067, 0055, 0056, 0057,		/* 0000 */
 	0026, 0005, 0045, 0013, 0014, 0015, 0016, 0017,		/* 0010 */
 	0020, 0021, 0022, 0023, 0074, 0075, 0062, 0046,		/* 0020 */
@@ -151,7 +144,7 @@ u_char a2e_32V[] = {
 };

 /* ASCII to IBM EBCDIC -- 32V compatible. */
-u_char a2ibm_32V[] = {
+const u_char a2ibm_32V[] = {
 	0000, 0001, 0002, 0003, 0067, 0055, 0056, 0057,		/* 0000 */
 	0026, 0005, 0045, 0013, 0014, 0015, 0016, 0017,		/* 0010 */
 	0020, 0021, 0022, 0023, 0074, 0075, 0062, 0046,		/* 0020 */
@@ -187,7 +180,7 @@ u_char a2ibm_32V[] = {
 };

 /* EBCDIC to ASCII -- POSIX and System V compatible. */
-u_char e2a_POSIX[] = {
+const u_char e2a_POSIX[] = {
 	0000, 0001, 0002, 0003, 0234, 0011, 0206, 0177,		/* 0000 */
 	0227, 0215, 0216, 0013, 0014, 0015, 0016, 0017,		/* 0010 */
 	0020, 0021, 0022, 0023, 0235, 0205, 0010, 0207,		/* 0020 */
@@ -223,7 +216,7 @@ u_char e2a_POSIX[] = {
 };

 /* ASCII to EBCDIC -- POSIX and System V compatible. */
-u_char a2e_POSIX[] = {
+const u_char a2e_POSIX[] = {
 	0000, 0001, 0002, 0003, 0067, 0055, 0056, 0057,		/* 0000 */
 	0026, 0005, 0045, 0013, 0014, 0015, 0016, 0017,		/* 0010 */
 	0020, 0021, 0022, 0023, 0074, 0075, 0062, 0046,		/* 0020 */
@@ -259,7 +252,7 @@ u_char a2e_POSIX[] = {
 };

 /* ASCII to IBM EBCDIC -- POSIX and System V compatible. */
-u_char a2ibm_POSIX[] = {
+const u_char a2ibm_POSIX[] = {
 	0000, 0001, 0002, 0003, 0067, 0055, 0056, 0057,		/* 0000 */
 	0026, 0005, 0045, 0013, 0014, 0015, 0016, 0017,		/* 0010 */
 	0020, 0021, 0022, 0023, 0074, 0075, 0062, 0046,		/* 0020 */
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\"	$Id: dd.1,v 1.7 1998/05/06 06:51:35 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 13, 1994
 .Dt DD 1
@@ -282,10 +282,11 @@ appended.
 .El
 .El
 .Pp
-Where sizes are specified, a decimal number of bytes is expected.
-If the number ends with a ``b'', ``k'', ``m'' or ``w'', the number
-is multiplied by 512, 1024 (1K), 1048576 (1M) or the number of bytes
-in an integer, respectively.
+Where sizes are specified, a decimal, octal, or hexadecimal number of
+bytes is expected.
+If the number ends with a ``b'', ``k'', ``m'', ``g'',  or ``w'', the
+number is multiplied by 512, 1024 (1K), 1048576 (1M), 1073741824 (1G)
+or the number of bytes in an integer, respectively.
 Two or more numbers may be separated by an ``x'' to indicate a product.
 .Pp
 When finished,
@@ -329,10 +330,10 @@ be written to the standard error output
 in the same format as the standard completion message and
 .Nm
 will exit.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
-utility exits 0 on success or >0 if an error occurred.
+utility exits 0 on success or >0 if an error occurs.
 .Sh SEE ALSO
 .Xr cp 1 ,
 .Xr mt 1 ,
@@ -46,11 +46,13 @@ static char const copyright[] =
 static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: dd.c,v 1.14 1998/05/06 06:51:39 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
 #include <sys/stat.h>
+#include <sys/device.h>
+#include <sys/disklabel.h>
 #include <sys/mtio.h>

 #include <ctype.h>
@@ -74,12 +76,12 @@ static void setup __P((void));
 IO	in, out;		/* input/output state */
 STAT	st;			/* statistics */
 void	(*cfunc) __P((void));	/* conversion function */
-u_long	cpy_cnt;		/* # of blocks to copy */
-u_long	pending = 0;		/* pending seek if sparse */
+quad_t	cpy_cnt;		/* # of blocks to copy */
+off_t	pending = 0;		/* pending seek if sparse */
 u_int	ddflags;		/* conversion options */
-u_int	cbsz;			/* conversion block size */
-u_int	files_cnt = 1;		/* # of files to copy */
-u_char	*ctab;			/* conversion table */
+size_t	cbsz;			/* conversion block size */
+quad_t	files_cnt = 1;		/* # of files to copy */
+const	u_char *ctab;		/* conversion table */

 int
 main(argc, argv)
@@ -113,7 +115,7 @@ setup()
 		in.fd = STDIN_FILENO;
 	} else {
 		in.fd = open(in.name, O_RDONLY, 0);
-		if (in.fd < 0)
+		if (in.fd == -1)
 			err(1, "%s", in.name);
 	}

@@ -135,11 +137,11 @@ setup()
 		 * Without read we may have a problem if output also does
 		 * not support seeks.
 		 */
-		if (out.fd < 0) {
+		if (out.fd == -1) {
 			out.fd = open(out.name, O_WRONLY | OFLAGS, DEFFILEMODE);
 			out.flags |= NOREAD;
 		}
-		if (out.fd < 0)
+		if (out.fd == -1)
 			err(1, "%s", out.name);
 	}

@@ -149,14 +151,13 @@ setup()
 	 * Allocate space for the input and output buffers.  If not doing
 	 * record oriented I/O, only need a single buffer.
 	 */
-	if (!(ddflags & (C_BLOCK|C_UNBLOCK))) {
+	if (!(ddflags & (C_BLOCK | C_UNBLOCK))) {
 		if ((in.db = malloc(out.dbsz + in.dbsz - 1)) == NULL)
-			err(1, NULL);
+			err(1, "input buffer");
 		out.db = in.db;
-	} else if ((in.db =
-	    malloc((u_int)(MAX(in.dbsz, cbsz) + cbsz))) == NULL ||
-	    (out.db = malloc((u_int)(out.dbsz + cbsz))) == NULL)
-		err(1, NULL);
+	} else if ((in.db = malloc(MAX(in.dbsz, cbsz) + cbsz)) == NULL ||
+	    (out.db = malloc(out.dbsz + cbsz)) == NULL)
+		err(1, "output buffer");
 	in.dbp = in.db;
 	out.dbp = out.db;

@@ -171,50 +172,34 @@ setup()
 	 * kinds of output files, tapes, for example.
 	 */
 	if ((ddflags & (C_OF | C_SEEK | C_NOTRUNC)) == (C_OF | C_SEEK))
-		(void)ftruncate(out.fd, (off_t)out.offset * out.dbsz);
+		(void)ftruncate(out.fd, out.offset * out.dbsz);

 	/*
 	 * If converting case at the same time as another conversion, build a
 	 * table that does both at once.  If just converting case, use the
 	 * built-in tables.
 	 */
-	if (ddflags & (C_LCASE|C_UCASE))
-		if (ddflags & C_ASCII)
+	if (ddflags & (C_LCASE | C_UCASE)) {
+		if (ddflags & (C_ASCII | C_EBCDIC)) {
 			if (ddflags & C_LCASE) {
 				for (cnt = 0; cnt <= 0377; ++cnt)
-					if (isupper(ctab[cnt]))
-						ctab[cnt] = tolower(ctab[cnt]);
+					casetab[cnt] = tolower(ctab[cnt]);
 			} else {
 				for (cnt = 0; cnt <= 0377; ++cnt)
-					if (islower(ctab[cnt]))
-						ctab[cnt] = toupper(ctab[cnt]);
+					casetab[cnt] = toupper(ctab[cnt]);
 			}
-		else if (ddflags & C_EBCDIC)
+		} else {
 			if (ddflags & C_LCASE) {
 				for (cnt = 0; cnt <= 0377; ++cnt)
-					if (isupper(cnt))
-						ctab[cnt] = ctab[tolower(cnt)];
+					casetab[cnt] = tolower(cnt);
 			} else {
 				for (cnt = 0; cnt <= 0377; ++cnt)
-					if (islower(cnt))
-						ctab[cnt] = ctab[toupper(cnt)];
-			}
-		else {
-			ctab = ddflags & C_LCASE ? u2l : l2u;
-			if (ddflags & C_LCASE) {
-				for (cnt = 0; cnt <= 0377; ++cnt)
-					if (isupper(cnt))
-						ctab[cnt] = tolower(cnt);
-					else
-						ctab[cnt] = cnt;
-			} else {
-				for (cnt = 0; cnt <= 0377; ++cnt)
-					if (islower(cnt))
-						ctab[cnt] = toupper(cnt);
-					else
-						ctab[cnt] = cnt;
+					casetab[cnt] = toupper(cnt);
 			}
 		}
+		ctab = casetab;
+	}
+
 	(void)gettimeofday(&tv, (struct timezone *)NULL);
 	st.start = tv.tv_sec + tv.tv_usec * 1e-6; 
 }
@@ -223,35 +208,59 @@ static void
 getfdtype(io)
 	IO *io;
 {
-	struct mtget mt;
 	struct stat sb;
+	struct disklabel dkl;
+	struct mtget mt;
+	int type;

-	if (fstat(io->fd, &sb))
+	if (fstat(io->fd, &sb) == -1)
 		err(1, "%s", io->name);
-	if (S_ISCHR(sb.st_mode))
-		io->flags |= ioctl(io->fd, MTIOCGET, &mt) ? ISCHR : ISTAPE;
-	else if (lseek(io->fd, (off_t)0, SEEK_CUR) == -1 && errno == ESPIPE)
-		io->flags |= ISPIPE;		/* XXX fixed in 4.4BSD */
+	if (S_ISCHR(sb.st_mode) || S_ISBLK(sb.st_mode)) { 
+		if (ioctl(io->fd, DIOCGDINFO, &dkl) == 0 ||
+		    /* XXX {,k}mem hack: This sucks. */
+		    (major(sb.st_rdev) == 2 &&
+		    (minor(sb.st_rdev) == 0 || minor(sb.st_rdev) == 1)))
+			io->flags |= ISSEEK;
+		else if (ioctl(io->fd, MTIOCGET, &mt) == 0)
+			io->flags |= ISTAPE;
+		if (S_ISCHR(sb.st_mode) && (io->flags & ISTAPE) == 0)
+			io->flags |= ISCHR;
+		return;
+	}
+	errno = 0;
+	if (lseek(io->fd, (off_t)0, SEEK_CUR) == -1 && errno == ESPIPE)
+		io->flags |= ISPIPE;
+	else
+		io->flags |= ISSEEK;
 }

 static void
 dd_in()
 {
-	int n;
+	ssize_t n;

 	for (;;) {
-		if (cpy_cnt && (st.in_full + st.in_part) >= cpy_cnt)
+		switch (cpy_cnt) {
+		case -1:			/* count=0 was specified */
 			return;
+		case 0:
+			break;
+		default:
+			if (st.in_full + st.in_part >= cpy_cnt)
+				return;
+			break;
+		}

 		/*
-		 * Zero the buffer first if sync; If doing block operations
+		 * Zero the buffer first if sync; if doing block operations,
 		 * use spaces.
 		 */
-		if (ddflags & C_SYNC)
-			if (ddflags & (C_BLOCK|C_UNBLOCK))
+		if (ddflags & C_SYNC) {
+			if (ddflags & (C_BLOCK | C_UNBLOCK))
 				memset(in.dbp, ' ', in.dbsz);
 			else
 				memset(in.dbp, 0, in.dbsz);
+		}

 		n = read(in.fd, in.dbp, in.dbsz);
 		if (n == 0) {
@@ -260,7 +269,7 @@ dd_in()
 		}

 		/* Read error. */
-		if (n < 0) {
+		if (n == -1) {
 			/*
 			 * If noerror not specified, die.  POSIX requires that
 			 * the warning message be followed by an I/O display.
@@ -271,12 +280,12 @@ dd_in()
 			summary();

 			/*
-			 * If it's not a tape drive or a pipe, seek past the
+			 * If it's a seekable file descriptor, seek past the
 			 * error.  If your OS doesn't do the right thing for
 			 * raw disks this section should be modified to re-read
 			 * in sector size chunks.
 			 */
-			if (!(in.flags & (ISPIPE|ISTAPE)) &&
+			if (in.flags & ISSEEK &&
 			    lseek(in.fd, (off_t)in.dbsz, SEEK_CUR))
 				warn("%s", in.name);

@@ -329,7 +338,7 @@ dd_in()
 }

 /*
- * Cleanup any remaining I/O and flush output.  If necesssary, output file
+ * Clean up any remaining I/O and flush output.  If necessary, the output file
 * is truncated.
 */
 static void
@@ -342,7 +351,7 @@ dd_close()
 	else if (cfunc == unblock)
 		unblock_close();
 	if (ddflags & C_OSYNC && out.dbcnt && out.dbcnt < out.dbsz) {
-		if (ddflags & (C_BLOCK|C_UNBLOCK))
+		if (ddflags & (C_BLOCK | C_UNBLOCK))
 			memset(out.dbp, ' ', out.dbsz - out.dbcnt);
 		else
 			memset(out.dbp, 0, out.dbsz - out.dbcnt);
@@ -356,9 +365,11 @@ void
 dd_out(force)
 	int force;
 {
-	static int warned;
-	int cnt, n, nw, i, sparse;
 	u_char *outp;
+	size_t cnt, i, n;
+	ssize_t nw;
+	static int warned;
+	int sparse;

 	/*
 	 * Write one or more blocks out.  The common case is writing a full
@@ -395,7 +406,8 @@ dd_out(force)
 				if (pending != 0) {
 					if (force)
 						pending--;
-					if (lseek (out.fd, pending, SEEK_CUR) == -1)
+					if (lseek(out.fd, pending, SEEK_CUR) ==
+					    -1)
 						err(2, "%s: seek error creating sparse file",
 						    out.name);
 					if (force)
@@ -427,13 +439,14 @@ dd_out(force)
 			++st.out_part;
 			if (nw == cnt)
 				break;
+			if (out.flags & ISTAPE)
+				errx(1, "%s: short write on tape device",
+				    out.name);
 			if (out.flags & ISCHR && !warned) {
 				warned = 1;
 				warnx("%s: short write on character device",
 				    out.name);
 			}
-			if (out.flags & ISTAPE)
-				errx(1, "%s: short write on tape device", out.name);
 		}
 		if ((out.dbcnt -= n) < out.dbsz)
 			break;
@@ -441,6 +454,6 @@ dd_out(force)

 	/* Reassemble the output block. */
 	if (out.dbcnt)
-		memmove(out.db, out.dbp - out.dbcnt, out.dbcnt);
+		(void)memmove(out.db, out.dbp - out.dbcnt, out.dbcnt);
 	out.dbp = out.db + out.dbcnt;
 }
@@ -35,42 +35,44 @@
 * SUCH DAMAGE.
 *
 *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- *	$Id: dd.h,v 1.7 1997/10/11 20:09:05 joerg Exp $
+ * $FreeBSD$
 */

 /* Input/output stream state. */
 typedef struct {
-	u_char	*db;			/* buffer address */
-	u_char	*dbp;			/* current buffer I/O address */
-	u_long	dbcnt;			/* current buffer byte count */
-	int	dbrcnt;			/* last read byte count */
-	u_long	dbsz;			/* buffer size */
+	u_char		*db;		/* buffer address */
+	u_char		*dbp;		/* current buffer I/O address */
+	/* XXX ssize_t? */
+	size_t		dbcnt;		/* current buffer byte count */
+	size_t		dbrcnt;		/* last read byte count */
+	size_t		dbsz;		/* buffer size */

 #define	ISCHR		0x01		/* character device (warn on short) */
-#define	ISPIPE		0x02		/* pipe (not truncatable) */
-#define	ISTAPE		0x04		/* tape (not seekable) */
-#define	NOREAD		0x08		/* not readable */
-	u_int	flags;
+#define	ISPIPE		0x02		/* pipe-like (not truncatable) */
+#define	ISTAPE		0x04		/* tape */
+#define	ISSEEK		0x08		/* valid to seek on */
+#define	NOREAD		0x10		/* not readable */
+	u_int		flags;

-	char 	*name;			/* name */
-	int	fd;			/* file descriptor */
-	u_long	offset;			/* # of blocks to skip */
+	char 		*name;		/* name */
+	int		fd;		/* file descriptor */
+	off_t		offset;		/* # of blocks to skip */

-	u_long	f_stats;		/* # of full blocks processed */
-	u_long	p_stats;		/* # of partial blocks processed */
-	u_long	s_stats;		/* # of odd swab blocks */
-	u_long	t_stats;		/* # of truncations */
+	u_quad_t	f_stats;	/* # of full blocks processed */
+	u_quad_t	p_stats;	/* # of partial blocks processed */
+	u_quad_t	s_stats;	/* # of odd swab blocks */
+	u_quad_t	t_stats;	/* # of truncations */
 } IO;

 typedef struct {
-	u_long	in_full;		/* # of full input blocks */
-	u_long	in_part;		/* # of partial input blocks */
-	u_long	out_full;		/* # of full output blocks */
-	u_long	out_part;		/* # of partial output blocks */
-	u_long	trunc;			/* # of truncated records */
-	u_long	swab;			/* # of odd-length swab blocks */
-	u_int64_t	bytes;		/* # of bytes written */
-	double	start; 			/* start time of dd */
+	u_quad_t	in_full;	/* # of full input blocks */
+	u_quad_t	in_part;	/* # of partial input blocks */
+	u_quad_t	out_full;	/* # of full output blocks */
+	u_quad_t	out_part;	/* # of partial output blocks */
+	u_quad_t	trunc;		/* # of truncated records */
+	u_quad_t	swab;		/* # of odd-length swab blocks */
+	u_quad_t	bytes;		/* # of bytes written */
+	double		start; 			/* start time of dd */
 } STAT;

 /* Flags (in ddflags). */
@@ -35,7 +35,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- *	$Id$
+ * $FreeBSD$
 */

 #include <sys/cdefs.h>
@@ -57,10 +57,12 @@ void unblock_close __P((void));
 extern IO in, out;
 extern STAT st;
 extern void (*cfunc)();
-extern u_long cpy_cnt;
-extern u_int cbsz;
+extern quad_t cpy_cnt;
+extern size_t cbsz;
 extern u_int ddflags;
-extern u_int files_cnt;
-extern u_char *ctab;
-extern u_char a2e_32V[], a2e_POSIX[], a2ibm_32V[], a2ibm_POSIX[], e2a_32V[];
-extern u_char e2a_POSIX[], l2u[], u2l[];
+extern quad_t files_cnt;
+extern const u_char *ctab;
+extern const u_char a2e_32V[], a2e_POSIX[];
+extern const u_char e2a_32V[], e2a_POSIX[];
+extern const u_char a2ibm_32V[], a2ibm_POSIX[];
+extern u_char casetab[];
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: misc.c,v 1.14 1998/05/13 07:33:50 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/types.h>
@@ -66,16 +66,16 @@ summary()
 		secs = 1e-6;
 	/* Use snprintf(3) so that we don't reenter stdio(3). */
 	(void)snprintf(buf, sizeof(buf),
-	    "%lu+%lu records in\n%lu+%lu records out\n",
+	    "%qu+%qu records in\n%qu+%qu records out\n",
 	    st.in_full, st.in_part, st.out_full, st.out_part);
 	(void)write(STDERR_FILENO, buf, strlen(buf));
 	if (st.swab) {
-		(void)snprintf(buf, sizeof(buf), "%lu odd length swab %s\n",
+		(void)snprintf(buf, sizeof(buf), "%qu odd length swab %s\n",
 		     st.swab, (st.swab == 1) ? "block" : "blocks");
 		(void)write(STDERR_FILENO, buf, strlen(buf));
 	}
 	if (st.trunc) {
-		(void)snprintf(buf, sizeof(buf), "%lu truncated %s\n",
+		(void)snprintf(buf, sizeof(buf), "%qu truncated %s\n",
 		     st.trunc, (st.trunc == 1) ? "block" : "blocks");
 		(void)write(STDERR_FILENO, buf, strlen(buf));
 	}
@@ -40,13 +40,14 @@
 static char sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: position.c,v 1.7 1998/05/06 06:51:42 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/types.h>
 #include <sys/mtio.h>

 #include <err.h>
+#include <errno.h>
 #include <unistd.h>

 #include "dd.h"
@@ -61,11 +62,16 @@ static const char rcsid[] =
 void
 pos_in()
 {
-	int bcnt, cnt, nr, warned;
+	off_t cnt;
+	int warned;
+	ssize_t nr;
+	size_t bcnt;

-	/* If not a character, pipe or tape device, try to seek on it. */
-	if (!(in.flags & (ISCHR|ISPIPE|ISTAPE))) {
-		if (lseek(in.fd, (off_t)in.offset * in.dbsz, SEEK_CUR) == -1)
+	/* If known to be seekable, try to seek on it. */
+	if (in.flags & ISSEEK) {
+		errno = 0;
+		if (lseek(in.fd, in.offset * in.dbsz, SEEK_CUR) == -1 &&
+		    errno != 0)
 			err(1, "%s", in.name);
 		return;
 	}
@@ -116,7 +122,8 @@ void
 pos_out()
 {
 	struct mtop t_op;
-	int cnt, n;
+	off_t cnt;
+	ssize_t n;

 	/*
 	 * If not a tape, try seeking on the file.  Seeking on a pipe is
@@ -124,8 +131,9 @@ pos_out()
 	 * have specified the seek operand.
 	 */
 	if (!(out.flags & ISTAPE)) {
-		if (lseek(out.fd,
-		    (off_t)out.offset * out.dbsz, SEEK_SET) == -1)
+		errno = 0;
+		if (lseek(out.fd, out.offset * out.dbsz, SEEK_CUR) == -1 &&
+		    errno != 0)
 			err(1, "%s", out.name);
 		return;
 	}
@@ -135,7 +143,7 @@ pos_out()
 		t_op.mt_op = MTFSR;
 		t_op.mt_count = out.offset;

-		if (ioctl(out.fd, MTIOCTOP, &t_op) < 0)
+		if (ioctl(out.fd, MTIOCTOP, &t_op) == -1)
 			err(1, "%s", out.name);
 		return;
 	}
@@ -145,7 +153,7 @@ pos_out()
 		if ((n = read(out.fd, out.db, out.dbsz)) > 0)
 			continue;

-		if (n < 0)
+		if (n == -1)
 			err(1, "%s", out.name);

 		/*
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1997/08/07 21:30:59 steve Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.3 (Berkeley) 5/8/95

 PROG=	df
@@ -8,6 +8,8 @@ BINMODE=2555

 MOUNT=	${.CURDIR}/../../sbin/mount
 CFLAGS+= -I${MOUNT}
+LDADD+= ${LIBM}
+DPADD+= ${LIBM}
 .PATH:	${MOUNT}

 .include <bsd.prog.mk>
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\"	$Id: df.1,v 1.12 1998/05/13 07:35:44 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 8, 1995
 .Dt DF 1
@@ -40,7 +40,11 @@
 .Nd display free disk space
 .Sh SYNOPSIS
 .Nm df
-.Op Fl ikn
+.Oo
+.Fl b | h | H | k |
+.Fl m | P
+.Oc
+.Op Fl in
 .Op Fl t Ar type
 .Op Ar file | Ar filesystem ...
 .Sh DESCRIPTION
@@ -50,7 +54,7 @@ displays statistics about the amount of free disk space on the specified
 or on the filesystem of which
 .Ar file
 is a part.
-Values are displayed in 512-byte per block block counts.
+Values are displayed in 512-byte per block counts.
 If neither a file or a filesystem operand is specified,
 statistics for all mounted filesystems are displayed
 (subject to the
@@ -59,6 +63,19 @@ option below).
 .Pp
 The following options are available:
 .Bl -tag -width Ds
+.It Fl b
+Use 512-byte blocks rather than the default.  Note that
+this overrides the
+.Ev BLOCKSIZE
+specification from the environment.
+.It Fl H
+"Human-readable" output.  Use unit suffixes: Byte, Kilobyte, Megabyte,
+Gigabyte, Terabyte and Petabyte in order to reduce the number of
+digits to three or less using base 10 for sizes.
+.It Fl h
+"Human-readable" output.  Use unit suffixes: Byte, Kilobyte, Megabyte,
+Gigabyte, Terabyte and Petabyte in order to reduce the number of
+digits to three or less using base 2 for sizes.
 .It Fl i
 Include statistics on the number of free inodes.
 .It Fl k
@@ -66,6 +83,11 @@ Use 1024-byte (1-Kbyte) blocks rather than the default.  Note that
 this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
+.It Fl m
+Use 1048576-byte (1-Mbyte) blocks rather than the default.  Note that
+this overrides the
+.Ev BLOCKSIZE
+specification from the environment.
 .It Fl n
 Print out the previously obtained statistics from the filesystems.
 This option should be used if it is possible that one or more
@@ -75,6 +97,11 @@ When this option is specified,
 .Nm
 will not request new statistics from the filesystems, but will respond
 with the possibly stale statistics that were previously obtained.
+.It Fl P
+Use POSIX compliant output of 512-byte blocks rather than the default. 
+Note that this overrides the
+.Ev BLOCKSIZE
+specification from the environment.
 .It Fl t
 Only print out statistics for filesystems of the specified types.
 More than one type may be specified in a comma separated list.
@@ -95,12 +122,9 @@ lists all filesystems except those of type
 and
 .Tn MFS .
 The
-.Xr sysctl 8
+.Xr lsvfs 1
 command can be used to find out the types of filesystems
-that are available on the system:
-.Bd -literal -offset indent
-sysctl vfs
-.Ed
+that are available on the system.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width BLOCKSIZE
@@ -116,6 +140,7 @@ and
 .Fl t
 flags are ignored if a file or filesystem is specified.
 .Sh SEE ALSO
+.Xr lsvfs 1 ,
 .Xr quota 1 ,
 .Xr fstatfs 2 ,
 .Xr getfsstat 2 ,
@@ -123,8 +148,7 @@ flags are ignored if a file or filesystem is specified.
 .Xr getmntinfo 3 ,
 .Xr fstab 5 ,
 .Xr mount 8 ,
-.Xr quot 8 ,
-.Xr sysctl 8
+.Xr quot 8
 .Sh HISTORY
 A
 .Nm
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)df.c	8.9 (Berkeley) 5/8/95";
 #else
 static const char rcsid[] =
-	"$Id: df.c,v 1.19 1997/10/13 09:36:05 joerg Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -59,21 +59,55 @@ static const char rcsid[] =
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sysexits.h>
 #include <unistd.h>

+#define UNITS_SI 1
+#define UNITS_2 2
+
+#define KILO_SZ(n) (n)
+#define MEGA_SZ(n) ((n) * (n))
+#define GIGA_SZ(n) ((n) * (n) * (n))
+#define TERA_SZ(n) ((n) * (n) * (n) * (n))
+#define PETA_SZ(n) ((n) * (n) * (n) * (n) * (n))
+
+#define KILO_2_SZ (KILO_SZ(1024ULL))
+#define MEGA_2_SZ (MEGA_SZ(1024ULL))
+#define GIGA_2_SZ (GIGA_SZ(1024ULL))
+#define TERA_2_SZ (TERA_SZ(1024ULL))
+#define PETA_2_SZ (PETA_SZ(1024ULL))
+
+#define KILO_SI_SZ (KILO_SZ(1000ULL))
+#define MEGA_SI_SZ (MEGA_SZ(1000ULL))
+#define GIGA_SI_SZ (GIGA_SZ(1000ULL))
+#define TERA_SI_SZ (TERA_SZ(1000ULL))
+#define PETA_SI_SZ (PETA_SZ(1000ULL))
+
+unsigned long long vals_si [] = {1, KILO_SI_SZ, MEGA_SI_SZ, GIGA_SI_SZ, TERA_SI_SZ, PETA_SI_SZ};
+unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ};
+unsigned long long *valp;
+
+typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t;
+
+int unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA };
+
 int	  checkvfsname __P((const char *, char **));
 char	**makevfslist __P((char *));
 long	  regetmntinfo __P((struct statfs **, long, char **));
 int	  bread __P((off_t, void *, int));
 char	 *getmntpt __P((char *));
+void	  prthuman __P((struct statfs *, long));
+void	  prthumanval __P((double));
 void	  prtstat __P((struct statfs *, int));
 int	  ufs_df __P((char *, int));
+unit_t	  unit_adjust __P((double *));
 void	  usage __P((void));

-int	iflag, nflag;
+int	hflag, iflag, nflag;
 struct	ufs_args mdev;

 int
@@ -88,13 +122,32 @@ main(argc, argv)
 	char *mntpt, *mntpath, **vfslist;

 	vfslist = NULL;
-	while ((ch = getopt(argc, argv, "iknt:")) != -1)
+	while ((ch = getopt(argc, argv, "bHhikmnPt:")) != -1)
 		switch (ch) {
+		case 'b':
+				/* FALLTHROUGH */
+		case 'P':
+			putenv("BLOCKSIZE=512");
+			hflag = 0;
+			break;
+		case 'H':
+			hflag = UNITS_SI;
+			valp = vals_si;
+			break;
+		case 'h':
+			hflag = UNITS_2;
+			valp = vals_base2;
+			break;
 		case 'i':
 			iflag = 1;
 			break;
 		case 'k':
 			putenv("BLOCKSIZE=1k");
+			hflag = 0;
+			break;
+		case 'm':
+			putenv("BLOCKSIZE=1m");
+			hflag = 0;
 			break;
 		case 'n':
 			nflag = 1;
@@ -130,8 +183,9 @@ main(argc, argv)
 					maxwidth = width;
 			}
 		}
-		for (i = 0; i < mntsize; i++)
+		for (i = 0; i < mntsize; i++) {
 			prtstat(&mntbuf[i], maxwidth);
+		}
 		exit(rv);
 	}

@@ -243,6 +297,61 @@ regetmntinfo(mntbufp, mntsize, vfslist)
 	return (j);
 }

+/*
+ * Output in "human-readable" format.  Uses 3 digits max and puts
+ * unit suffixes at the end.  Makes output compact and easy to read,
+ * especially on huge disks.
+ *
+ */
+unit_t
+unit_adjust(val)
+	double *val;
+{
+	double abval;
+	unit_t unit;
+	unsigned int unit_sz;
+
+	abval = fabs(*val);
+
+	unit_sz = abval ? ilogb(abval) / 10 : 0;
+
+	if (unit_sz >= UNIT_MAX) {
+		unit = NONE;
+	} else {
+		unit = unitp[unit_sz];
+		*val /= (double)valp[unit_sz];
+	}
+
+	return (unit);
+}
+
+void
+prthuman(sfsp, used)
+	struct statfs *sfsp;
+	long used;
+{
+
+	prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize);
+	prthumanval((double)used * (double)sfsp->f_bsize);
+	prthumanval((double)sfsp->f_bavail * (double)sfsp->f_bsize);
+}
+
+void
+prthumanval(bytes)
+	double bytes;
+{
+
+	unit_t unit;
+	unit = unit_adjust(&bytes);
+
+	if (bytes == 0)
+		(void)printf("     0B");
+	else if (bytes > 10)
+		(void)printf(" %5.0f%c", bytes, "BKMGTPE"[unit]);
+	else
+		(void)printf(" %5.1f%c", bytes, "BKMGTPE"[unit]);
+}
+
 /*
 * Convert statfs returned filesystem size into BLOCKSIZE units.
 * Attempts to avoid overflow for large filesystems.
@@ -267,9 +376,16 @@ prtstat(sfsp, maxwidth)
 	if (maxwidth < 11)
 		maxwidth = 11;
 	if (++timesthrough == 1) {
-		header = getbsize(&headerlen, &blocksize);
-		(void)printf("%-*.*s %s     Used    Avail Capacity",
-		    maxwidth, maxwidth, "Filesystem", header);
+		if (hflag) {
+			header = "  Size";
+			headerlen = strlen(header);
+			(void)printf("%-*.*s %-s   Used  Avail Capacity",
+				maxwidth, maxwidth, "Filesystem", header);
+		} else {
+			header = getbsize(&headerlen, &blocksize);
+			(void)printf("%-*.*s %-s     Used    Avail Capacity",
+				maxwidth, maxwidth, "Filesystem", header);
+		}
 		if (iflag)
 			(void)printf(" iused   ifree  %%iused");
 		(void)printf("  Mounted on\n");
@@ -277,10 +393,14 @@ prtstat(sfsp, maxwidth)
 	(void)printf("%-*.*s", maxwidth, maxwidth, sfsp->f_mntfromname);
 	used = sfsp->f_blocks - sfsp->f_bfree;
 	availblks = sfsp->f_bavail + used;
-	(void)printf(" %*ld %8ld %8ld", headerlen,
-	    fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize),
-	    fsbtoblk(used, sfsp->f_bsize, blocksize),
-	    fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize));
+	if (hflag) {
+		prthuman(sfsp, used);
+	} else {
+		(void)printf(" %*ld %8ld %8ld", headerlen,
+	            fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize),
+	            fsbtoblk(used, sfsp->f_bsize, blocksize),
+	            fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize));
+	}
 	(void)printf(" %5.0f%%",
 	    availblks == 0 ? 100.0 : (double)used / (double)availblks * 100.0);
 	if (iflag) {
@@ -376,7 +496,8 @@ bread(off, buf, cnt)
 void
 usage()
 {
+
 	(void)fprintf(stderr,
-	    "usage: df [-ikn] [-t type] [file | filesystem ...]\n");
-	exit(1);
+	    "usage: df [-b | -H | -h | -k | -m | -P] [-ain] [-t type] [file | filesystem ...]\n");
+	exit(EX_USAGE);
 }
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$

 PROG=	domainname

@@ -30,11 +30,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: domainname.1,v 1.5 1997/06/03 06:19:04 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
-.Os "FreeBSD 2.0"
+.Os FreeBSD 2.0
 .Sh NAME
 .Nm domainname
 .Nd set or print name of current YP/NIS domain
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char const sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$

 PROG=	echo

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\"	$Id: echo.1,v 1.5 1997/02/22 14:03:05 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 22, 1993
 .Dt ECHO 1
@@ -60,11 +60,21 @@ achieved by appending `\ec' to the end of the string, as is done
 by iBCS2 compatible systems.
 .El
 .Pp
+Some shells may provide a builtin
+.Nm
+command which is similar or identical to this utility.
+Consult the
+.Xr builtin 1
+manual page.
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
-.Xr printf 1
+.Xr builtin 1 ,
+.Xr csh 1 ,
+.Xr printf 1 ,
+.Xr sh 1
 .Sh STANDARDS
 The
 .Nm
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)echo.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <stdio.h>
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.15 1997/02/22 14:03:08 peter Exp $
+# $FreeBSD$

 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$

 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,
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$

 ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
 any regular expression package that conforms to the POSIX interface
@@ -1,4 +1,4 @@
-/* buf.c: This file contains the scratch-file buffer rountines for the
+/* buf.c: This file contains the scratch-file buffer routines for the
   ed line editor. */
 /*-
 * Copyright (c) 1993 Andrew Moore, Talke Studio.
@@ -31,7 +31,7 @@
 static char * const rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: buf.c,v 1.14 1997/10/09 11:05:16 eivind Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -42,7 +42,7 @@
 static char * const rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: cbc.c,v 1.9 1997/02/22 14:03:12 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -124,7 +124,7 @@ init_des_cipher()
 	/* initialize the initialization vector */
 	MEMZERO(ivec, 8);

-	/* intialize the padding vector */
+	/* initialize the padding vector */
 	srand((unsigned) time((time_t *) 0));
 	for (i = 0; i < 8; i++)
 		CHAR(pvec, i) = (char) (rand()/RAND_DIV);
@@ -1,10 +1,11 @@
-.\"	$Id: ed.1,v 1.13 1998/05/13 07:41:13 charnier Exp $
+.\" $FreeBSD$
 .Dd May 21, 1993
 .Dt ED 1
 .Os
 .Sh NAME
 .\" ed, red \- text editor
-.Nm ed
+.Nm ed ,
+.Nm red
 .Nd text editor
 .Sh SYNOPSIS
 .Nm ed
@@ -115,7 +116,8 @@ default addresses are supplied.
 The following options are available:
 .Bl -tag -width indent
 .It Fl s
-Suppress diagnostics. This should be used if
+Suppress diagnostics.
+This should be used if
 .Nm Ns 's
 standard input is from a script.
 .It Fl x
@@ -174,7 +176,8 @@ This means "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
+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 -tuple
@@ -452,7 +455,8 @@ The current address is set to last line entered.
 .It (.,.)d
 Delete 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
+to this line.
+Otherwise the current address is set to the line
 before the deleted range.
 .It e Ar file
 Edit
@@ -587,7 +591,8 @@ Print the addressed lines along with
 their line numbers.  The current address is set to the last line
 printed.
 .It (.,.)p
-Print the addressed lines. The current address is set to the last line
+Print the addressed lines.
+The current address is set to the last line
 printed.
 .It P
 Toggle the command prompt on and off.
@@ -830,7 +835,8 @@ attempts to write the  buffer if the terminal hangs up
 USD:12-13

 .Rs
-.%A B. W. Kernighan and P. J. Plauger
+.%A B. W. Kernighan
+.%A P. J. Plauger
 .%B Software Tools in Pascal
 .%O Addison-Wesley
 .%D 1981
@@ -25,7 +25,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- *	$Id: ed.h,v 1.11 1997/12/10 22:18:23 eivind Exp $
+ * $FreeBSD$
 */

 #include <sys/param.h>		/* for MAXPATHLEN */
@@ -31,7 +31,7 @@
 static char * const rcsid = "@(#)glob.c,v 1.1 1994/02/01 00:34:40 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: glbl.c,v 1.7 1997/02/22 14:03:15 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -30,7 +30,7 @@
 static char * const rcsid = "@(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: io.c,v 1.8 1997/02/22 14:03:16 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -37,7 +37,7 @@ static char * const copyright =
 static char * const rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: main.c,v 1.12 1997/10/08 14:47:56 eivind Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -175,7 +175,9 @@ top:
 			if (read_file(*argv, 0) < 0 && !isatty(0))
 				quit(2);
 			else if (**argv != '!')
-				strcpy(old_filename, *argv);
+				if (strlcpy(old_filename, *argv, sizeof(old_filename))
+				    >= sizeof(old_filename))
+					quit(2);
 		} else if (argc) {
 			fputs("?\n", stderr);
 			if (**argv == '\0')
@@ -1345,8 +1347,8 @@ strip_escapes(s)
 	int i = 0;

 	REALLOC(file, filesz, MAXPATHLEN + 1, NULL);
-	/* assert: no trailing escape */
-	while ((file[i++] = (*s == '\\') ? *++s : *s))
+	while (i < filesz - 1	/* Worry about a possible trailing escape */
+	       && (file[i++] = (*s == '\\') ? *++s : *s))
 		s++;
 	return file;
 }
@@ -31,7 +31,7 @@
 static char * const rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: re.c,v 1.13 1997/02/22 14:03:18 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */