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-31 04:45:39 +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
9132 changed files with 347630 additions and 126586 deletions
@@ -1,4 +1,4 @@
-# $FreeBSD: src/COPYRIGHT,v 1.2.2.2 1999/09/11 09:22:33 obrien Exp $
+# $FreeBSD$
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94

 All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.222.2.5 1999/08/29 15:55:25 peter Exp $
+# $FreeBSD$
 #
 # The user-driven targets are:
 #
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc0,v 1.14.2.4 1999/08/29 15:55:26 peter 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
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.59.2.7 1999/11/25 20:00:31 julian Exp $
+# $FreeBSD$
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
@@ -183,6 +183,8 @@ 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

@@ -396,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

 #
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.upgrade,v 1.9.2.11 1999/08/29 15:55:27 peter Exp $
+# $FreeBSD$
 #
 # This makefile contains rules for preforming upgrades that are outside
 # the scope of the normal build world process.
@@ -1,6 +1,6 @@
 This is the top level of the FreeBSD source directory.  This file
 was last revised on:
-$FreeBSD: src/README,v 1.14.2.1 1999/08/29 15:55:28 peter Exp $
+$FreeBSD$

 For copyright information, please see the file COPYRIGHT in this
 directory (additional copyright information also exists for some
@@ -35,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,137 +1,6 @@
-Updating Information for FreeBSD current users
+Updating Information for FreeBSD Stable users

-This file is maintained by [email protected].  Please send new entries
-directly to him.  See end of file for further details.
+When updating to 4.x-stable from 3.x-stable, please read src/UPDATING
+after updating to the new sources for important information.

-19990510:
-	Previously, one would define "NOAOUT" to keep from building
-	the legacy a.out bits.  Now one would define "WANT_AOUT" to
-	build them.
-
-19990507:
-	New devstat API requires recompilation of libdevstat, systat,
-	iostat, vmstat and rpc.rstatd.  A new kernel is also required.
-	make world + building a kernel should do all of this.  Any
-	ports that use devstat need to be recompiled as well.
-
-19990424:
-	The 'nlpt' driver has changed names to become the 'lpt' driver.
-	See ppbus(4) or http://www.freebsd.org/~nsouch/ppbus.html
-	for proper configuration details.
-
-19990209:
-	New devstat API requires recompilation of libdevstat, systat,
-	iostat, vmstat and rpc.rstatd.  A new kernel is also required.
-	make world + building a kernel should do all of this.  Any
-	ports that use devstat need to be recompiled as well.
-
-19990125:
-	Linux threads options has gone away (they are now standard in
-	the FreeBSD kernel).  A recompile of all libkvm using programs
-	is in order (or better yet a make world).
-
-19990122:
-	On or about this date there was a small window when the boot
-	blocks had some minor problems which seemed to force one to
-	edit /etc/fstab.  This has been corrected, if you are seeing this
-	problem, please rebuild and reinstall your boot blocks.
-
-19990121:
-	Vinum has changed.  The "vinum read" command has changed.  For
-	updates, please see
-
-http://www.freebsd.org/cgi/getmsg.cgi?fetch=800363+0+current/freebsd-current
-
-	for details.  
-
-19990120:
-	Stable branch created.  You might want to consider using this
-	branch.  It is tagged with RELENG_3.
-
-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.
-
-This file contains a list, in reverse chronologocal order, of major
-breakages in tracking -stable.  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.
-
-Please filter your entries through Warner ([email protected]) so that
-the style, formatting, etc of this file can be maintained.
-
-$FreeBSD: src/UPDATING,v 1.14.2.3 1999/08/29 15:55:29 peter Exp $
+$FreeBSD$
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile,v 1.14.2.1 1999/08/29 14:11:19 peter Exp $
+# $FreeBSD$

 SUBDIR= cat \
 	chio \
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile.inc,v 1.10.2.1 1999/08/29 14:11:20 peter Exp $
+# $FreeBSD$

 BINDIR?=	/bin
 CFLAGS+=	-Wall -Wformat
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/cat/Makefile,v 1.4.2.1 1999/08/29 14:11:23 peter Exp $
+# $FreeBSD$

 PROG=	cat

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\" $FreeBSD: src/bin/cat/cat.1,v 1.8.2.2 1999/08/29 14:11:23 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1995
 .Dt CAT 1
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/bin/cat/cat.c,v 1.13.2.1 1999/08/29 14:11:24 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -1,4 +1,4 @@
-# $FreeBSD: src/bin/chio/Makefile,v 1.3.2.1 1999/08/29 14:11:26 peter 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.
 .\"
-.\" $FreeBSD: src/bin/chio/chio.1,v 1.8.2.2 1999/12/06 04:48:56 kris Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 14, 1998
 .Dt CHIO 1
@@ -38,7 +38,7 @@
 static const char copyright[] =
 	"@(#) Copyright (c) 1996 Jason R. Thorpe.  All rights reserved.";
 static const char rcsid[] =
-  "$FreeBSD: src/bin/chio/chio.c,v 1.9.2.1 1999/12/06 04:48:56 kris Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/bin/chio/defs.h,v 1.1.1.1.4.1 1999/08/29 14:11:27 peter Exp $	*/
+/* $FreeBSD$	*/

 /*
 * Copyright (c) 1996 Jason R. Thorpe <[email protected]>
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/bin/chio/pathnames.h,v 1.1.1.1.4.1 1999/08/29 14:11:28 peter Exp $	*/
+/* $FreeBSD$	*/

 /*
 * Copyright (c) 1996 Jason R. Thorpe <[email protected]>
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/chmod/Makefile,v 1.4.2.1 1999/08/29 14:11:29 peter Exp $
+# $FreeBSD$

 PROG=	chmod

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.10.2.5 1999/08/29 14:11:30 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
@@ -47,6 +47,7 @@
 .Fl f
 .Fl R
 .Op Fl H | Fl L | Fl P
+.Fl v
 .Oc
 .Ar mode
 .Ar file ...
@@ -64,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
@@ -81,6 +83,10 @@ 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
@@ -166,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
@@ -307,6 +312,10 @@ 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 ,
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/bin/chmod/chmod.c,v 1.12.2.2 1999/08/29 14:11:31 peter 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;
@@ -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 [-f -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
-# $FreeBSD: src/bin/cp/Makefile,v 1.5.2.1 1999/08/29 14:11: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
-.\" $FreeBSD: src/bin/cp/cp.1,v 1.11.2.3 1999/12/11 20:33:30 mharo Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt CP 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[] =
-  "$FreeBSD: src/bin/cp/cp.c,v 1.17.2.3 1999/12/11 20:33:31 mharo Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 /*
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- * $FreeBSD: src/bin/cp/extern.h,v 1.7.2.1 1999/08/29 14:11:34 peter Exp $
+ * $FreeBSD$
 */

 typedef struct {
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/bin/cp/utils.c,v 1.21.2.3 1999/12/11 20:33:31 mharo Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -1,4 +1,4 @@
-# $FreeBSD: src/bin/csh/Makefile,v 1.9.2.2 1999/12/10 13:03:00 sheldonh Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD: src/bin/csh/USD.doc/Makefile,v 1.4.2.1 1999/08/29 14:11:56 peter Exp $
+# $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
-.\" $FreeBSD: src/bin/csh/USD.doc/csh.1,v 1.5.2.1 1999/08/29 14:11:56 peter Exp $
+.\" $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
-.\" $FreeBSD: src/bin/csh/USD.doc/csh.2,v 1.5.2.1 1999/08/29 14:11:57 peter Exp $
+.\" $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
-.\" $FreeBSD: src/bin/csh/USD.doc/csh.3,v 1.4.2.1 1999/08/29 14:11:58 peter Exp $
+.\" $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
-.\" $FreeBSD: src/bin/csh/USD.doc/csh.4,v 1.4.2.1 1999/08/29 14:11:58 peter Exp $
+.\" $FreeBSD$
 .\"
 .nr H1 3
 .NH
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD: src/bin/csh/USD.doc/csh.a,v 1.4.2.1 1999/08/29 14:11:59 peter Exp $
+.\" $FreeBSD$
 .\"
 .SH
 Appendix \- Special characters
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD: src/bin/csh/USD.doc/csh.g,v 1.4.2.1 1999/08/29 14:12:00 peter Exp $
+.\" $FreeBSD$
 .\"
 .SH
 Glossary
@@ -30,6 +30,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\" $FreeBSD: src/bin/csh/USD.doc/tabs,v 1.4.2.1 1999/08/29 14:12:00 peter Exp $
+.\" $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[] =
-  "$FreeBSD: src/bin/csh/alloc.c,v 1.9.2.1 1999/08/29 14:11:37 peter 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[] =
-  "$FreeBSD: src/bin/csh/char.c,v 1.5.2.1 1999/08/29 14:11:38 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)char.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/csh/char.h,v 1.4.2.1 1999/08/29 14:11:38 peter Exp $
+ * $FreeBSD$
 */

 #include <ctype.h>
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)const.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD: src/bin/csh/const.c,v 1.7.2.1 1999/08/29 14:11:39 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\" $FreeBSD: src/bin/csh/csh.1,v 1.11.2.4 1999/12/10 13:03:00 sheldonh Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 21, 1994
 .Dt CSH 1
@@ -59,7 +59,7 @@ 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 
@@ -132,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
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)csh.c	8.2 (Berkeley) 10/12/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD: src/bin/csh/csh.c,v 1.13.2.2 1999/08/29 14:11:40 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)csh.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/csh/csh.h,v 1.6.2.2 1999/08/29 14:11:40 peter Exp $
+ * $FreeBSD$
 */

 /*
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dir.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD: src/bin/csh/dir.c,v 1.9.2.1 1999/08/29 14:11:41 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)dir.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/csh/dir.h,v 1.4.2.1 1999/08/29 14:11:42 peter Exp $
+ * $FreeBSD$
 */

 /*
@@ -36,10 +36,11 @@
 static char sccsid[] = "@(#)dol.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD: src/bin/csh/dol.c,v 1.8.2.1 1999/08/29 14:11:42 peter 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[] =
-  "$FreeBSD: src/bin/csh/err.c,v 1.8.2.2 1999/08/29 14:11:43 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD: src/bin/csh/exec.c,v 1.10.2.1 1999/08/29 14:11:44 peter 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[] =
-  "$FreeBSD: src/bin/csh/exp.c,v 1.7.2.1 1999/08/29 14:11:44 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/csh/extern.h,v 1.5.2.1 1999/08/29 14:11:45 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[] =
-  "$FreeBSD: src/bin/csh/file.c,v 1.9.2.1 1999/08/29 14:11:45 peter 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[] =
-  "$FreeBSD: src/bin/csh/func.c,v 1.11.2.2 1999/08/29 14:11:46 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)glob.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD: src/bin/csh/glob.c,v 1.11.2.1 1999/08/29 14:11:46 peter 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[] =
-  "$FreeBSD: src/bin/csh/hist.c,v 1.8.2.1 1999/08/29 14:11:47 peter 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[] =
-  "$FreeBSD: src/bin/csh/init.c,v 1.5.2.1 1999/08/29 14:11:47 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[] =
-  "$FreeBSD: src/bin/csh/lex.c,v 1.10.2.2 1999/08/29 14:11:48 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD: src/bin/csh/misc.c,v 1.8.2.1 1999/08/29 14:11:48 peter 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[] =
-  "$FreeBSD: src/bin/csh/parse.c,v 1.8.2.1 1999/08/29 14:11:49 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/csh/pathnames.h,v 1.5.2.1 1999/08/29 14:11:49 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[] =
-  "$FreeBSD: src/bin/csh/proc.c,v 1.9.2.2 1999/08/29 14:11:50 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)proc.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/csh/proc.h,v 1.4.2.1 1999/08/29 14:11:50 peter Exp $
+ * $FreeBSD$
 */

 /*
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)sem.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD: src/bin/csh/sem.c,v 1.8.2.2 1999/08/29 14:11:51 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)set.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD: src/bin/csh/set.c,v 1.10.2.2 1999/08/29 14:11:51 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)str.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD: src/bin/csh/str.c,v 1.6.2.1 1999/08/29 14:11:52 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[] =
-  "$FreeBSD: src/bin/csh/time.c,v 1.8.2.2 1999/08/29 14:11:53 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/date/Makefile,v 1.7.2.1 1999/08/29 14:12:02 peter 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
-.\" $FreeBSD: src/bin/date/date.1,v 1.26.2.4 1999/12/15 13:57:03 sheldonh Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -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 .
@@ -117,7 +122,9 @@ 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
-Seconds are in the range 0-59, minutes are in the range 0-59, hours are
+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.
@@ -141,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
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/bin/date/date.c,v 1.26.2.4 1999/12/15 13:57:04 sheldonh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/date/extern.h,v 1.4.2.1 1999/08/29 14:12:04 peter Exp $
+ * $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[] =
-  "$FreeBSD: src/bin/date/netdate.c,v 1.10.2.1 1999/08/29 14:12:04 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

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

 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/bin/date/vary.c,v 1.4.2.2 1999/08/29 14:12:05 peter Exp $";
+  "$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,35 +361,39 @@ 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)
+adjsec(struct tm *t, char type, int val, int mk)
 {
  if (val < 0)
    return 0;

  switch (type) {
    case '+':
-      if (!adjmin(t, '+', (t->tm_sec + val) / 60))
-        return 0;
-      val %= 60;
-      t->tm_sec += val;
-      if (t->tm_sec > 59)
-        t->tm_sec -= 60;
+      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 (!adjmin(t, '-', val / 60))
-        return 0;
-      val %= 60;
-      if (val > t->tm_sec) {
-        if (!adjmin(t, '-', 1))
+      if (val) {
+        if (!adjmin(t, '-', val / 60, 0))
          return 0;
-        val -= 60;
+        val %= 60;
+        if (val > t->tm_sec) {
+          if (!adjmin(t, '-', 1, 0))
+            return 0;
+          val -= 60;
+        }
+        t->tm_sec -= val;
      }
-      t->tm_sec -= val;
      break;

    default:
@@ -366,7 +402,7 @@ adjsec(struct tm *t, char type, int val)
      t->tm_sec = val;
  }

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

 const struct vary *
@@ -389,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;
@@ -408,31 +447,35 @@ vary_apply(const struct vary *v, struct tm *t)
      
      switch (which) {
        case 'S':
-          if (!adjsec(t, type, val))
+          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.
 *
- * $FreeBSD: src/bin/date/vary.h,v 1.3.2.1 1999/08/29 14:12:05 peter Exp $
+ * $FreeBSD$
 */

 struct vary {
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/dd/Makefile,v 1.6.2.2 1999/12/12 01:54:02 green Exp $
+# $FreeBSD$

 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/bin/dd/args.c,v 1.13.2.3 1999/12/12 01:54:03 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/types.h>
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/bin/dd/conv.c,v 1.10.2.2 1999/12/12 01:54:03 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/bin/dd/conv_tab.c,v 1.8.2.2 1999/12/12 01:54:04 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/types.h>
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\" $FreeBSD: src/bin/dd/dd.1,v 1.8.2.3 1999/12/12 01:54:04 green Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 13, 1994
 .Dt DD 1
@@ -282,7 +282,8 @@ appended.
 .El
 .El
 .Pp
-Where sizes are specified, a decimal number of bytes is expected.
+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.
@@ -46,7 +46,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/bin/dd/dd.c,v 1.15.2.2 1999/12/12 01:54:04 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -35,7 +35,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD: src/bin/dd/dd.h,v 1.8.2.2 1999/12/12 01:54:05 green Exp $
+ * $FreeBSD$
 */

 /* Input/output stream state. */
@@ -35,7 +35,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- * $FreeBSD: src/bin/dd/extern.h,v 1.4.2.2 1999/12/12 01:54:05 green Exp $
+ * $FreeBSD$
 */

 #include <sys/cdefs.h>
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/bin/dd/misc.c,v 1.15.2.2 1999/12/12 01:54:05 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/types.h>
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/bin/dd/position.c,v 1.8.2.2 1999/12/12 01:54:06 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/types.h>
@@ -1,4 +1,4 @@
-# $FreeBSD: src/bin/df/Makefile,v 1.7.2.1 1999/08/29 14:12:13 peter 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
-.\" $FreeBSD: src/bin/df/df.1,v 1.13.2.3 1999/08/29 14:12:14 peter 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
@@ -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.
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)df.c	8.9 (Berkeley) 5/8/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD: src/bin/df/df.c,v 1.20.2.1 1999/08/29 14:12:15 peter 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 @@
-# $FreeBSD: src/bin/domainname/Makefile,v 1.3.2.1 1999/08/29 14:12:16 peter Exp $
+# $FreeBSD$

 PROG=	domainname

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\" $FreeBSD: src/bin/domainname/domainname.1,v 1.6.2.2 1999/08/29 14:12:17 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
@@ -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[] =
-  "$FreeBSD: src/bin/domainname/domainname.c,v 1.11.2.1 1999/08/29 14:12:18 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/echo/Makefile,v 1.4.2.1 1999/08/29 14:12:19 peter Exp $
+# $FreeBSD$

 PROG=	echo

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\" $FreeBSD: src/bin/echo/echo.1,v 1.6.2.2 1999/08/29 14:12:19 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 22, 1993
 .Dt ECHO 1
@@ -59,12 +59,22 @@ Do not print the trailing newline character.  This may also be
 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[] =
-  "$FreeBSD: src/bin/echo/echo.c,v 1.7.2.1 1999/08/29 14:12:20 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */

 #include <stdio.h>
@@ -1,4 +1,4 @@
-# $FreeBSD: src/bin/ed/Makefile,v 1.16.2.1 1999/08/29 14:12:21 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 @@
-$FreeBSD: src/bin/ed/POSIX,v 1.6.2.1 1999/08/29 14:12:22 peter Exp $
+$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 @@
-$FreeBSD: src/bin/ed/README,v 1.6.2.1 1999/08/29 14:12:22 peter Exp $
+$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
@@ -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 =
-  "$FreeBSD: src/bin/ed/buf.c,v 1.15.2.2 1999/08/29 14:12:23 peter 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 =
-  "$FreeBSD: src/bin/ed/cbc.c,v 1.10.2.2 1999/08/29 14:12:24 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */

@@ -1,10 +1,11 @@
-.\" $FreeBSD: src/bin/ed/ed.1,v 1.14.2.1 1999/08/29 14:12:24 peter 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
- * $FreeBSD: src/bin/ed/ed.h,v 1.12.2.1 1999/08/29 14:12:25 peter 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 =
-  "$FreeBSD: src/bin/ed/glbl.c,v 1.8.2.1 1999/08/29 14:12:26 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 =
-  "$FreeBSD: src/bin/ed/io.c,v 1.9.2.1 1999/08/29 14:12:26 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 =
-  "$FreeBSD: src/bin/ed/main.c,v 1.13.2.1 1999/08/29 14:12:27 peter 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 =
-  "$FreeBSD: src/bin/ed/re.c,v 1.14.2.1 1999/08/29 14:12:28 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */