MFS 1.10.2.5: Unbreak read/write behavior (introduced in previous revision).

Merge from RELENG_4: kern_subr.c 1.31.2.3, procfs_dbregs.c 1.4.2.4,
procfs_fpregs.c 1.11.2.4, procfs_regs.c 1.10.2.4, procfs_rlimit.c 1.5.2.1, procfs_status.c 1.20.2.5, uio.h 1.11.2.2, linprocfs_misc.c 1.3.2.9. Correct several integer underflows/overflows in procfs and linprocfs.
2026-10-31 04:45:39 +01:00 · 2003-10-04 16:14:25 +00:00 · 2003-10-03 13:07:38 +00:00 · 2003-10-02 16:05:44 +00:00 · 2003-09-25 17:09:34 +00:00 · 2003-09-25 13:35:48 +00:00
5802 changed files with 378656 additions and 194108 deletions
@@ -9,6 +9,8 @@
 # world               - buildworld + installworld.
 # buildkernel         - Rebuild the kernel and the kernel-modules.
 # installkernel       - Install the kernel and the kernel-modules.
+# reinstallkernel     - Reinstall the kernel and the kernel-modules.
+# kernel              - buildkernel + installkernel.
 # 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.
@@ -84,8 +86,9 @@
 #
 TGTS=	afterdistribute all buildkernel buildworld checkdpadd clean \
 	cleandepend cleandir depend distribute everything hierarchy includes \
-	install installkernel installmost installworld libraries lint \
-	maninstall mk most obj objlink regress rerelease tags update
+	install installkernel installmost installworld kernel libraries lint \
+	maninstall mk most obj objlink regress reinstallkernel rerelease \
+	tags update

 PATH=	/sbin:/bin:/usr/sbin:/usr/bin
 MAKE=	PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1
@@ -100,6 +103,7 @@ ${TGTS}: upgrade_checks
 # Set a reasonable default
 .MAIN:	all

+STARTTIME!= LC_ALL=C date
 #
 # world
 #
@@ -108,7 +112,7 @@ ${TGTS}: upgrade_checks
 #
 world: upgrade_checks
 	@echo "--------------------------------------------------------------"
-	@echo ">>> ${OBJFORMAT} make world started on `LC_TIME=C date`"
+	@echo ">>> ${OBJFORMAT} make world started on ${STARTTIME}"
 	@echo "--------------------------------------------------------------"
 .if target(pre-world)
 	@echo
@@ -128,7 +132,7 @@ world: upgrade_checks
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo ">>> ${OBJFORMAT} make world completed on `LC_TIME=C date`"
+	@printf ">>> ${OBJFORMAT} make world completed on `LC_ALL=C date`\n                        (started ${STARTTIME})\n"
 	@echo "--------------------------------------------------------------"

 #
@@ -15,10 +15,12 @@
 #	-DNOLIBC_R do not build libc_r.
 #	-DNO_FORTRAN do not build g77 and related libraries.
 #	-DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
+#	-DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
 #	-DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
 #	-DNO_PORTSUPDATE do not update ports in ${MAKE} update
 #	-DNO_DOCUPDATE do not update doc in ${MAKE} update
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
+#	MACHINE_ARCH="machine arch" to crossbuild world to a different arch

 #
 # The intended user-driven targets are:
@@ -129,6 +131,7 @@ WORLDTMP=	${OBJTREE}${.CURDIR}/${BUILD_ARCH}
 # /usr/games added for fortune which depend on strfile
 STRICTTMPPATH=	${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
 TMPPATH=	${STRICTTMPPATH}:${PATH}
+OBJFORMAT_PATH?=	/usr/libexec

 TMPDIR?=	/tmp
 TMPPID!=	echo $$$$
@@ -172,7 +175,8 @@ CROSSENV=	MAKEOBJDIRPREFIX=${OBJTREE} \

 # bootstrap-tool stage
 BMAKEENV=	${BOOTSTRAPENV}
-BMAKE=		${BMAKEENV} ${MAKE} -f Makefile.inc1 -DNOMAN -DNOINFO -DNOHTML
+BMAKE=		${BMAKEENV} ${MAKE} -f Makefile.inc1 -DNOHTML -DNOINFO \
+			-DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED

 # build-tool stage
 TMAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -183,8 +187,9 @@ TMAKE=		${TMAKEENV} ${MAKE} -f Makefile.inc1
 # cross-tool stage
 XMAKEENV=	${BOOTSTRAPENV} \
 		TARGET_ARCH=${MACHINE_ARCH}
-XMAKE=		${XMAKEENV} ${MAKE} -f Makefile.inc1 -DNOMAN -DNOINFO -DNOHTML \
-		-DNO_FORTRAN -DNO_GDB
+XMAKE=		${XMAKEENV} ${MAKE} -f Makefile.inc1 -DNO_FORTRAN -DNO_GDB \
+			-DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE \
+			-DNOSHARED

 # world stage
 WMAKEENV=	${CROSSENV} \
@@ -198,6 +203,10 @@ IMAKEENV=	${CROSSENV} \
 		PATH=${STRICTTMPPATH}:${INSTALLTMP}
 IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1

+# kernel stage
+KMAKEENV=	${WMAKEENV} \
+		OBJFORMAT_PATH=${WORLDTMP}/usr/libexec:${OBJFORMAT_PATH}
+
 USRDIRS=	usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \
 		usr/libexec/${OBJFORMAT} usr/sbin usr/share/misc

@@ -298,7 +307,7 @@ everything:
 #
 installworld:
 	mkdir -p ${INSTALLTMP}
-	for prog in [ awk cat chflags chown date echo egrep find grep \
+	for prog in [ awk cat chflags chmod chown date echo egrep find grep \
 	    install ln make makewhatis mtree mv perl rm sed sh sysctl \
 	    test true uname wc zic; do \
 		cp `which $$prog` ${INSTALLTMP}; \
@@ -331,11 +340,20 @@ reinstall:
 	cd ${.CURDIR}/share/man; ${MAKE} makedb
 .endif

+#
+# distribworld
+#
+# Front-end to distribute to make sure the search path contains
+# the object directory. Needed for miniperl.
+#
+distribworld:
+	cd ${.CURDIR}; PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 distribute
+
 #
 # buildkernel and installkernel
 #
 # Which kernels to build and/or install is specified by setting
-# KERNEL. If not defined a GENERIC kernel is built/installed.
+# KERNCONF. If not defined a GENERIC kernel is built/installed.
 # Only the existing (depending MACHINE) config files are used
 # for building kernels and only the first of these is designated
 # as the one being installed.
@@ -345,7 +363,13 @@ reinstall:
 # be set to cross-build, we have to make sure MACHINE is set
 # properly.

-KERNEL?=	GENERIC
+.if !defined(KERNCONF) && defined(KERNEL)
+KERNCONF=	${KERNEL}
+KERNWARN=	yes
+.else
+KERNCONF?=	GENERIC
+.endif
+INSTKERNNAME?=	kernel

 # The only exotic MACHINE_ARCH/MACHINE combination valid at this
 # time is i386/pc98. In all other cases set MACHINE equal to
@@ -358,13 +382,9 @@ KRNLSRCDIR=	${.CURDIR}/sys
 KRNLCONFDIR=	${KRNLSRCDIR}/${MACHINE}/conf
 KRNLOBJDIR=	${OBJTREE}${KRNLSRCDIR}

-.if !defined(NOCLEAN)
-CONFIGARGS+=	-r
-.endif
-
 BUILDKERNELS=
 INSTALLKERNEL=
-.for _kernel in ${KERNEL}
+.for _kernel in ${KERNCONF}
 .if exists(${KRNLCONFDIR}/${_kernel})
 BUILDKERNELS+=	${_kernel}
 .if empty(INSTALLKERNEL)
@@ -379,27 +399,44 @@ INSTALLKERNEL= ${_kernel}
 # Builds all kernels defined by BUILDKERNELS.
 #
 buildkernel:
+.if empty(BUILDKERNELS)
+	@echo ">>> ERROR: Missing kernel configuration file(s) (${KERNCONF})."
+	@false
+.endif
+.if defined(KERNWARN)
+	@echo "--------------------------------------------------------------"
+	@echo ">>> WARNING: KERNEL= setting should be changed to KERNCONF="
+	@echo "--------------------------------------------------------------"
+	@sleep 3
+.endif
 	@echo
-	@echo "--------------------------------------------------------------"
-	@echo ">>> Rebuilding kernel(s)"
-	@echo "--------------------------------------------------------------"
 .for _kernel in ${BUILDKERNELS}
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Kernel build for ${_kernel} started on `LC_ALL=C date`"
+	@echo "--------------------------------------------------------------"
 	@echo "===> ${_kernel}"
 	mkdir -p ${KRNLOBJDIR}
 .if !defined(NO_KERNELCONFIG)
 	cd ${KRNLCONFDIR}; \
 		PATH=${TMPPATH} \
 		    config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} ${_kernel}
+.endif
+.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN)
+	cd ${KRNLOBJDIR}/${_kernel}; \
+	    ${KMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} clean
 .endif
 	cd ${KRNLOBJDIR}/${_kernel}; \
 		MAKESRCPATH=${KRNLSRCDIR}/dev/aic7xxx/aicasm \
 		    ${MAKE} -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile
 .if !defined(NO_KERNELDEPEND)
 	cd ${KRNLOBJDIR}/${_kernel}; \
-		${WMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=kernel depend
+	    ${KMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} depend
 .endif
 	cd ${KRNLOBJDIR}/${_kernel}; \
-		${WMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=kernel all
+	    ${KMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} all
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
+	@echo "--------------------------------------------------------------"
 .endfor

 #
@@ -409,7 +446,17 @@ buildkernel:
 #
 installkernel:
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
-		${CROSSENV} MACHINE=${MACHINE} ${MAKE} KERNEL=kernel install
+	    ${CROSSENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} install
+reinstallkernel:
+	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
+	    ${CROSSENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} reinstall
+
+#
+# kernel
+#
+# Short hand for `make buildkernel installkernel'
+#
+kernel: buildkernel installkernel

 #
 # update
@@ -442,7 +489,7 @@ update:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; cvs -q update -rRELENG_4 -P -d
+	cd ${.CURDIR}; cvs -q update -rRELENG_4_3 -P -d
 .endif

 #
@@ -532,8 +579,7 @@ _libroken4= kerberosIV/lib/libroken

 .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
    !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
-_libkrb5= kerberos5/lib/libroken kerberos5/lib/libasn1 kerberos5/lib/libhdb \
-	kerberos5/lib/libsl
+_libkrb5= kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
 .endif

 .if !defined(NOPERL)
@@ -541,7 +587,7 @@ _perl=	gnu/usr.bin/perl
 .endif

 build-tools:
-.for _tool in bin/sh ${_games} gnu/usr.bin/cc/cc_tools ${_fortran} \
+.for _tool in bin/csh bin/sh ${_games} gnu/usr.bin/cc/cc_tools ${_fortran} \
    ${_libroken4} ${_libkrb5} lib/libncurses ${_share} ${_perl}
 	cd ${.CURDIR}/${_tool}; ${MAKE} build-tools
 .endfor
@@ -739,8 +785,7 @@ libraries:
    ${_secure_lib} ${_kerberosIV_lib} \
    ${_kerberos5_lib} lib/libcom_err ${_libm} lib/libncurses \
    lib/libopie lib/libradius lib/libskey lib/libtacplus lib/libutil \
-    lib/libz lib gnu/lib \
-    ${_libperl} usr.bin/lex/lib ${_libkeycap}
+    lib/libz lib gnu/lib ${_libperl} usr.bin/lex/lib ${_libkeycap}
 .if exists(${.CURDIR}/${_lib})
 	cd ${.CURDIR}/${_lib}; \
 		${MAKE} depend; \
@@ -6,6 +6,186 @@ chronology since 4.0 was released is included, followed by the common
 items quick how-tos, followed by entries for versions of -current
 prior to 4.0 Release.

+This is for the 4.3 release branch.  All entries since 4.3 are an
+itemized list of commits to this branch, numbered from the beginning.
+By this count, we're at 4.3.0p28.
+
+The security advisories related to various patches contain information
+on how to build/install a minimal set of binaries and start/stop a
+minimal number of processes, if possible, for that patch.  For those
+updates that don't have an advisory, or to be safe, you can do a full
+build and install as described in the COMMON ITEMS section.
+
+20031003:	p42	FreeBSD-SA-03:17.procfs
+	Correct integer underflows/overflows in procfs(5) and linprocfs(5).
+
+20031002:	p41	FreeBSD-SA-03:16.filedesc
+	Correct a reference counting bug in readv(2).
+
+20030924:	p40	FreeBSD-SA-03:14.arp
+	Updated fix for arplookup bug.
+
+20030923:	p39	FreeBSD-SA-03:14.arp
+	Fix a bug in arplookup(), whereby a hostile party on a locally
+	attached network could exhaust kernel memory, and cause a system
+	panic, by sending a flood of spoofed ARP requests.
+
+20030917:	p38	FreeBSD-SA-03:13.sendmail
+	Fix another address parsing buffer overflow.
+
+20030916:	p37	FreeBSD-SA-03:12.openssh
+	Follow-up fixes for OpenSSH oversized packet buffer handling.
+
+20030916:	p36	FreeBSD-SA-03:12.openssh
+	OpenSSH oversized packet buffer handling corrected.
+
+20030810:	p35	FreeBSD-SA-03:10.iBCS2
+	iBCS2 system call translator for statfs leaked information.
+
+20030810:	p34	FreeBSD-SA-03:09.signal
+	Repair range-checking errors in signal handling.
+
+20030804:	p33	FreeBSD-SA-03:08.realpath
+	Correct a single byte buffer overflow in realpath(3).
+
+20030329:	p32	FreeBSD-SA-03:07.sendmail
+	sendmail address parsing buffer overflow.
+
+20030303:	p31	FreeBSD-SA-03:04.sendmail
+	sendmail header parsing buffer overflow, ident parsing bug.
+
+20021026:	p30
+	smrsh bypass bug.
+
+20020710:	p29	FreeBSD-SA-02:28.resolv
+	resolver buffer overflow.
+
+20020307:	p28	FreeBSD-SA-02:13.openssh
+	OpenSSH off-by-one error.
+
+20020223:	p27	FreeBSD-SA-02:18.zlib
+	zlib inflate error handling.
+
+20020127:	p26
+	sdiff temp file handling.
+
+20020127:	p25
+	gzip tempfile handling.
+
+20020123:	p24	FreeBSD-SA-02:08.exec.asc
+	There's a small window in exec where one could debug a setuid
+	program and obtain elevated priviledges.  This was corrected.
+
+20020123:	p23	FreeBSD-SA-02:07.k5su
+	k5su fixes.
+
+20011221:	p22	FreeBSD-SA-02:02:pw
+	A bug was fixed wherein the pw(8) command created a short-lived
+	but world-readable copy of /etc/master.passwd.
+
+20011202:	p21	FreeBSD-SA-01:63:openssh
+	A security hole in OpenSSH involving `UseLogin yes' has been
+	patched.
+
+20010920:	p20
+	Plug login.conf hole.
+
+20010911:	p19
+	semop fixes to prevent overflows.
+
+20010910:	p18	FreeBSD-SA-01:62.uucp
+	UUCP fixes.
+
+20010904:	p17	FreeBSD-SA-01:59.rmuser
+	Minor fix to p16.
+
+20010904:	p16	FreeBSD-SA-01:59.rmuser
+	Close race condition when updating /etc/master.passwd in rmuser.
+
+20010830:	p15	FreeBSD-SA-01:58.lpd
+	Fix lpd remote root exploitable buffer overflow.
+
+20010822:	p14	FreeBSD-SA-01:57.sendmail
+	Fix command line argument overflow problem in sendmail.
+
+20010821:	p13
+	Close the "IRC DCC" security problem.
+
+20010813:	p12	FreeBSD-SA-01:55.procfs
+	procfs permission tightening.
+
+20010810:	p11
+	Check filehandle size when mounting nfs filesystems.
+
+20010805:	p10	FreeBSD-SA-01:52.fragment
+	Prevent DoS attack from bogus fragmented packets.
+
+20010723:	p9	FreeBSD-SA-01:49.telnetd (part 2)
+	Fix a different overflow with output_data and netflush in
+	telnetd.  Make sure that you have both this update and the
+	previous one.
+
+20010721:	p8	FreeBSD-SA-01:49.telnetd (part 1)
+	Fix buffer overflow in telnetd.
+
+20010719:	p7	FreeBSD-SA-01:51.openssl
+	Add PRNG security patch from openssl to prevent guessing of
+	internal state.
+
+20010717:	p6	FreeBSD-SA-01:53.ipfw
+	Fix ipfw "me" definition.
+
+20010710:	p5	FreeBSD-SA-01:42.signal
+	Don't share signal handlers from rfork after exec.
+
+20010708:	p4	FreeBSD-SA-01:48.tcpdump
+	Fix possible tcpdump buffer overflow.
+
+20010704:	p3	FreeBSD-SA-01:56.tcp_wrappers
+	Unbreak paranoid host checking in tcp_wrappers.
+
+20010601:	p2	FreeBSD-SA-01:40.fts (part 2)
+	Fix a second instance of chdir with fts_safe_changedir().
+
+20010530:	p1	FreeBSD-SA-01:40.fts (part 1)
+	Fix to stat after chdir .. in fts to make sure we wind up where
+	we think we should.
+
+20010521:
+	Minor repo damange has happened.  This may cause problems
+	with cvsup of ports.  If you get errors, please see
+	http://www.FreeBSD.org/cgi/query-pr.cgi?pr=27495
+	at the bottom for details on a workaround.  The error message
+	is
+Updater failed: Cannot delete "/usr/ports/www/jakarta-tomcat/files": Directory not empty
+
+20010421:
+	FreeBSD 4.3 RELEASE
+
+20010202:
+	The KERNEL variable for buildkernel and installkernel has been
+	deprecated in favor of KERNCONF.  make kernel now combines these
+	two steps.
+
+20010117:
+	Linksys Fast Ethernet PCCARD cards supported by the ed driver
+	now require the addition of flag 0x80000 to their config line
+	in pccard.conf(5).  This flag is not optional.  These Linksys
+	cards will not be recognized without it.
+
+20010112:
+	Important new FreeBSD-version stuff: PAM support has been worked
+	in, partially from the "Unix" OpenSSH version.  This requires
+	adding the following in pam.conf:
+  
+	sshd    auth    sufficient      pam_skey.so
+	sshd    auth    required        pam_unix.so         try_first_pass
+	sshd    session required        pam_permit.so
+
+20010109:
+	ipfw interface changed.  Make sure that the userland and kernel match
+	or you won't have the firewall rules you think you do.
+
 20001120:
 	FreeBSD 4.2 RELEASE.

@@ -93,7 +273,7 @@ prior to 4.0 Release.

 20000707:
 	We started building modules here.  IF you don't wish to
-	follow the documented proceedure for building kernels, then
+	follow the documented procedure for building kernels, then
 	you'll have to install new mk files from src/share/mk, or
 	define NO_MODULES.

@@ -130,8 +310,8 @@ COMMON ITEMS:
 	# If you have not already done so, please buildworld here
 	# You will also need to update your config file to 4.x.  Usually
 	# people tend to start with GENERIC from 4.x and hack from there.
-	make buildkernel KERNEL=<YOUR_KERNEL_HERE>
-	make installkernel  KERNEL=<YOUR_KERNEL_HERE>
+	make buildkernel KERNCONF=<YOUR_KERNEL_HERE>
+	make installkernel  KERNCONF=<YOUR_KERNEL_HERE>
 	# Verify that the new kernel works, it will be installed as
 	# /kernel

@@ -165,7 +345,7 @@ COMMON ITEMS:
 	<see notes below>				[3]
 	cd /usr/src
 	<see notes below>				[2]
-	make buildworld
+	make buildworld -DNOPERL
 	<follow directions to build/install a kernel>
 	cd /usr/src/sbin/mknod
 	make install
@@ -177,7 +357,7 @@ COMMON ITEMS:
 	make install
 	cd ../../../..
 	ldconfig -R /usr/obj/usr/src/lib/libc
-	make installworld				[5]
+	make installworld -DNOPERL			[5]
 	mergemaster					[4]
 	reboot
 	<multi-user>
@@ -203,8 +383,8 @@ COMMON ITEMS:
 	4.x-STABLE
 	----------
 	make buildworld
-	make buildkernel KERNEL=YOUR_KERNEL_HERE
-	make installkernel KERNEL=YOUR_KERNEL_HERE
+	make buildkernel KERNCONF=YOUR_KERNEL_HERE
+	make installkernel KERNCONF=YOUR_KERNEL_HERE
 	reboot	(in single user) [1]
 	make installworld
 	mergemaster
@@ -42,7 +42,7 @@
 .Nm cat
 .Nd concatenate and print files
 .Sh SYNOPSIS
-.Nm cat
+.Nm
 .Op Fl benstuv
 .Op Ar
 .Sh DESCRIPTION
@@ -90,7 +90,7 @@ Control characters print as
 .Ql ^X
 for control-X; the delete
 character (octal 0177) prints as
-.Ql ^?
+.Ql ^? .
 .Pf Non- Tn ASCII
 characters (with the high bit set) are printed as
 .Ql M-
@@ -45,10 +45,7 @@
 .Op Fl <flags>
 .Ar arg1
 .Ar arg2
-.Oo
-.Ar arg3 Oo ...
-.Oc
-.Oc
+.Op Ar arg3 Op ...
 .Sh DESCRIPTION
 .Nm
 is used to control the operation of medium changers, such as those found
@@ -279,16 +276,19 @@ default changer device
 .El
 .Sh SEE ALSO
 .Xr mt 1 ,
-.Xr mount 8 .
+.Xr mount 8
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 program and SCSI changer driver were written by
 .An Jason R. Thorpe Aq [email protected]
-for And Communications, http://www.and.com/.
-.br
+for And Communications,
+.Pa http://www.and.com/ .
+.Pp
 Additional work by
 .An Hans Huebner
 .Aq [email protected]
-and Steve Gunn
-.Aq [email protected]
+and
+.An Steve Gunn
+.Aq [email protected] .
@@ -42,7 +42,7 @@
 .Nm chmod
 .Nd change file modes
 .Sh SYNOPSIS
-.Nm chmod
+.Nm
 .Oo
 .Fl f
 .Fl R
@@ -50,7 +50,7 @@
 .Fl v
 .Oc
 .Ar mode
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 The
 .Nm
@@ -138,9 +138,11 @@ will run with effective gid set to the gid of the file owner.
 (the sticky bit)  
 When set on a directory, unprivileged users can delete and rename
 only those files in the directory that are owned by them, regardless of 
-the permissions on the directory.  Under FreeBSD, the sticky bit is 
+the permissions on the directory.  Under
+.Fx ,
+the sticky bit is 
 ignored for executable files and may only be set for directories (see 
-.Xr sticky 8 ).
+.Xr sticky 8 ) .
 .It Li 0400
 Allow read by owner.
 .It Li 0200
@@ -187,7 +189,6 @@ The
 .Ar who
 symbol ``a'' is equivalent to ``ugo''.
 .Pp
-.ne 1i
 The
 .Ar perm
 symbols represent the portions of the mode bits as follows:
@@ -335,11 +336,9 @@ utility is expected to be
 .St -p1003.2
 compatible with the exception of the
 .Ar perm
-symbols
+symbol
 .Dq t
-and
-.Dq X
-which are not included in that standard.
+which is not included in that standard.
 .Sh HISTORY
 A
 .Nm
@@ -42,7 +42,7 @@
 .Nm cp
 .Nd copy files
 .Sh SYNOPSIS
-.Nm cp
+.Nm
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
@@ -50,7 +50,7 @@
 .Op Fl f | i
 .Op Fl pv
 .Ar source_file target_file
-.Nm cp
+.Nm
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
@@ -102,6 +102,16 @@ indirected through, and for
 to create special files rather than copying them as normal files.
 Created directories have the same mode as the corresponding source
 directory, unmodified by the process' umask.
+.Pp
+Note that
+.Nm
+copies hard linked files as separate files.
+If you need to preserve hard links, consider using
+.Xr tar 1 ,
+.Xr cpio 1 ,
+or
+.Xr pax 1
+instead.
 .It Fl f
 For each existing destination pathname, remove it and
 create a new file, without prompting for confirmation
@@ -11,12 +11,12 @@ TCSHDIR= ${.CURDIR}/../../contrib/tcsh

 PROG=	csh
 SUBDIR= nls
-DFLAGS=	-D_PATH_TCSHELL='"${DESTDIR}/bin/${PROG}"'  
-CFLAGS+= -I${TCSHDIR} -I${.CURDIR} -I. ${DFLAGS}
+DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"'
+CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS}
 SRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
 	sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \
 	sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \
-	sh.set.c sh.time.c sh.h sh.char.h sh.dir.h sh.proc.h
+	sh.set.c sh.time.c sh.char.h sh.dir.h sh.proc.h sh.h
 SRCS+=	sh.decls.h glob.c glob.h mi.termios.c mi.wait.h mi.varargs.h
 SRCS+=	tw.decls.h tw.h tw.help.c tw.init.c tw.parse.c tw.spell.c \
 	tw.comp.c tw.color.c
@@ -26,8 +26,7 @@ SRCS+=	tc.alloc.c tc.bind.c tc.const.c tc.decls.h tc.disc.c \
 	tc.func.c tc.os.c tc.os.h tc.printf.c tc.prompt.c \
 	tc.sched.c tc.sig.c tc.sig.h tc.str.c sh.types.h tc.vers.c tc.wait.h \
 	tc.who.c tc.h
-SRCS+=	tc.defs.c
-GENHDRS= ed.defns.h sh.err.h tc.const.h
+GENHDRS= ed.defns.h sh.err.h tc.const.h tc.defs.c
 SRCS+=	${GENHDRS}

 MAN1=	csh.1
@@ -41,11 +40,22 @@ LDADD=	-ltermcap -lcrypt

 LINKS=	${BINDIR}/csh ${BINDIR}/tcsh

-CLEANFILES= ${GENHDRS} csh.1
+CLEANFILES= ${GENHDRS} gethost csh.1

 csh.1: tcsh.man
 	ln -sf ${.ALLSRC} ${.TARGET}

+build-tools: gethost
+
+gethost: gethost.c sh.err.h tc.const.h sh.h
+	@rm -f ${.TARGET}
+	${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${TCSHDIR}/gethost.c
+
+tc.defs.c: gethost ${.CURDIR}/host.defs
+	@rm -f ${.TARGET}
+	@echo "/* Do not edit this file, make creates it */" > ${.TARGET}
+	./gethost ${.CURDIR}/host.defs >> ${.TARGET}
+
 ed.defns.h: ed.defns.c
 	@rm -f ${.TARGET}
 	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
@@ -59,7 +69,7 @@ sh.err.h: sh.err.c
 	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
 	@echo '#ifndef _h_sh_err' >> ${.TARGET}
 	@echo '#define _h_sh_err' >> ${.TARGET}
-	egrep 'ERR_' ${.ALLSRC} | egrep '^#define' >> ${.TARGET}
+	grep 'ERR_' ${.ALLSRC} | grep '^#define' >> ${.TARGET}
 	@echo '#endif /* _h_sh_err */' >> ${.TARGET}

 tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
@@ -67,7 +77,7 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
 	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
 	@echo '#ifndef _h_tc_const' >> ${.TARGET}
 	@echo '#define _h_tc_const' >> ${.TARGET}
-	${CC} -E ${CFLAGS} ${.ALLSRC} -D_h_tc_const | egrep 'Char STR' | \
+	${CC} -E ${CFLAGS} ${.ALLSRC} -D_h_tc_const | grep 'Char STR' | \
 	    sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
 	    sort >> ${.TARGET}
 	@echo '#endif /* _h_tc_const */' >> ${.TARGET}
@@ -57,7 +57,7 @@ Syntactic metacharacters
 Filename metacharacters
 .DS
 /	1.6	separates components of a file's pathname
-\.	1.6	separates root parts of a file name from extensions
+\&.	1.6	separates root parts of a file name from extensions
 ?	1.6	expansion character matching any single character
 *	1.6	expansion character matching any sequence of characters
 [ ]	1.6	expansion sequence matching any single character from a set
@@ -135,7 +135,7 @@
 /*
 * _PATH_TCSHELL      if you've change the installation location (vix)
 */
-# ifdef _BSDI_VERSION >= 199701
+# if _BSDI_VERSION >= 199701
 #  define _PATH_TCSHELL "/bin/tcsh"
 /* #  undef SYSMALLOC */
 #  define SYSMALLOC
@@ -1,8 +1,5 @@
 # $FreeBSD$

-SUBDIR= finnish french ja german italian spanish
-
-# We are not ready for greek yet
-#SUBDIR+= greek
+SUBDIR= finnish french german greek italian ja spanish ukrainian

 .include <bsd.subdir.mk>
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+NL=     ukrainian
+DL=     uk_UA.KOI8-U
+
+.PATH: ${BASESRC}/${NL}
+
+tcsh.msg: set[0-9]*
+	cat ${BASESRC}/${NL}/set[0-9] \
+	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
+
+install:
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
+
+.include <bsd.prog.mk>
@@ -42,22 +42,32 @@
 .Nm date
 .Nd display or set date and time
 .Sh SYNOPSIS
-.Nm date
+.Nm
 .Op Fl jnu
 .Op Fl d Ar dst
 .Op Fl r Ar seconds
 .Op Fl t Ar minutes_west
 .Oo
 .Fl v
-.Op +|- Ns
-.No val Ns Op ymwdHMS
-.Oc Ns ...
-.Oo Fl f No " "
-.Ar fmt date No |
-.Oo Oo Oo Oo Oo "\&cc" Ns
-.Oc "\&yy" Oc "\&mm" Oc "\&dd" Oc "\&HH" Ns
+.Sm off
+.Op Cm + | - Xo
+.Ar val Op Ar ymwdHMS
+.Xc
+.Sm on
 .Oc
-.No "\&MM" Ns Op "\&.ss"
+.Ar ...\&
+.Oo
+.Fl f
+.Ar fmt date |
+.Sm off
+.Oo Oo Oo Oo Oo
+.Ar cc Oc
+.Ar yy Oc
+.Ar mm Oc
+.Ar dd Oc
+.Ar HH Oc
+.Ar MM Op Ar .ss
+.Sm on
 .Oc
 .Op Cm + Ns Ar format
 .Sh DESCRIPTION
@@ -68,7 +78,11 @@ Otherwise, depending on the options specified,
 .Nm
 will set the date and time or print it in a user-defined way.
 .Pp
-Only the superuser may set the date.
+Only the superuser may set the date,
+and if the system securelevel (see
+.Xr securelevel 8 )
+is greater than 1,
+the time may not be changed by more than 1 second.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
@@ -84,14 +98,18 @@ will return a non-zero for
 .It Fl f
 Use
 .Ar fmt
-as the format string to parse the date provided rather than using
-the default
-.\" .Ar [[[[[cc]yy]mm]dd]HH]MM[.ss]
-.Xo
-.Oo Oo Oo Oo Oo "\&cc" Ns
-.Oc "\&yy" Oc "\&mm" Oc "\&dd" Oc "\&HH" Ns
-.Oc
-.No "\&MM" Ns Op "\&.ss" Xc
+as the format string to parse the
+.Ar date
+provided rather than using the default
+.Sm off
+.Oo Oo Oo Oo Oo
+.Ar cc Oc
+.Ar yy Oc
+.Ar mm Oc
+.Ar dd Oc
+.Ar HH
+.Oc Ar MM Op Ar .ss
+.Sm on
 format.
 Parsing is done using
 .Xr strptime 3 .
@@ -315,7 +333,7 @@ sets the time to
 without modifying the date.
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
-.Nm Ns :
+.Nm :
 .Bl -tag -width Ds
 .It Ev TZ
 The timezone to use when displaying dates.
@@ -29,6 +29,7 @@ static const char rcsid[] =
  "$FreeBSD$";
 #endif /* not lint */

+#include <err.h>
 #include <time.h>
 #include <string.h>
 #include <stdlib.h>
@@ -93,7 +94,8 @@ vary_append(struct vary *v, char *arg)
  } else
    nextp = &result;

-  *nextp = (struct vary *)malloc(sizeof(struct vary));
+  if ((*nextp = (struct vary *)malloc(sizeof(struct vary))) == NULL)
+    err(1, "malloc");
  (*nextp)->arg = arg;
  (*nextp)->next = NULL;
  return result;
@@ -428,7 +428,7 @@ get_offset(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. */
+	if (num > QUAD_MAX)	/* XXX can't happen && quad_t != off_t */
+		errx(1, "%s: illegal offset", oper);	/* Too big. */
 	return ((off_t)num);
 }
@@ -42,7 +42,7 @@
 .Nm dd
 .Nd convert and copy a file
 .Sh SYNOPSIS
-.Nm dd
+.Nm
 .Op operands ...
 .Sh DESCRIPTION
 The
@@ -251,7 +251,7 @@ will be positioned past the block in which the error occurred using
 Do not truncate the output file.
 This will preserve any blocks in the output file not explicitly written
 by
-.Nm Ns .
+.Nm .
 The
 .Cm notrunc
 value is not supported for tapes.
@@ -54,6 +54,7 @@ static const char rcsid[] =
 #include <sys/conf.h>
 #include <sys/disklabel.h>
 #include <sys/filio.h>
+#include <sys/time.h>

 #include <ctype.h>
 #include <err.h>
@@ -76,6 +76,10 @@ pos_in()
 		return;
 	}

+	/* Don't try to read a really weird amount (like negative). */
+	if (in.offset < 0)
+		errx(1, "%s: illegal offset", "iseek/skip");
+
 	/*
 	 * Read the data.  If a pipe, read until satisfy the number of bytes
 	 * being skipped.  No differentiation for reading complete and partial
@@ -138,6 +142,10 @@ pos_out()
 		return;
 	}

+	/* Don't try to read a really weird amount (like negative). */
+	if (out.offset < 0)
+		errx(1, "%s: illegal offset", "oseek/seek");
+
 	/* If no read access, try using mtio. */
 	if (out.flags & NOREAD) {
 		t_op.mt_op = MTFSR;
@@ -39,14 +39,14 @@
 .Nm df
 .Nd display free disk space
 .Sh SYNOPSIS
-.Nm df
+.Nm
 .Oo
 .Fl b | h | H | k |
 .Fl m | P
 .Oc
 .Op Fl ain
 .Op Fl t Ar type
-.Op Ar file | Ar filesystem ...
+.Op Ar file | filesystem ...
 .Sh DESCRIPTION
 .Nm Df
 displays statistics about the amount of free disk space on the specified
@@ -34,12 +34,12 @@
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
-.Os FreeBSD 2.0
+.Os FreeBSD
 .Sh NAME
 .Nm domainname
 .Nd set or print name of current YP/NIS domain
 .Sh SYNOPSIS
-.Nm domainname
+.Nm
 .Op Ar ypdomain
 .Sh DESCRIPTION
 .Nm Domainname
@@ -60,6 +60,6 @@ convenience.
 The
 .Nm 
 command appeared in
-.Tn FreeBSD
+.Fx
 1.1, based on a similar command in
 .Tn SunOS .
@@ -42,21 +42,26 @@
 .Nm echo
 .Nd write arguments to the standard output
 .Sh SYNOPSIS
-.Nm echo
+.Nm
 .Op Fl n
-.Op "string ..."
+.Op Ar string ...
 .Sh DESCRIPTION
 The
 .Nm
-utility writes any specified operands, separated by single blank (`` '')
-characters and followed by a newline (``\en'') character, to the standard
+utility writes any specified operands, separated by single blank
+.Pq Ql "\ "
+characters and followed by a newline
+.Pq Ql \en
+character, to the standard
 output.
 .Pp
 The following option is available:
 .Bl -tag -width flag
 .It Fl n
 Do not print the trailing newline character.  This may also be
-achieved by appending `\ec' to the end of the string, as is done
+achieved by appending
+.Ql \ec
+to the end of the string, as is done
 by iBCS2 compatible systems.
 .El
 .Pp
@@ -8,7 +8,7 @@
 .Nm red
 .Nd text editor
 .Sh SYNOPSIS
-.Nm ed
+.Nm
 .Op Fl
 .Op Fl sx
 .Op Fl p Ar string
@@ -25,7 +25,7 @@ files.
 .\" .BR ed :
 .\" it can only edit files in the current
 .\" directory and cannot execute shell commands.
-
+.Pp
 If invoked with a
 .Ar file
 argument, then a copy of
@@ -35,11 +35,11 @@ Changes are made to this copy and not directly to
 .Ar file
 itself.
 Upon quitting
-.Nm Ns ,
+.Nm ,
 any changes not explicitly saved  with a
 .Em w
 command are lost.
-
+.Pp
 Editing is done in two distinct modes:
 .Em command
 and
@@ -81,7 +81,7 @@ including a
 character.
 Input mode is terminated by
 entering a single period
-.Pf ( Em . Ns )
+.Pq Em .\&
 on a line.
 .Pp
 All
@@ -104,8 +104,9 @@ character command and possibly additional parameters; i.e.,
 commands have the structure:
 .Pp
 .Sm off
-.Xo Op "address\ "  Op ,address
-.No command Op parameters
+.Xo
+.Op Ar address Op , Ar address
+.Ar command Op Ar parameters
 .Xc
 .Sm on
 .Pp
@@ -185,7 +186,7 @@ of addresses is given where
 .Em "n\ >\ 2" ,
 then the corresponding range is determined by the last two addresses in
 the
-.Em n Ns -tuple.
+.Em n Ns -tuple .
 If only one address is expected, then the last address is used.
 .Pp
 Each address in a comma-delimited range is interpreted relative to the
@@ -310,11 +311,11 @@ The following literal expressions can also be used in
 .Em char-class
 to specify sets of characters:
 .Pp
-\ \ [:alnum:]\ \ [:cntrl:]\ \ [:lower:]\ \ [:space:]
-.PD 0
-\ \ [:alpha:]\ \ [:digit:]\ \ [:print:]\ \ [:upper:]
-.PD 0
-\ \ [:blank:]\ \ [:graph:]\ \ [:punct:]\ \ [:xdigit:]
+.Bl -column "[:alnum:]" "[:cntrl:]" "[:lower:]" "[:xdigit:]" -compact
+.It [:alnum:] Ta [:cntrl:] Ta [:lower:] Ta [:space:]
+.It [:alpha:] Ta [:digit:] Ta [:print:] Ta [:upper:]
+.It [:blank:] Ta [:graph:] Ta [:punct:] Ta [:xdigit:]
+.El
 .Pp
 If `-' appears as the first or last
 character of
@@ -328,12 +329,16 @@ Patterns in
 .Em char-class
 of the form:
 .Pp
-\ \ [.\fIcol-elm\fR.] or,
-.PD 0
-\ \ [=\fIcol-elm\fR=]
+.Bl -item -compact -offset 2n
+.It
+.Op \&. Ns Ar col-elm Ns .\&
+or,
+.It
+.Op = Ns Ar col-elm Ns =
+.El
 .Pp
 where
-.Em col-elm
+.Ar col-elm
 is a
 .Em collating element
 are interpreted according to
@@ -373,7 +378,7 @@ Define a subexpression
 .Em re .
 Subexpressions may be nested.
 A subsequent backreference of the form
-.Em Pf \e n ,
+.Pf \e Em n ,
 where
 .Em n
 is a number in the range [1,9], expands to the text matched by the
@@ -423,7 +428,7 @@ commands are single characters, though some require additional parameters.
 If a command's parameters extend over several lines, then
 each line except for the last
 must be terminated with a backslash (\\).
-
+.Pp
 In general, at most one command is allowed per line.
 However, most commands accept a print suffix, which is any of
 .Em p
@@ -434,10 +439,10 @@ or
 .Em n
 (enumerate),
 to print the last line affected by the command.
-
+.Pp
 An interrupt (typically ^C) has the effect of aborting the current command
 and returning the editor to command mode.
-
+.Pp
 .Nm Ed
 recognizes the following commands.  The commands are shown together with
 the default address or address range supplied if none is
@@ -601,7 +606,7 @@ Unless a prompt was specified by with command-line option
 the command prompt is by default turned off.
 .It q
 Quit
-.Nm Ns .
+.Nm .
 .It Q
 Quit
 .Nm
@@ -831,9 +836,8 @@ attempts to write the  buffer if the terminal hangs up
 .Xr sh 1 ,
 .Xr vi 1 ,
 .Xr regex 3
-
+.Pp
 USD:12-13
-
 .Rs
 .%A B. W. Kernighan
 .%A P. J. Plauger
@@ -841,7 +845,6 @@ USD:12-13
 .%O Addison-Wesley
 .%D 1981
 .Re
-
 .Sh LIMITATIONS
 .Nm Ed
 processes
@@ -849,16 +852,15 @@ processes
 arguments for backslash escapes, i.e.,  in a filename,
 any characters preceded by a backslash (\\) are
 interpreted literally.
-
+.Pp
 If a text (non-binary) file is not terminated by a newline character,
 then
 .Nm
 appends one on reading/writing it.  In the case of a binary file,
 .Nm
 does not append a newline on reading/writing.
-
+.Pp
 per line overhead: 4 ints
-
 .Sh DIAGNOSTICS
 When an error occurs,
 .Nm
@@ -868,7 +870,7 @@ An explanation of the last error can be
 printed with the
 .Em h
 (help) command.
-
+.Pp
 Since the 
 .Em g
 (global) command  masks any errors from failed searches and substitutions,
@@ -890,7 +892,7 @@ If the
 .Em u
 (undo) command occurs in a global command list, then
 the command list is executed only once.
-
+.Pp
 If diagnostics are not disabled, attempting to quit
 .Nm
 or edit another file before writing a modified buffer
@@ -35,6 +35,8 @@ static char * const rcsid =
 #endif
 #endif /* not lint */

+#include <sys/types.h>
+
 #include <sys/ioctl.h>
 #include <sys/wait.h>

@@ -57,6 +57,8 @@ static char * const rcsid =
 *
 */

+#include <sys/types.h>
+
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <ctype.h>
@@ -101,7 +103,7 @@ int lineno;			/* script line number */
 char *prompt;			/* command-line prompt */
 char *dps = "*";		/* default command-line prompt */

-char *usage = "usage: %s [-] [-sx] [-p string] [name]\n";
+const char usage[] = "usage: %s [-] [-sx] [-p string] [name]\n";

 /* ed: line editor */
 int
@@ -37,7 +37,7 @@
 .Nm expr
 .Nd evaluate expression
 .Sh SYNOPSIS
-.Nm expr
+.Nm
 .Ar expression
 .Sh DESCRIPTION
 The
@@ -77,7 +77,7 @@ Return the results of addition or subtraction of integer-valued arguments.
 Return the results of multiplication, integer division, or remainder of integer-valued arguments.
 .It Ar expr1 Li : Ar expr2
 The 
-.Dq \:
+.Dq \&:
 operator matches 
 .Ar expr1 
 against 
@@ -39,7 +39,7 @@
 .Nm hostname
 .Nd set or print name of current host system
 .Sh SYNOPSIS
-.Nm hostname
+.Nm
 .Op Fl s
 .Op Ar name-of-host
 .Sh DESCRIPTION
@@ -42,18 +42,18 @@
 .Nm kill
 .Nd terminate or signal a process
 .Sh SYNOPSIS
-.Nm kill
+.Nm
 .Op Fl s Ar signal_name
 .Ar pid
 \&...
-.Nm kill
+.Nm
 .Fl l
 .Op Ar exit_status
-.Nm kill
+.Nm
 .Fl signal_name
 .Ar pid
 \&...
-.Nm kill
+.Nm
 .Fl signal_number
 .Ar pid
 \&...
@@ -43,11 +43,11 @@
 .Nm link
 .Nd make links
 .Sh SYNOPSIS
-.Nm ln
+.Nm
 .Op Fl fisv
 .Ar source_file
 .Op target_file
-.Nm ln
+.Nm
 .Op Fl fisv
 .Ar source_file ...
 .Op target_dir
@@ -80,7 +80,7 @@ exceeded.)
 .Pp
 There are three separate areas that need to be discussed.
 They are as follows:
-.sp
+.Pp
 .Bl -enum -compact -offset indent
 .It
 Symbolic links used as file name arguments for system calls.
@@ -102,17 +102,18 @@ For example, if there were a symbolic link
 which pointed to a file named
 .Dq Li afile ,
 the system call
-.Dq Li open("slink" ...)
+.Dq Li open("slink" ...\&)
 would return a file descriptor to the file
 .Dq afile .
 .Pp
-There are five system calls that do not follow links, and which operate
+There are six system calls that do not follow links, and which operate
 on the symbolic link itself.
 They are:
 .Xr lchown 2 ,
 .Xr lstat 2 ,
 .Xr readlink 2 ,
 .Xr rename 2 ,
+.Xr rmdir 2 ,
 and
 .Xr unlink 2 .
 Because
@@ -120,6 +121,10 @@ Because
 is an alias for
 .Xr unlink 2 ,
 it also does not follow symbolic links.
+When
+.Xr rmdir 2
+is applied to a symbolic link, it fails with the error
+.Er ENOTDIR .
 .Pp
 The owner and group of an existing symbolic link can be changed by
 means of the
@@ -42,9 +42,9 @@
 .Nm ls
 .Nd list directory contents
 .Sh SYNOPSIS
-.Nm ls
+.Nm
 .Op Fl ABCFGHLPRTWabcdfgiklnoqrstu1
-.Op Ar file ...
+.Op Ar
 .Sh DESCRIPTION
 For each operand that names a
 .Ar file
@@ -72,9 +72,9 @@ The following options are available:
 .Bl -tag -width indent
 .It Fl A
 List all entries except for
-.Ql \&.
+.Ql .\&
 and
-.Ql \&.. .
+.Ql .. .
 Always set for the super-user.
 .It Fl B
 Force printing of non-graphic characters in file names as \\xxx,
@@ -217,7 +217,7 @@ options all override each other; the last one specified determines
 the format used for non-printable characters.
 .Pp
 The
-.Fl H,
+.Fl H ,
 .Fl L
 and
 .Fl P
@@ -364,7 +364,7 @@ The
 utility exits 0 on success, and >0 if an error occurs.
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
-.Nm Ns :
+.Nm :
 .Bl -tag -width BLOCKSIZE
 .It Ev BLOCKSIZE
 If the environment variable
@@ -431,7 +431,7 @@ for more information.
 .It Ev LSCOLORS
 The value of this variable describes what color to use for which
 attribute when colors are enabled with
-.Ev CLICOLOR.
+.Ev CLICOLOR .
 This string is a concatenation of pairs of the format
 .Sy fb ,
 where
@@ -542,4 +542,4 @@ function is expected to be a superset of the
 specification.
 .Sh BUGS
 To maintain backward compatibility, the relationships between the many
-options is quite complex.
+options are quite complex.
@@ -42,7 +42,7 @@
 .Nm mkdir
 .Nd make directories
 .Sh SYNOPSIS
-.Nm mkdir
+.Nm
 .Op Fl pv
 .Op Fl m Ar mode
 .Ar directory_name  ...
@@ -50,6 +50,7 @@ static const char rcsid[] =

 #include <err.h>
 #include <errno.h>
+#include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -108,7 +109,10 @@ main(argc, argv)
 			if (build(*argv, omode))
 				success = 0;
 		} else if (mkdir(*argv, omode) < 0) {
-			warn("%s", *argv);
+			if (errno == ENOTDIR || errno == ENOENT)
+				warn("%s", dirname(*argv));
+			else
+				warn("%s", *argv);
 			success = 0;
 		} else if (vflag)
 			(void)printf("%s\n", *argv);
@@ -42,11 +42,11 @@
 .Nm mv
 .Nd move files
 .Sh SYNOPSIS
-.Nm mv
+.Nm
 .Op Fl f | Fl i
 .Op Fl v
 .Ar source target
-.Nm mv
+.Nm
 .Op  Fl f | Fl i
 .Op Fl v
 .Ar source ... directory
@@ -223,7 +223,6 @@ extern int pids;
 extern int exit_val;
 extern int docrc;
 extern char *dirptr;
-extern char *ltmfrmt;
 extern char *argv0;
 int main __P((int, char **));
 void sig_cleanup __P((int));
@@ -106,17 +106,13 @@ ls_list(arcn, now)
 	sbp = &(arcn->sb);
 	strmode(sbp->st_mode, f_mode);

-	if (ltmfrmt == NULL) {
-		/*
-		 * no locale specified format. time format based on age
-		 * compared to the time pax was started.
-		 */
-		if ((sbp->st_mtime + SIXMONTHS) <= now)
-			timefrmt = OLDFRMT;
-		else
-			timefrmt = CURFRMT;
-	} else
-		timefrmt = ltmfrmt;
+	/*
+	 * time format based on age compared to the time pax was started.
+	 */
+	if ((sbp->st_mtime + SIXMONTHS) <= now)
+		timefrmt = OLDFRMT;
+	else
+		timefrmt = CURFRMT;

 	/*
 	 * print file mode, link count, uid, gid and time
@@ -178,16 +174,10 @@ ls_tty(arcn)
 	char f_mode[MODELEN];
 	char *timefrmt;

-	if (ltmfrmt == NULL) {
-		/*
-		 * no locale specified format
-		 */
-		if ((arcn->sb.st_mtime + SIXMONTHS) <= time((time_t *)NULL))
-			timefrmt = OLDFRMT;
-		else
-			timefrmt = CURFRMT;
-	} else
-		timefrmt = ltmfrmt;
+	if ((arcn->sb.st_mtime + SIXMONTHS) <= time((time_t *)NULL))
+		timefrmt = OLDFRMT;
+	else
+		timefrmt = CURFRMT;

 	/*
 	 * convert time to string, and print
@@ -970,7 +970,7 @@ opt_add(str)
 *	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
+ *	   separated by x (also * for backwards compatibility), specifying
 *	   the product of the indicated values.
 * Return:
 *	0 for an error, a positive value o.w.
@@ -43,22 +43,22 @@
 .Nm pax
 .Nd read and write file archives and copy directory hierarchies
 .Sh SYNOPSIS
-.Nm pax
+.Nm
 .Op Fl cdnv
 .Bk -words
 .Op Fl f Ar archive
 .Ek
 .Bk -words
 .Op Fl s Ar replstr
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Op Fl U Ar user
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Op Fl G Ar group
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Oo
@@ -66,10 +66,10 @@
 .Op Ar from_date
 .Op Ar ,to_date
 .Oc
-.Ar ...
+.Ar ...\&
 .Ek
-.Op Ar pattern ...
-.Nm pax
+.Op Ar pattern ...\&
+.Nm
 .Fl r
 .Op Fl cdiknuvDYZ
 .Bk -words
@@ -77,24 +77,24 @@
 .Ek
 .Bk -words
 .Op Fl o Ar options
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Op Fl p Ar string
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Op Fl s Ar replstr
-.Ar ...
+.Ar ...\&
 .Ek
 .Op Fl E Ar limit
 .Bk -words
 .Op Fl U Ar user
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Op Fl G Ar group
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Oo
@@ -102,10 +102,10 @@
 .Op Ar from_date
 .Op Ar ,to_date
 .Oc
-.Ar ...
+.Ar ...\&
 .Ek
-.Op Ar pattern ...
-.Nm pax
+.Op Ar pattern ...\&
+.Nm
 .Fl w
 .Op Fl dituvHLPX
 .Bk -words
@@ -120,19 +120,19 @@
 .Ek
 .Bk -words
 .Op Fl s Ar replstr
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Op Fl o Ar options
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Op Fl U Ar user
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Op Fl G Ar group
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Op Fl B Ar bytes
@@ -144,28 +144,28 @@
 .Op Ar ,to_date
 .Op Ar /[c][m]
 .Oc
-.Ar ...
+.Ar ...\&
 .Ek
-.Op Ar file ...
-.Nm pax
+.Op Ar
+.Nm
 .Fl r
 .Fl w
 .Op Fl diklntuvDHLPXYZ
 .Bk -words
 .Op Fl p Ar string
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Op Fl s Ar replstr
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Op Fl U Ar user
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Op Fl G Ar group
-.Ar ...
+.Ar ...\&
 .Ek
 .Bk -words
 .Oo
@@ -174,9 +174,9 @@
 .Op Ar ,to_date
 .Op Ar /[c][m]
 .Oc
-.Ar ...
+.Ar ...\&
 .Ek
-.Op Ar file ...
+.Op Ar
 .Ar directory
 .Sh DESCRIPTION
 .Nm Pax
@@ -198,7 +198,7 @@ options specifies which of the following functional modes
 will operate under:
 .Em list , read , write ,
 and
-.Em copy.
+.Em copy .
 .Bl -tag -width 6n
 .It <none>
 .Em List .
@@ -208,7 +208,7 @@ will write to
 a table of contents of the members of the archive file read from
 .Dv standard input ,
 whose pathnames match the specified
-.Ar patterns.
+.Ar patterns .
 The table of contents contains one filename per line
 and is written using single line buffering.
 .It Fl r
@@ -217,7 +217,7 @@ and is written using single line buffering.
 extracts the members of the archive file read from the
 .Dv standard input ,
 with pathnames matching the specified 
-.Ar patterns.
+.Ar patterns .
 The archive format and blocking is automatically determined on input.
 When an extracted file is a directory, the entire file hierarchy
 rooted at that directory is extracted.
@@ -640,7 +640,7 @@ are not selected and will be skipped.
 Reset the access times of any file or directory read or accessed by
 .Nm
 to be the same as they were before being read or accessed by
-.Nm Ns .
+.Nm .
 .It Fl u
 Ignore files that are older (having a less recent file modification time)
 than a pre-existing file or archive member with the same name.
@@ -811,7 +811,7 @@ The default
 .Ar limit
 is a small positive number of retries.
 .Pp
-.Em Warning: 
+.Em Warning :
 Using this option with
 .Li NONE
 should be used with extreme caution as
@@ -1045,7 +1045,7 @@ option, a file is not considered selected unless it is newer
 than the file to which it is compared.
 .Sh EXAMPLES
 The command:
-.Dl pax -w -f /dev/rst0 .\ 
+.Dl "pax -w -f /dev/rst0 ."
 copies the contents of the current directory to the device
 .Pa /dev/rst0 .
 .Pp
@@ -95,7 +95,6 @@ int	pids;			/* preserve file uid/gid */
 int	exit_val;		/* exit value */
 int	docrc;			/* check/create file crc */
 char	*dirptr;		/* destination dir in a copy */
-char	*ltmfrmt;		/* -v locale time format (if any) */
 char	*argv0;			/* root of argv[0] */
 sigset_t s_mask;		/* signal mask for cleanup critical sect */

@@ -349,13 +348,6 @@ gen_init()
 		(void)setrlimit(RLIMIT_RSS , &reslimit);
 	}

-	/*
-	 * Handle posix locale
-	 *
-	 * set user defines time printing format for -v option
-	 */
-	ltmfrmt = getenv("LC_TIME");
-
 	/*
 	 * signal handling to reset stored directory times and modes. Since
 	 * we deal with broken pipes via failed writes we ignore it. We also
@@ -227,7 +227,7 @@ parsefmt(p)

 		while ((cp = strsep(&p, FMTSEP)) != NULL && *cp == '\0')
 			/* void */;
-		if (!(v = findvar(cp)))
+		if (cp == NULL || !(v = findvar(cp)))
 			continue;
 		if ((vent = malloc(sizeof(struct varent))) == NULL)
 			err(1, NULL);
@@ -31,6 +31,12 @@
 * SUCH DAMAGE.
 */

+#ifndef lint
+static char sccsid[] = "@(#)nlist.c	8.4 (Berkeley) 4/2/94";
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
 #include <sys/types.h>
 #include <sys/sysctl.h>

@@ -39,7 +39,7 @@
 .Nm ps
 .Nd process status
 .Sh SYNOPSIS
-.Nm ps
+.Nm
 .Op Fl aCcefhjlmrSTuvwx
 .Op Fl M Ar core
 .Op Fl N Ar system
@@ -49,7 +49,7 @@
 .Op Fl t Ar tty
 .Op Fl U Ar username
 .Op Fl W Ar swap
-.Nm ps
+.Nm
 .Op Fl L
 .Sh DESCRIPTION
 .Nm Ps
@@ -145,7 +145,7 @@ Display information about processes attached to the specified terminal
 device.
 .It Fl U
 Display the processes belonging to the specified
-.Tn username .
+.Ar username .
 .It Fl u
 Display information associated with the following keywords:
 user, pid, %cpu, %mem, vsz, rss, tt, state, start, time and command.
@@ -67,9 +67,12 @@ static const char rcsid[] =
 #include <unistd.h>
 #include <locale.h>
 #include <pwd.h>
+#include <utmp.h>

 #include "ps.h"

+#define SEP ", \t"		/* username separators */
+
 KINFO *kinfo;
 struct varent *vhead, *vtail;

@@ -98,6 +101,7 @@ static void	 scanvars __P((void));
 static void	 dynsizevars __P((KINFO *));
 static void	 sizevars __P((void));
 static void	 usage __P((void));
+static uid_t	*getuids(const char *, int *);

 char dfmt[] = "pid tt state time command";
 char jfmt[] = "user pid ppid pgid sess jobc state tt time command";
@@ -117,12 +121,11 @@ main(argc, argv)
 	struct kinfo_proc *kp;
 	struct varent *vent;
 	struct winsize ws;
-	struct passwd *pwd;
 	dev_t ttydev;
 	pid_t pid;
-	uid_t uid;
+	uid_t *uids;
 	int all, ch, flag, i, fmt, lineno, nentries, dropgid;
-	int prtheader, wflag, what, xflg;
+	int prtheader, wflag, what, xflg, uid, nuids;
 	char *nlistf, *memf, *swapf, errbuf[_POSIX2_LINE_MAX];

 	(void) setlocale(LC_ALL, "");
@@ -140,7 +143,8 @@ main(argc, argv)

 	all = fmt = prtheader = wflag = xflg = 0;
 	pid = -1;
-	uid = (uid_t) -1;
+	nuids = 0;
+	uids = NULL;
 	ttydev = NODEV;
 	dropgid = 0;
 	memf = nlistf = swapf = _PATH_DEVNULL;
@@ -242,11 +246,7 @@ main(argc, argv)
 			break;
 		}
 		case 'U':
-			pwd = getpwnam(optarg);
-			if (pwd == NULL)
-				errx(1, "%s: no such user", optarg);
-			uid = pwd->pw_uid;
-			endpwent();
+			uids = getuids(optarg, &nuids);
 			xflg++;		/* XXX: intuitive? */
 			break;
 		case 'u':
@@ -310,8 +310,12 @@ main(argc, argv)
 		parsefmt(dfmt);

 	/* XXX - should be cleaner */
-	if (!all && ttydev == NODEV && pid == -1 && uid == (uid_t)-1)
-		uid = getuid();
+	if (!all && ttydev == NODEV && pid == -1 && !nuids) {
+		if ((uids = malloc(sizeof (*uids))) == NULL)
+			errx(1, "malloc: %s", strerror(errno));
+		nuids = 1;
+		*uids = getuid();
+	}

 	/*
 	 * scan requested variables, noting what structures are needed,
@@ -321,9 +325,9 @@ main(argc, argv)
 	/*
 	 * get proc list
 	 */
-	if (uid != (uid_t) -1) {
+	if (nuids == 1) {
 		what = KERN_PROC_UID;
-		flag = uid;
+		flag = *uids;
 	} else if (ttydev != NODEV) {
 		what = KERN_PROC_TTY;
 		flag = ttydev;
@@ -367,6 +371,14 @@ main(argc, argv)
 		if (xflg == 0 && (KI_EPROC(&kinfo[i])->e_tdev == NODEV ||
 		    (KI_PROC(&kinfo[i])->p_flag & P_CONTROLT ) == 0))
 			continue;
+		if (nuids > 1) {
+			for (uid = 0; uid < nuids; uid++)
+				if (KI_EPROC(&kinfo[i])->e_ucred.cr_uid ==
+				    uids[uid])
+					break;
+			if (uid == nuids)
+				continue;
+		}
 		for (vent = vhead; vent; vent = vent->next) {
 			(vent->var->oproc)(&kinfo[i], vent);
 			if (vent->next != NULL)
@@ -379,9 +391,53 @@ main(argc, argv)
 			lineno = 0;
 		}
 	}
+	free(uids);
+
 	exit(eval);
 }

+uid_t *
+getuids(const char *arg, int *nuids)
+{
+	char name[UT_NAMESIZE + 1];
+	struct passwd *pwd;
+	uid_t *uids, *moreuids;
+	int l, alloc;
+
+
+	alloc = 0;
+	*nuids = 0;
+	uids = NULL;
+	for (; (l = strcspn(arg, SEP)) > 0; arg += l + strspn(arg + l, SEP)) {
+		if (l >= sizeof name) {
+			warnx("%.*s: name too long", l, arg);
+			continue;
+		}
+		strncpy(name, arg, l);
+		name[l] = '\0';
+		if ((pwd = getpwnam(name)) == NULL) {
+			warnx("%s: no such user", name);
+			continue;
+		}
+		if (*nuids >= alloc) {
+			alloc = (alloc + 1) << 1;
+			moreuids = realloc(uids, alloc * sizeof (*uids));
+			if (moreuids == NULL) {
+				free(uids);
+				errx(1, "realloc: %s", strerror(errno));
+			}
+			uids = moreuids;
+		}
+		uids[(*nuids)++] = pwd->pw_uid;
+	}
+	endpwent();
+
+	if (!*nuids)
+		errx(1, "No users specified");
+
+	return uids;
+}
+
 static void
 scanvars()
 {
@@ -2,5 +2,7 @@
 # $FreeBSD$

 PROG=	pwd
+LINKS=	${BINDIR}/pwd ${BINDIR}/realpath
+MAN1=	pwd.1 realpath.1

 .include <bsd.prog.mk>
@@ -42,7 +42,7 @@
 .Nm pwd
 .Nd return working directory name
 .Sh SYNOPSIS
-.Nm pwd
+.Nm
 .Sh DESCRIPTION
 .Nm Pwd
 writes the absolute pathname of the current working directory to
@@ -64,6 +64,9 @@ The
 utility is expected to be
 .St -p1003.2
 compatible.
+The
+.Fl L
+flag is not supported.
 .Sh SEE ALSO
 .Xr builtin 1 ,
 .Xr cd 1 ,
@@ -49,6 +49,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <sys/param.h>

 void usage __P((void));

@@ -59,13 +60,13 @@ main(argc, argv)
 {
 	int ch;
 	char *p;
+	char buf[MAXPATHLEN];

 	/*
 	 * Flags for pwd are a bit strange.  The POSIX 1003.2B/D9 document
 	 * has an optional -P flag for physical, which is what this program
 	 * will produce by default.  The logical flag, -L, should fail, as
-	 * there's no way to display a logical path after forking.  We don't
-	 * document either flag, only adding -P for future portability.
+	 * there's no way to display a logical path after forking.
 	 */
 	while ((ch = getopt(argc, argv, "P")) != -1)
 		switch (ch) {
@@ -78,12 +79,20 @@ main(argc, argv)
 	argc -= optind;
 	argv += optind;

-	if (argc != 0)
+	if (argc == 1) {
+		p = realpath(argv[0], buf);
+		if (p == NULL)
+			err(1, "%s", argv[0]);
+		(void)printf("%s\n", p);
+	} else  if (argc == 0) {
+		p = getcwd(NULL, 0);
+		if (p == NULL)
+			err(1, ".");
+		(void)printf("%s\n", p);
+	} else {
 		usage();
+	}

-	if ((p = getcwd(NULL, 0)) == NULL)
-		err(1, ".");
-	(void)printf("%s\n", p);
 	exit(0);
 }

@@ -1,9 +1,9 @@
-.\" Copyright (c) 1996
-.\"	Mike Pritchard <[email protected]>.  All rights reserved.
-.\"
-.\" Copyright (c) 1991, 1993
+.\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the Institute of Electrical and Electronics Engineers, Inc.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -32,55 +32,39 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
+.\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp
 .\" $FreeBSD$
 .\"
-.Dd February 11, 1996
-.Dt UPDATE 4
+.Dd November 24, 2000
+.Dt REALPATH 1
 .Os FreeBSD
 .Sh NAME
-.Nm update
-.Nd flush internal filesystem caches to disk periodically
+.Nm realpath
+.Nd return resolved physical path
 .Sh SYNOPSIS
-.Nm update
+.Nm
+.Ar path
 .Sh DESCRIPTION
+.Nm
+uses the
+.Xr realpath 3
+function to resolve all symbolic links, extra
+.Ql /
+characters and references to
+.Pa /./
+and
+.Pa /../
+in
+.Ar path .
+.Sh DIAGNOSTICS
 The
-.Nm update
-kernel process helps protect the integrity of disk volumes
-by flushing
-volatile cached filesystem data
-to disk.  This is done at thirty second intervals by default.
-The time period may be changed by using
-.Xr sysctl 8
-to modify the
-.Va kern.update
-variable.
-The 
-.Nm update
-process does the equivalent of the 
-.Xr sync 2
-function call to do the task.
+.Nm
+utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
-.Xr sync 2 ,
-.Xr fsck 8 ,
-.Xr init 8 ,
-.Xr rc 8 ,
-.Xr sync 8 ,
-.Xr sysctl 8
-.Sh BUGS
-It is possible on some systems that a
-.Xr sync 2
-occurring simultaneously with a crash may cause
-file system damage.  See
-.Xr fsck 8 .
+.Xr realpath 3
 .Sh HISTORY
-An
-.Nm update
-command appeared in
-.At v6 ,
-and was usually started by
-.Pa /etc/rc
-when the system went multi-user.
-A kernel initiated
-.Nm update
-process first appeared in
-.Fx 2.0 .
+The
+.Nm
+utility first appeared in
+.Fx 4.3 .
@@ -39,14 +39,14 @@
 .Nm rcp
 .Nd remote file copy
 .Sh SYNOPSIS
-.Nm rcp
+.Nm
 .Op Fl Kpx
 .Op Fl k Ar realm
 .Ar file1 file2
-.Nm rcp
+.Nm
 .Op Fl Kprx
 .Op Fl k Ar realm
-.Ar file ...
+.Ar
 .Ar directory
 .Sh DESCRIPTION
 .Nm Rcp
@@ -93,7 +93,7 @@ the destination must be a directory.
 Turn on
 .Tn DES
 encryption for all data passed by
-.Nm Ns .
+.Nm .
 This may impact response time and
 .Tn CPU
 utilization, but provides
@@ -133,7 +133,7 @@ configure authentication services
 .Xr rlogin 1 ,
 .Xr rsh 1 ,
 .Xr auth.conf 5 ,
-.Xr hosts.equiv 5 .
+.Xr hosts.equiv 5
 .Sh HISTORY
 The
 .Nm
@@ -160,4 +160,4 @@ The destination user and hostname may have to be specified as
 when the destination machine is running the
 .Bx 4.2
 version of
-.Nm Ns  .
+.Nm .
@@ -43,9 +43,9 @@
 .Nm unlink
 .Nd remove directory entries
 .Sh SYNOPSIS
-.Nm rm
+.Nm
 .Op Fl dfiPRrvW
-.Ar file ...
+.Ar
 .Nm unlink
 .Ar file
 .Sh DESCRIPTION
@@ -115,7 +115,7 @@ The
 utility removes symbolic links, not the files referenced by the links.
 .Pp
 It is an error to attempt to remove the files
-.Dq \&.
+.Dq .\&
 or
 .Dq .. .
 .Pp
@@ -195,7 +195,7 @@ command is almost
 compatible, except that
 .Tn POSIX
 requires
-.Nm rm
+.Nm
 to act like
 .Xr rmdir 1
 when the
@@ -253,7 +253,7 @@ rm_tree(argv)
 				if (rval == 0 || (fflag && errno == ENOENT)) {
 					if (rval == 0 && vflag)
 						(void)printf("%s\n",
-						    p->fts_accpath);
+						    p->fts_path);
 					continue;
 				}
 				break;
@@ -263,7 +263,7 @@ rm_tree(argv)
 				if (rval == 0 && (fflag && errno == ENOENT)) {
 					if (vflag)
 						(void)printf("%s\n",
-						    p->fts_accpath);
+						    p->fts_path);
 					continue;
 				}
 				break;
@@ -275,7 +275,7 @@ rm_tree(argv)
 				if (rval == 0 || (fflag && errno == ENOENT)) {
 					if (rval == 0 && vflag)
 						(void)printf("%s\n",
-						    p->fts_accpath);
+						    p->fts_path);
 					continue;
 				}
 			}
@@ -42,7 +42,7 @@
 .Nm rmdir
 .Nd remove directories
 .Sh SYNOPSIS
-.Nm rmdir
+.Nm
 .Op Fl p
 .Ar directory ...
 .Sh DESCRIPTION
@@ -442,6 +442,7 @@ expredir(n)
 		switch (redir->type) {
 		case NFROM:
 		case NTO:
+		case NFROMTO:
 		case NAPPEND:
 			expandarg(redir->nfile.fname, &fn, EXP_TILDE | EXP_REDIR);
 			redir->nfile.expfname = fn.list->text;
@@ -52,6 +52,7 @@ static const char rcsid[] =
 #include <sys/wait.h>
 #include <sys/time.h>
 #include <sys/resource.h>
+#include <paths.h>
 #endif
 #include <sys/ioctl.h>

@@ -635,9 +636,9 @@ forkshell(jp, n, mode)
 			if ((jp == NULL || jp->nprocs == 0) &&
 			    ! fd0_redirected_p ()) {
 				close(0);
-				if (open("/dev/null", O_RDONLY) != 0)
-					error("Can't open /dev/null: %s", 
-					    strerror(errno));
+				if (open(_PATH_DEVNULL, O_RDONLY) != 0)
+					error("Can't open %s: %s",
+					    _PATH_DEVNULL, strerror(errno));
 			}
 		}
 #else
@@ -647,9 +648,9 @@ forkshell(jp, n, mode)
 			if ((jp == NULL || jp->nprocs == 0) &&
 			    ! fd0_redirected_p ()) {
 				close(0);
-				if (open("/dev/null", O_RDONLY) != 0)
-					error("Can't open /dev/null: %s", 
-					    strerror(errno));
+				if (open(_PATH_DEVNULL, O_RDONLY) != 0)
+					error("Can't open %s: %s", 
+					    _PATH_DEVNULL, strerror(errno));
 			}
 		}
 #endif
@@ -782,7 +783,8 @@ dowait(block, job)
 	do {
 		pid = waitproc(block, &status);
 		TRACE(("wait returns %d, status=%d\n", pid, status));
-	} while (pid == -1 && errno == EINTR && breakwaitcmd == 0);
+	} while ((pid == -1 && errno == EINTR && breakwaitcmd == 0) ||
+	    (WIFSTOPPED(status) && !iflag));
 	in_dowait--;
 	if (breakwaitcmd != 0) {
 		breakwaitcmd = 0;
@@ -1085,6 +1087,8 @@ until:
 		p = ">&";  i = 1;  goto redir;
 	case NFROM:
 		p = "<";  i = 0;  goto redir;
+	case NFROMTO:
+		p = "<>";  i = 0;  goto redir;
 	case NFROMFD:
 		p = "<&";  i = 0;  goto redir;
 redir:
@@ -37,7 +37,7 @@
 #	@(#)mkbuiltins	8.2 (Berkeley) 5/4/95
 # $FreeBSD$

-temp=/tmp/ka$$
+temp=`/usr/bin/mktemp -t ka`
 havejobs=0
 if grep '^#define JOBS[	 ]*1' shell.h > /dev/null
 then	havejobs=1
@@ -41,7 +41,8 @@
 # token marks the end of a list.  The third column is the name to print in
 # error messages.

-cat > /tmp/ka$$ <<\!
+temp=`/usr/bin/mktemp -t ka`
+cat > $temp <<\!
 TEOF	1	end of file
 TNL	0	newline
 TSEMI	0	";"
@@ -71,25 +72,25 @@ TCASE	0	"case"
 TESAC	1	"esac"
 TNOT	0	"!"
 !
-nl=`wc -l /tmp/ka$$`
+nl=`wc -l $temp`
 exec > token.h
-awk '{print "#define " $1 " " NR-1}' /tmp/ka$$
+awk '{print "#define " $1 " " NR-1}' $temp
 echo '
 /* Array indicating which tokens mark the end of a list */
 const char tokendlist[] = {'
-awk '{print "\t" $2 ","}' /tmp/ka$$
+awk '{print "\t" $2 ","}' $temp
 echo '};

 char *const tokname[] = {'
 sed -e 's/"/\\"/g' \
    -e 's/[^	 ]*[	 ][	 ]*[^	 ]*[	 ][	 ]*\(.*\)/	"\1",/' \
-    /tmp/ka$$
+    $temp
 echo '};
 '
-sed 's/"//g' /tmp/ka$$ | awk '
+sed 's/"//g' $temp | awk '
 /TIF/{print "#define KWDOFFSET " NR-1; print ""; print "char *const parsekwd[] = {"}
 /TIF/,/neverfound/{print "	\"" $3 "\","}'
 echo '	0
 };'

-rm /tmp/ka$$
+rm $temp
@@ -118,6 +118,7 @@ NARG narg			# represents a word

 NTO nfile			# fd> fname
 NFROM nfile			# fd< fname
+NFROMTO nfile			# fd<> fname
 NAPPEND nfile			# fd>> fname
 	type	  int
 	next	  nodeptr		# next redirection in list
@@ -1138,6 +1138,8 @@ parseredir: {
 			}
 		} else if (c == '&')
 			np->type = NFROMFD;
+		else if (c == '>')
+			np->type = NFROMTO;
 		else {
 			np->type = NFROM;
 			pungetc();
@@ -190,6 +190,27 @@ movefd:
 			close(f);
 		}
 		break;
+	case NFROMTO:
+		fname = redir->nfile.expfname;
+#ifdef O_CREAT
+		if ((f = open(fname, O_RDWR|O_CREAT, 0666)) < 0)
+			error("cannot create %s: %s", fname, errmsg(errno, E_CREAT));
+#else
+		if ((f = open(fname, O_RDWR, 0666)) < 0) {
+			if (errno != ENOENT)
+				error("cannot create %s: %s", fname, errmsg(errno, E_CREAT));
+			else if ((f = creat(fname, 0666)) < 0)
+				error("cannot create %s: %s", fname, errmsg(errno, E_CREAT));
+			else {
+				close(f);
+				if ((f = open(fname, O_RDWR)) < 0) {
+					error("cannot create %s: %s", fname, errmsg(errno, E_CREAT));
+					remove(fname);
+				}
+			}
+		}
+#endif
+		goto movefd;
 	case NTO:
 		fname = redir->nfile.expfname;
 #ifdef O_CREAT
@@ -46,7 +46,7 @@
 .Op Fl /+abCEefIimnpsTuVvx
 .Op Fl /+o Ar longname
 .Op Fl c Ar string
-.Op Ar arg ...
+.Op Ar arg ...\&
 .Sh DESCRIPTION
 The
 .Nm
@@ -331,13 +331,14 @@ The following is a list of valid operators:
 .Xc Xc Xc Xc
 .El
 .It Redirection operators:
-.Bl -column "XXX" "XXX" "XXX" "XXX" -offset center -compact
+.Bl -column "XXX" "XXX" "XXX" "XXX" "XXX" -offset center -compact
 .It Xo
 .Li < Ta Xo
 .Li > Ta Xo
 .Li << Ta Xo
-.Li >>
-.Xc Xc Xc Xc
+.Li >> Ta Xo
+.Li <>
+.Xc Xc Xc Xc Xc
 .It Xo
 .Li <& Ta Xo
 .Li >& Ta Xo
@@ -389,7 +390,7 @@ shell and are recognized at the beginning of a line and
 after a control operator.  The following are reserved words:
 .Bl -column "doneXX" "elifXX" "elseXX" "untilXX" "whileX" -offset center
 .It Xo
-.Li ! Ta Xo
+.Li \&! Ta Xo
 .Li { Ta Xo
 .Li } Ta Xo
 .Ic case Ta Xo
@@ -497,6 +498,8 @@ option
 append stdout (or file descriptor n) to file
 .It Li [n]< file
 redirect stdin (or file descriptor n) from file
+.It Li [n]<> file
+redirect stdin (or file descriptor n) to and from file
 .It Li [n1]<&n2
 duplicate stdin (or file descriptor n1) from file descriptor n2
 .It Li [n]<&-
@@ -564,7 +567,7 @@ whose
 representation is
 .Qq #! ,
 resulting in an
-.Dv ENOEXEC
+.Er ENOEXEC
 return value from
 .Xr execve 2 )
 the shell will interpret the program in a subshell.
@@ -671,7 +674,7 @@ to the standard input of
 .Ql command2 .
 .Pp
 A
-.Dq Li \;
+.Dq Li \&;
 or newline terminator causes the preceding
 AND-OR-list
 (described below in the section called
@@ -857,7 +860,7 @@ This should appear as the first statement of a function,
 and the syntax is:
 .Bd -ragged -offset indent
 .Ic local
-.Op Ar variable ...
+.Op Ar variable ...\&
 .Op Ar -
 .Ed
 .Pp
@@ -967,7 +970,7 @@ the two arguments:
 .Ed
 .It Li #
 Expands to the number of positional parameters.
-.It Li ?
+.It Li \&?
 Expands to the exit status of the most recent pipeline.
 .It Li -
 (hyphen) Expands to the current option flags (the single-letter
@@ -977,7 +980,7 @@ by the shell.
 .It Li $
 Expands to the process ID of the invoked shell.  A subshell
 retains the same value of $ as its parent.
-.It Li !
+.It Li \&!
 Expands to the process ID of the most recent background
 command executed from the current shell.  For a
 pipeline, the process ID is that of the last command in the
@@ -1221,9 +1224,9 @@ command.
 A pattern consists of normal characters, which match themselves,
 and meta-characters.
 The meta-characters are
-.Dq Li ! ,
+.Dq Li \&! ,
 .Dq Li * ,
-.Dq Li ? ,
+.Dq Li \&? ,
 and
 .Dq Li [ .
 These characters lose their special meanings if they are quoted.
@@ -1236,7 +1239,7 @@ An asterisk
 .Pq Li *
 matches any string of characters.
 A question mark
-.Pq Li ?
+.Pq Li \&?
 matches any single character.
 A left bracket
 .Pq Li [
@@ -1253,14 +1256,14 @@ rather than introducing a character class.
 A character class matches any of the characters between the square brackets.
 A range of characters may be specified using a minus sign.
 The character class may be complemented by making an exclamation point
-.Pq Li !
+.Pq Li !\&
 the first character of the character class.
 .Pp
 To include a
-.Dq Li \]
+.Dq Li \&]
 in a character class, make it the first character listed
 (after the
-.Dq Li ! ,
+.Dq Li \&! ,
 if any).
 To include a
 .Dq Li - ,
@@ -1273,9 +1276,9 @@ these, a builtin version of the
 .Xr printf 1
 command is provided for efficiency.
 .Bl -tag -width Ds
-.It Ic :
+.It Ic \&:
 A null command that returns a 0 (true) exit value.
-.It Ic . Ar file
+.It Ic \&. Ar file
 The commands in the specified file are read and executed by the shell.
 If
 .Ar file
@@ -1287,9 +1290,11 @@ for the file.  If it is not found in the
 .Ev PATH ,
 it is sought in the current working directory.
 .It Ic alias Op Ar name ...
-.It Ic alias Op Ar name=string ...
+.It Ic alias Xo
+.Op Ar name Ns = Ns Ar string ...
+.Xc
 If
-.Ar name=string
+.Ar name Ns = Ns Ar string
 is specified, the shell defines the alias
 .Ar name
 with value
@@ -1512,7 +1517,8 @@ Re-execute the command without invoking an editor.
 Select the commands to list or edit.
 The number of previous commands that can be accessed
 are determined by the value of the
-.Ev HISTSIZE variable.
+.Ev HISTSIZE
+variable.
 The value of
 .Ar first
 or
@@ -1573,7 +1579,7 @@ If an option takes an argument, it is placed into the shell variable
 If an invalid option is encountered,
 .Ev var
 is set to
-.Dq Li ? .
+.Dq Li \&? .
 It returns a false value (1) when it encounters the end of the options.
 .It Xo
 .Ic hash
@@ -1806,7 +1812,7 @@ the complete pathname of the command is printed.
 .Op Ar limit
 .Xc
 Set or display resource limits (see
-.Xr getrlimit 2 ).
+.Xr getrlimit 2 ) .
 If
 .Ar limit
 is specified, the named resource will be set;
@@ -157,6 +157,7 @@ shcmd(cmd, fp)
 			case NAPPEND:	s = ">>"; dftfd = 1; break;
 			case NTOFD:	s = ">&"; dftfd = 1; break;
 			case NFROM:	s = "<";  dftfd = 0; break;
+			case NFROMTO:	s = "<>"; dftfd = 0; break;
 			case NFROMFD:	s = "<&"; dftfd = 0; break;
 			default:  	s = "*error*"; dftfd = 0; break;
 		}
@@ -64,7 +64,7 @@ The
 command will accept and honor a non-integer number of specified seconds
 .Po
 with a
-.Ql \&.
+.Ql .\&
 character as a decimal point
 .Pc .
 .Bf Sy
@@ -64,6 +64,7 @@ struct cchar cchars1[] = {
 	{ "eol",	VEOL,		CEOL },
 	{ "eol2",	VEOL2,		CEOL },
 	{ "erase",	VERASE,		CERASE },
+	{ "erase2",	VERASE2,	CERASE2 },
 	{ "intr",	VINTR,		CINTR },
 	{ "kill",	VKILL,		CKILL },
 	{ "lnext",	VLNEXT,		CLNEXT },
@@ -191,10 +191,16 @@ struct modes omodes[] = {
 	{ "-litout",	OPOST, 0 },
 	{ "onlcr",	ONLCR, 0 },
 	{ "-onlcr",	0, ONLCR },
+	{ "ocrnl",	OCRNL, 0 },
+	{ "-ocrnl",	0, OCRNL },
 	{ "tabs",	0, OXTABS },		/* "preserve" tabs */
 	{ "-tabs",	OXTABS, 0 },
 	{ "oxtabs",	OXTABS, 0 },
 	{ "-oxtabs",	0, OXTABS },
+	{ "onocr",	ONOCR, 0 },
+	{ "-onocr",	0, ONOCR },
+	{ "onlret",	ONLRET, 0 },
+	{ "-onlret",	0, ONLRET },
 	{ NULL },
 };

@@ -148,7 +148,10 @@ print(tp, wp, ldisc, fmt)
 	binit("oflags");
 	put("-opost", OPOST, 1);
 	put("-onlcr", ONLCR, 1);
+	put("-ocrnl", OCRNL, 0);
 	put("-oxtabs", OXTABS, 1);
+	put("-onocr", OXTABS, 0);
+	put("-onlret", OXTABS, 0);

 	/* control flags (hardware state) */
 	tmp = tp->c_cflag;
@@ -42,7 +42,7 @@
 .Nm stty
 .Nd set the options for a terminal device interface
 .Sh SYNOPSIS
-.Nm stty
+.Nm
 .Op Fl a | Fl e | Fl g
 .Op Fl f Ar file
 .Op operands
@@ -237,8 +237,18 @@ Map (do not map)
 to
 .Dv CR-NL
 on output.
+.It Cm ocrnl Pq Fl ocrnl
+Map (do not map)
+.Dv CR
+to
+.Dv NL
+on output.
 .It Cm oxtabs Pq Fl oxtabs
 Expand (do not expand) tabs to spaces on output.
+.It Cm onocr Pq Fl onocr
+Do not (do) output CRs at column zero.
+.It Cm onlret Pq Fl onlret
+On the terminal NL performs (does not perform) the CR function.
 .El
 .Ss Local Modes:
 .Pp
@@ -368,23 +378,24 @@ Recognized control-characters:
 .Bd -ragged -offset indent
 .Bl -column character Subscript
 .It control-
-.It character	Subscript	Description
-.It _________	_________	_______________
-.It eof Ta Tn VEOF	EOF No character
-.It eol Ta Tn VEOL	EOL No character
-.It eol2 Ta Tn VEOL2	EOL2 No character
-.It erase Ta Tn VERASE	ERASE No character
-.It werase Ta Tn VWERASE	WERASE No character
-.It intr Ta Tn VINTR	INTR No character
-.It kill Ta Tn VKILL	KILL No character
-.It quit Ta Tn VQUIT	QUIT No character
-.It susp Ta Tn VSUSP	SUSP No character
-.It start Ta Tn VSTART	START No character
-.It stop Ta Tn VSTOP	STOP No character
-.It dsusp Ta Tn VDSUSP	DSUSP No character
-.It lnext Ta Tn VLNEXT	LNEXT No character
-.It reprint Ta Tn VREPRINT	REPRINT No character
-.It status Ta Tn VSTATUS	STATUS No character
+.It character Ta Subscript Ta Description
+.It _________ Ta _________ Ta _______________
+.It eof Ta Tn VEOF Ta EOF No character
+.It eol Ta Tn VEOL Ta EOL No character
+.It eol2 Ta Tn VEOL2 Ta EOL2 No character
+.It erase Ta Tn VERASE Ta ERASE No character
+.It erase2 Ta Tn VERASE2 Ta ERASE2 No character
+.It werase Ta Tn VWERASE Ta WERASE No character
+.It intr Ta Tn VINTR Ta INTR No character
+.It kill Ta Tn VKILL Ta KILL No character
+.It quit Ta Tn VQUIT Ta QUIT No character
+.It susp Ta Tn VSUSP Ta SUSP No character
+.It start Ta Tn VSTART Ta START No character
+.It stop Ta Tn VSTOP Ta STOP No character
+.It dsusp Ta Tn VDSUSP Ta DSUSP No character
+.It lnext Ta Tn VLNEXT Ta LNEXT No character
+.It reprint Ta Tn VREPRINT Ta REPRINT No character
+.It status Ta Tn VSTATUS Ta STATUS No character
 .El
 .Ed
 .It Cm min Ar number
@@ -420,7 +431,8 @@ In addition
 -nl unsets inlcr and igncr.
 .It Cm ek
 Reset
-.Dv ERASE
+.Dv ERASE ,
+.Dv ERASE2 ,
 and
 .Dv KILL
 characters
@@ -446,7 +458,7 @@ The terminal size is recorded as having
 columns.
 .It Cm cols Ar number
 is an alias for
-.Cm columns.
+.Cm columns .
 .It Cm rows Ar number
 The terminal size is recorded as having
 .Ar number
@@ -480,14 +492,12 @@ This means that unsetting
 may not put back all the setting that were previously in effect.
 To set the terminal into a raw state and then accurately restore it, the following
 shell code is recommended:
-.nf
-
+.Bd -literal
 save_state=$(stty -g)
 stty raw
 \&...
 stty "$save_state"
-
-.fi
+.Ed
 .It Cm size
 The size of the terminal is printed as two numbers on a single line,
 first rows, then columns.
@@ -514,7 +524,7 @@ If set, enables
 .Cm brkint , ixon , imaxbel , opost ,
 .Cm isig , iexten ,
 and
-.Cm Fl icanon .
+.Fl icanon .
 If unset, same as
 .Cm sane .
 .It Cm new
@@ -39,7 +39,7 @@
 .Nm sync
 .Nd force completion of pending disk writes (flush cache)
 .Sh SYNOPSIS
-.Nm sync
+.Nm
 .Sh DESCRIPTION
 .Nm Sync
 can be called to insure that all disk writes have been completed before the
@@ -55,7 +55,7 @@ to shut down the system,
 as they may perform additional actions
 such as resynchronizing the hardware clock
 and flushing internal caches before performing a final
-.Nm Ns .
+.Nm .
 .Pp
 .Nm Sync
 utilizes the
@@ -43,13 +43,13 @@
 .Nm \&[
 .Nd condition evaluation utility
 .Sh SYNOPSIS
-.Nm test
+.Nm
 .Ar expression
-.Nm [
+.Nm \&[
 .Ar expression Cm ]
 .Sh DESCRIPTION
 The
-.Nm test
+.Nm
 utility evaluates the expression and, if it evaluates
 to true, returns a zero (true) exit status; otherwise
 it returns 1 (false).
@@ -57,7 +57,7 @@ If there is no expression, test also
 returns 1 (false).
 .Pp
 All operators and flags are separate arguments to the
-.Nm test
+.Nm
 utility.
 .Pp
 The following primaries are used to construct expression:
@@ -288,7 +288,7 @@ operator has higher precedence than the
 operator.
 .Sh GRAMMAR AMBIGUITY
 The 
-.Nm test
+.Nm
 grammar is inherently ambiguous.  In order to assure a degree of consistency,
 the cases described in the 
 .St -p1003.2 , 
@@ -298,7 +298,7 @@ standards document.  All other cases are subject to the ambiguity in the
 command semantics.
 .Sh RETURN VALUES
 The
-.Nm test
+.Nm
 utility exits with one of the following values:
 .Bl -tag -width Ds
 .It 0
@@ -314,7 +314,7 @@ An error occurred.
 .Xr sh 1
 .Sh STANDARDS
 The
-.Nm test
+.Nm
 utility implements a superset of the
 .St -p1003.2
 specification.
@@ -142,7 +142,7 @@ delimited by a single colon.
 For example, if 
 .Ar logfile
 is the string
-.Nm syslog:local7
+.Dq Li syslog:local7
 then
 .Nm amd
 will log messages via 
@@ -282,6 +282,7 @@ Map entries that are not tagged are always processed.
 Map entries that are tagged with a tag other than
 .Ar tag
 will not be processed.
+.El
 .Sh FILES
 .Bl -tag -width /axx
 .It Pa /.amd_mnt
@@ -179,8 +179,7 @@ Normally
 will try TCP, and if that fails, will try UDP.
 .El
 .Sh FILES
-.Bl -tag -width amq.xxxxx -compact
-.Bl -tag -width Ds
+.Bl -tag -width amq.x -compact
 .It Pa amq.x
 .Tn RPC
 protocol description.
@@ -212,4 +211,3 @@ file distributed with
 .Sh HISTORY
 .Nm Amq
 first appeared in 4.4BSD.
-.At
@@ -103,6 +103,7 @@ only.
 .Pp
 This option also saves time as comparisons of remotely recorded and local
 hostnames by address are avoided.
+.El
 .Sh FILES
 .Bl -tag -width /axx
 .It Pa /etc/mtab
@@ -116,7 +117,7 @@ server.
 .Xr mtab 5 ,
 .Xr rmtab 5 ,
 .Xr mountd 8 ,
-.Xr showmount 8 .
+.Xr showmount 8
 .Sh BUGS
 No attempt is made to verify the information in
 .Pa /etc/mtab
@@ -138,7 +139,7 @@ To catch those cases, a filesystem is also deemed mounted if its
 .Em local
 mount point is identical to the remote entry.
 I.e., on a SunOS diskless client,
-.Ic server:/export/share/sunos.4.1.1
+.Pa server:/export/share/sunos.4.1.1
 is actually
 .Pa /usr/share .
 Since the local mount point is
@@ -53,7 +53,10 @@
 .Op Fl h Ar hostname
 .Op Fl m Ar automounts_prefix
 .Op Fl I Ar dir
-.Op Fl D Ar name[=string]]
+.Oo
+.Fl D
+.Ar name Ns Op = Ns Ar string
+.Oc
 .Op Fl U Ar name
 .Ar config ...
 .Sh DESCRIPTION
@@ -143,7 +146,9 @@ will be displayed, and all information discovered when performing the semantic
 analysis phase will be displayed.  Each verbose message
 is output to the standard output on a line starting with a `#'
 character.
-.It Fl D Ar name[=string]
+.It Fl D Xo
+.Ar name Ns Op = Ns Ar string
+.Xc
 Defines a symbol
 .Ar name
 for the preprocessor when reading the configuration files.
@@ -162,6 +167,7 @@ option.
 .It Ar config
 One or more configuration files to be passed as input to 
 .Nm fsinfo .
+.El
 .Pp
 The
 .Nm
@@ -147,7 +147,7 @@ to
 Programs such as
 .Ic comsat ,
 .Pq which access the mailboxes of other users
- must be setgid
+must be setgid
 .Va HLFS_GID
 to work properly.  The default group is
 .Dq hlfs .
@@ -262,11 +262,12 @@ directory other than their home directory.  Only the username, uid, and
 home-directory fields of the file
 .Ar password-file
 are read and checked.  All other fields are ignored.  The file
-.I password-file
+.Ar password-file
 must be compliant with 
 .Ux 
 System 7 colon-delimited format
 .Xr passwd 5 .
+.El
 .Sh FILES
 .Bl -tag -width /axx
 .It Pa /hlfs
@@ -280,13 +281,14 @@ default sub-directory in the user's home directory, to which the
 symbolic link returned by
 .Nm
 points.
-.It /var/hlfs
+.It Pa /var/hlfs
 directory to which
 .Pa home
 symbolic link returned by
 .Nm
 points if it is unable to verify the that
 user's home directory is accessible.
+.El
 .Sh SEE ALSO
 .Xr mail 1 ,
 .Xr getgrent 3 ,
@@ -48,7 +48,7 @@
 .Nm amd.conf
 .Nd amd configuration file
 .Sh SYNOPSIS
-.Nm amd.conf
+.Nm
 .Sh DESCRIPTION
 The
 .Nm
@@ -56,7 +56,7 @@ file is the configuration file for amd, as part of the am-utils suite.
 .Pp
 .Nm
 contains runtime configuration information for the
-.Nm amd
+.Xr amd 8
 automounter program.
 .Sh FILE FORMAT
 The file consists of sections and parameters.  A section begins with the
@@ -77,9 +77,7 @@ internal whitespace in section and parameter names is irrelevant.  Leading
 and trailing whitespace in a parameter value is discarded.  Internal
 whitespace within a parameter value is not allowed, unless the whole
 parameter value is quoted with double quotes as in 
-.So name = 
-.Qq some value 
-.Sc .
+.Sq name = Qq some\ value .
 .Pp
 Any line beginning with a pound sign (#) is ignored, as are lines containing
 only whitespace.
@@ -89,34 +87,33 @@ The values following the equals sign in parameters are all either a string
 be given as yes/no.  Case is significant in all values.  Some items such as
 cache timeouts are numeric.
 .Sh SECTIONS
-.Bl -tag -width 4n
-.It Nm The [global] section
+.Ss "The [global] section"
 Parameters in this section either apply to 
-.Nm amd 
+.Nm amd
 as a whole, or to all other regular map sections which follow.  There 
 should be only one global section defined in one configuration file.
 .Pp
 It is highly recommended that this section be specified first in the
 configuration file.  If it is not, then regular map sections which precede
 it will not use global values defined later.
-.It Nm Regular [/map] sections
+.Ss "Regular [/map] sections"
 Parameters in regular (non-global) sections apply to a single map entry.
 For example, if the map section
 .Bq Pa /homes
 is defined, then all parameters following it will be applied to the
 .Pa /homes
 amd-managed mount point.
-.El
 .Sh PARAMETERS
-.Bl -tag -width F1
-.It Sy Parameters common to all sections
+.Ss "Parameters common to all sections"
 These parameters can be specified either in the global or a map specific
 section.  Entries specified in a map-specific section override the default
 value or one defined in the global section.   If such a common parameter is
 specified only in the global section, it is applicable to all regular map
 sections that follow.
-.Bl -tag -width F1
-.It Nm browsable_dirs (string, default=no)
+.Bl -tag -width 4n
+.It Ic browsable_dirs Xo
+.Pq "string, default=no"
+.Xc
 If 
 .Qq yes , 
 then amd's top-level mount points will be browsable to
@@ -140,41 +137,47 @@ the entries, such as often done by
 .Qq ls -l
 or
 .Qq ls -F ,
-.Nm amd 
+.Nm amd
 will attempt to mount 
 .Em every
 entry in that map.  This is often called a 
 .Em mount storm .
-.It Nm map_options (string, default no options)
+.It Ic map_options Xo
+.Pq "string, default no options"
+.Xc
 This option is the same as specifying map options on the command line to 
 .Nm amd ,
 such as
 .Ql cache\&:\&=all .
-.It Nm map_type (string, default search all map types)
+.It Ic map_type Xo
+.Pq "string, default search all map types"
+.Xc
 If specified, amd will initialize the map only for the type given.   
 This is useful to avoid the default map search type used by amd which 
 takes longer and can have undesired side-effects such as initializing 
 NIS even if not used.  Possible values are:
 .Pp
-.Bl -tag -width 10n -compact
-.It Nm file
+.Bl -tag -width "nisplus" -compact
+.It Ic file
 plain files
-.It Nm hesiod
+.It Ic hesiod
 Hesiod name service from MIT
-.It Nm ldap
+.It Ic ldap
 Lightweight Directory Access Protocol
-.It Nm ndbm
+.It Ic ndbm
 (New) dbm style hash files
-.It Nm nis
+.It Ic nis
 Network Information Services (version 2)
-.It Nm nisplus
+.It Ic nisplus
 Network Information Services Plus (version 3)
-.It Nm passwd
+.It Ic passwd
 local password files
-.It Nm union 
+.It Ic union 
 union maps
 .El
-.It Nm mount_type (string, default=nfs)
+.It Ic mount_type Xo
+.Pq "string, default=nfs"
+.Xc
 All amd mount types default to
 .Tn NFS .
 That is,
@@ -184,42 +187,54 @@ is an
 server on the map mount points, for the local host it is running on.  If 
 .Qq autofs 
 is specified, amd will be an autofs server for those mount points.
-.It Nm search_path (string, default no search path)
+.It Ic search_path Xo
+.Pq "string, default no search path"
+.Xc
 This provides a 
 .Pq colon-delimited
 search path for file maps.  Using a search path, sites can allow for 
 local map customizations and overrides, and can distributed maps in 
 several locations as needed.
 .El
-.It Nm Parameters applicable to the global section only
-.Bl -tag -width F1
-.It Nm arch (string, default to compiled in value)
+.Ss "Parameters applicable to the global section only"
+.Bl -tag -width 4n
+.It Ic arch Xo
+.Pq "string, default to compiled in value"
+.Xc
 Allows you to override the value of the
 .Va arch
 .Nm amd
 variable.
-.It Nm auto_dir (string, default=/a)
+.It Ic auto_dir Xo
+.Pq "string, default=/a"
+.Xc
 Same as the 
 .Fl a
 option to
 .Nm amd .
 This sets the private directory where amd will create sub-directories for its
 real mount points.
-.It Nm cache_duration (numeric, default=300)
+.It Ic cache_duration Xo
+.Pq "numeric, default=300"
+.Xc
 Same as the
 .Fl c
 option to
 .Nm amd .
 Sets the duration in seconds that looked up map entries remain in the cache.
-.It Nm cluster (string, default no cluster)
+.It Ic cluster Xo
+.Pq "string, default no cluster"
+.Xc
 Same as the
 .Fl C
 option to
 .Nm amd .
 Specifies the alternate
-.Tm HP-UX
+.Tn HP-UX
 cluster to use.
-.It Nm debug_options (string, default no debug options)
+.It Ic debug_options Xo
+.Pq "string, default no debug options"
+.Xc
 Same as the 
 .Fl D
 option to
@@ -227,11 +242,12 @@ option to
 Specify any debugging options for
 .Nm amd .
 Works only if am-utils was configured for debugging using the
-.Ic --enable-debug option .
+.Fl -enable-debug
+option.
 The
 .Qq mem
 option alone can be turned on via
-.Ic --enable-debug=mem .
+.Fl -enable-debug Ns = Ns Ic mem .
 Otherwise debugging options are ignored.  Options are comma delimited, and can
 be preceded by the string
 .Qq no
@@ -240,42 +256,46 @@ by running
 .Nm amd Fl v .
 Possible values are:
 .Pp
-.Bl -tag -width 10n -compact
-.It Nm all 
+.Bl -tag -width "daemon" -compact
+.It Ic all 
 all options
-.It Nm amq
+.It Ic amq
 register for 
-.Nm amq
-.It Nm daemon
+.Xr amq 8
+.It Ic daemon
 enter daemon mode
-.It Nm fork
+.It Ic fork
 fork server
-.It Nm full
+.It Ic full
 program trace
-.It Nm info
+.It Ic info
 info service specific debugging
 .Pq hesiod, nis, etc.
 .It mem
 trace memory allocations
-.It Nm mtab
+.It Ic mtab
 use local
 .Pa ./mtab
 file
-.It Nm str
+.It Ic str
 debug string munging
-.It Nm test
+.It Ic test
 full debug but no daemon
-.It Nm trace
+.It Ic trace
 protocol trace
 .El
-.It Nm dismount_interval (numeric, default=120)
+.It Ic dismount_interval Xo
+.Pq "numeric, default=120"
+.Xc
 Same as the
 .Fl w
 option to
 .Nm amd .
 Specify, in seconds, the time between attempts to dismount file systems that
 have exceeded their cached times. 
-.It Nm fully_qualified_hosts (string, default=no)
+.It Ic fully_qualified_hosts Xo
+.Pq "string, default=no"
+.Xc
 If
 .Qq yes ,
 .Nm Amd
@@ -288,9 +308,13 @@ variable
 is used, requiring that
 .Va ${domain}
 not be null.
-.It Nm hesiod_base (string, default=automount)
+.It Ic hesiod_base Xo
+.Pq "string, default=automount"
+.Xc
 Specify the base name for hesiod maps.
-.It Nm karch (string, default to karch of the system)
+.It Ic karch Xo
+.Pq "string, default to karch of the system"
+.Xc
 Same as the
 .Fl k
 option to
@@ -311,15 +335,25 @@ specified,
 will use
 .Xr uname 3
 to figure out the kernel architecture of the machine.
-.It Nm ldap_base (string, default not set)
+.It Ic ldap_base Xo
+.Pq "string, default not set"
+.Xc
 Specify the base name for LDAP.
-.It Nm ldap_cache_maxmem (numeric, default=131072)
+.It Ic ldap_cache_maxmem Xo
+.Pq "numeric, default=131072"
+.Xc
 Specify the maximum memory amd should use to cache LDAP entries.
-.It Nm ldap_cache_seconds (numeric, default=0)
+.It Ic ldap_cache_seconds Xo
+.Pq "numeric, default=0"
+.Xc
 Specify the number of seconds to keep entries in the cache.
-.It Nm ldap_hostports (string, default not set)
+.It Ic ldap_hostports Xo
+.Pq "string, default not set"
+.Xc
 Specify LDAP-specific values such as country and organization.
-.It Nm local_domain (string, default no sub-domain)
+.It Ic local_domain Xo
+.Pq "string, default no sub-domain"
+.Xc
 Same as the
 .Fl d
 option to
@@ -327,7 +361,9 @@ option to
 Specify the local domain name.  If this option is not given the domain name is
 determined from the hostname by removing the first component of the
 fully-qualified host name.
-.It Nm log_file (string, default=/dev/stderr)
+.It Ic log_file Xo
+.Pq "string, default=/dev/stderr"
+.Xc
 Same as the
 .Fl l
 option to
@@ -359,7 +395,9 @@ using the
 .Ev LOG_LOCAL7
 facility
 .Pq if it exists on the system .
-.It Nm log_options (string, default no logging options)
+.It Ic log_options Xo
+.Pq "string, default no logging options"
+.Xc
 Same as the
 .Fl x
 option to
@@ -370,37 +408,37 @@ Options are comma delimited, and can be preceded by the string
 .Dq no
 to negate their meaning.  The
 .Dq debug
-logging option is only available if
-.Nm am-utils
-was configured with
+logging option is only available if am-utils was configured with
 .Fl -enable-debug .
 You can get the list of supported debugging options by running
 .Nm amd Fl v .
 Possible values are:
 .Pp
-.Bl -tag -width 10n -compact
-.It Nm all 
+.Bl -tag -width "warning" -compact
+.It Ic all 
 all messages
-.It Nm debug
+.It Ic debug
 debug messages
-.It Nm error
+.It Ic error
 non-fatal system errors
-.It Nm fatal
+.It Ic fatal
 fatal errors
-.It Nm info
+.It Ic info
 information
-.It Nm map
+.It Ic map
 map errors
-.It Nm stats
+.It Ic stats
 additional statistical information
-.It Nm user
+.It Ic user
 non-fatal user errors
-.It Nm warn
+.It Ic warn
 warnings
-.It Nm warning
+.It Ic warning
 warnings
 .El
-.It Nm nfs_retransmit_counter (numeric, default=110)
+.It Ic nfs_retransmit_counter Xo
+.Pq "numeric, default=110"
+.Xc
 Same as the
 .Ic counter
 part of the
@@ -408,7 +446,9 @@ part of the
 option to
 .Nm amd .
 Specifies the retransmit counter's value in tenths of seconds.
-.It Nm nfs_retry_interval (numeric, default=8)
+.It Ic nfs_retry_interval Xo
+.Pq "numeric, default=8"
+.Xc
 Same as the
 .Ic interval
 part of the 
@@ -416,10 +456,9 @@ part of the
 option to
 .Nm amd .
 Specifies the interval in tenths of seconds, between NFS/RPC/UDP retries.
-.It Nm nis_domain
-.Po string, default to local
-.Tn NIS
-.Pc domain name
+.It Ic nis_domain Xo
+.Pq "string, default to local NIS domain name"
+.Xc
 Same as the
 .Fl y
 option to
@@ -431,7 +470,9 @@ domain from which to fetch the
 maps.  The default is the system domain name.  This option is ignored if
 .Tn NIS
 support is not available.
-.It Nm normalize_hostnames (boolean, default=no)
+.It Ic normalize_hostnames Xo
+.Pq "boolean, default=no"
+.Xc
 Same as the
 .Fl n
 option to
@@ -444,7 +485,9 @@ is normalized relative to the host database before being used.  The effect is
 to translate aliases into
 .Qq official
 names.
-.It Nm os (string, default to compiled in value)
+.It Ic os Xo
+.Pq "string, default to compiled in value"
+.Xc
 Same as the
 .Fl O
 option to
@@ -456,7 +499,9 @@ compatibility reasons.  For example, if the build in name is
 you can override it to
 .Dq sos5 ,
 and use older maps which were written with the latter in mind.
-.It Nm osver (string, default to compiled in value)
+.It Ic osver Xo
+.Pq "string, default to compiled in value"
+.Xc
 Same as the
 .Fl o
 option to
@@ -468,7 +513,9 @@ compatibility reasons.  For example, if the build in version is
 you can override it to
 .Dq 5.5.1 ,
 and use older maps that were written with the latter in mind.
-.It Nm pid_file (string, default=/dev/stdout)
+.It Ic pid_file Xo
+.Pq "string, default=/dev/stdout"
+.Xc
 Specify a file to store the process ID of the running daemon into.  If not
 specified,
 .Nm amd
@@ -481,7 +528,9 @@ can also be retrieved via
 This file is used only if the
 .Ar print_pid
 option is on.
-.It Nm plock (boolean, default=yes)
+.It Ic plock Xo
+.Pq "boolean, default=yes"
+.Xc
 Same as the
 .Fl S
 option to
@@ -491,7 +540,7 @@ If
 lock the running executable pages of
 .Nm amd
 into memory.  To improve
-.Nm amd's
+.Nm amd Ns 's
 performance, systems that support the
 .Xr plock 3
 call can lock the
@@ -500,12 +549,14 @@ process into memory.  This way there is less chance it that the operating
 system will schedule, page out, and swap the
 .Nm amd
 process as needed.  This improves
-.Nm amd's
+.Nm amd Ns 's
 performance, at the cost of reserving the memory used by the
 .Nm amd
 process
 .Pq making it unavailable for other processes .
-.It Nm portmap_program (numeric, default=300019)
+.It Ic portmap_program Xo
+.Pq "numeric, default=300019"
+.Xc
 Specify an alternate Port-mapper RPC program number, other than the official
 number.  This is useful when running multiple
 .Nm amd
@@ -527,7 +578,9 @@ to contact.  In this way,
 can fully control any number of
 .Nm amd
 processes running on the same host.
-.It Nm print_pid (boolean, default=no)
+.It Ic print_pid Xo
+.Pq "boolean, default=no"
+.Xc
 Same as the
 .Fl p
 option to
@@ -536,7 +589,9 @@ If
 .Dq yes ,
 .Nm amd
 will print its process ID upon starting.
-.It Nm print_version (boolean, default=no)
+.It Ic print_version Xo
+.Pq "boolean, default=no"
+.Xc
 Same as the
 .Fl v
 option to
@@ -548,7 +603,9 @@ continues to run.  If
 .Nm amd
 will print its version information string, which includes some configuration
 and compilation values.
-.It Nm restart_mounts (boolean, default=no)
+.It Ic restart_mounts Xo
+.Pq "boolean, default=no"
+.Xc
 Same as the
 .Fl r
 option to
@@ -560,7 +617,9 @@ will scan the mount table to determine which file systems are currently
 mounted.  Whenever one of these would have been auto-mounted,
 .Nm amd
 inherits it.
-.It Nm selectors_on_default (boolean, default=no)
+.It Ic selectors_on_default Xo
+.Pq "boolean, default=no"
+.Xc
 If
 .Dq yes ,
 then the
@@ -578,7 +637,9 @@ follows:
    wire==slip-net;opts:=intr,rsize=1024,wsize=1024 \\
    wire!=slip-net;opts:=intr,rsize=8192,wsize=8192
 .Ed
-.It Nm show_statfs_entries (boolean, default=no)
+.It Ic show_statfs_entries Xo
+.Pq "boolean, default=no"
+.Xc
 If
 .Dq yes ,
 then all maps which are browsable will also show the number of entries
@@ -586,10 +647,12 @@ then all maps which are browsable will also show the number of entries
 they have when
 .Qq df
 runs.
-.Po This is accomplished by returning non-zero values to the
+(This is accomplished by returning non-zero values to the
 .Xr statfs 2
-.Pc system call .
-.It Nm unmount_on_exit (boolean, default=no)
+system call.)
+.It Ic unmount_on_exit Xo
+.Pq "boolean, default=no"
+.Xc
 If
 .Dq yes ,
 then 
@@ -597,7 +660,7 @@ then
 will attempt to unmount all file systems which it knows about.  Normally
 .Nm amd
 leaves all 
-.Pq esp.
+.Pq esp.\&
 .Tn NFS
 mounted filesystems intact.  Note that
 .Nm amd
@@ -607,11 +670,15 @@ option or
 .Fl r
 flag are used.
 .El
-.It Sy Parameters applicable to regular map sections
-.Bl -tag -width F1
-.It Nm map_name (string, must be specified)
+.Ss "Parameters applicable to regular map sections"
+.Bl -tag -width 4n
+.It Ic map_name Xo
+.Pq "string, must be specified"
+.Xc
 Name of the map where the keys are located.
-.It Nm tag (string, default no tag)
+.It Ic tag Xo
+.Pq "string, default no tag"
+.Xc
 Each map entry in the configuration file can be tagged.  If no tag is
 specified, that map section will always be processed by
 .Nm amd .
@@ -684,4 +751,5 @@ file distributed with am-utils.
 .Sh HISTORY
 The
 .Nm amd
-utility first appeared in 4.4BSD.
+utility first appeared in
+.Bx 4.4 .
@@ -1,3 +1,297 @@
+Mon Aug  7 15:23:00 2000  Arnold D. Robbins  <[email protected]>
+
+	* Release 3.0.6: Release tar file made.
+
+Thu Aug  3 17:47:53 2000  Greg McGary  <[email protected]>
+
+	* regex.c: patches for gcc bounded pointer handling.
+
+Thu Aug  3 13:09:09 2000  Arnold D. Robbins  <[email protected]>
+
+	* array.c (in_array, do_delete): fix tests for index equality
+	  when searching through the array to work correctly when
+	  index is "".
+
+Fri Jul 14 21:40:17 2000  Pat Rankin  <[email protected]>
+
+	* builtin.c (format_tree): Workaround a DEC C V5.7 bug by
+	  splitting `strcpy() + 3' into two expressions (the builtin
+	  inline strcpy evidently has erroneous return type of void *
+	  instead of char *; reputedly fixed in V6.1).
+
+	* eval.c (C): New macro.
+	[casetable]: Use it to add explicit casts for the character
+	  values outside the range of 0 to 127.
+	* missing/strncasecmp.c [C, charmap]: Likewise.
+
+	* io.c (redirect): Add EIO check on failed open for VMS.
+
+Fri Jul 14 11:57:23 2000  Arnold D. Robbins  <[email protected]>
+
+	Efficiency hack: turn `for (iggy in foo) delete foo[iggy]'
+	into moral equivalent of `delete foo'.
+	* array.c (do_delete_loop): new routine.
+	* awk.h [NODETYPE]: new Node_K_delete_loop value.
+	  Add declaration of do_delete_loop.
+	* awk.y [LEX_FOR]: Fix code to recognize special case.
+	* eval.c (nodetypes): new entry for Node_K_delete_loop.
+	(interpret): add case for Node_K_delete_loop, add more
+	diagnostic info in default  (cant_happen) case.
+
+Tue Jul 11 22:15:10 2000  Pat Rankin  <[email protected]>
+
+	* awk.y (nextc): Recast unsigned char values back to int to
+	  prevent VAX C from truncating EOF to 255.
+
+Tue Jul 11 14:08:23 2000  Arnold D. Robbins  <[email protected]>
+
+	* array.c (do_delete): switch to string comparison, not
+	  cmp_nodes.
+	  (assoc_find): add call to force_string on subscript.
+	* eval.c (interpret): Case Node_K_arrayfor: check for
+	  Node_array_ref and fetch original_array. Yowser.
+
+Fri Jun 30 21:57:00 2000  Arnold D. Robbins  <[email protected]>
+
+	* array.c (assoc_lookup): Don't force the subscript
+	  to be a string.  Not a good idea after the change
+	  to using dupnode.
+
+Sun Jun 25 15:08:19 2000  Arnold D. Robbins  <[email protected]>
+
+	* Release 3.0.5: Release tar file made.
+
+Wed Jun 14 13:03:45 2000  Arnold D. Robbins  <[email protected]>
+
+	* field.c (set_record): manage a private buffer for $0.
+	  Keeps things safe in case `getline var' rearranges the
+	  IOBUF's contents that $0 is still pointing into.
+
+Tue Jun 13 16:27:55 2000  Paul Eggert  <[email protected]>
+
+	Upgrade to latest and greatest version of largefile code.
+
+	* configure.in (AC_CANONICAL_HOST): Remove.
+	(GAWK_AC_SYS_LARGEFILE): Defer until after AC_MINIX,
+	to avoid autoconf warnings.
+
+	Rewrite largefile configuration so that we don't need to run
+	getconf and don't need AC_CANONICAL_HOST.
+	* config.guess, config.sub: Remove these files.    
+	* Makefile.in (MISC): Remove config.guess, config.sub.
+	* m4/largefile.m4 (GAWK_AC_SYS_LARGEFILE_FLAGS,
+	GAWK_AC_SYS_LARGEFILE_SPACE_APPEND): Remove.
+	(GAWK_AC_SYS_LARGEFILE_TEST_INCLUDES): New macro.
+	(GAWK_AC_SYS_LARGEFILE_MACRO_VALUE): Change arguments from
+	CODE-TO-SET-DEFAULT to VALUE, INCLUDES, FUNCTION-BODY.
+	All uses changed.
+	Instead of inspecting the output of getconf, try to compile the
+	test program without and with the macro definition.
+	(GAWK_AC_SYS_LARGEFILE): Do not require AC_CANONICAL_HOST or check
+	for getconf.  Instead, check for the needed flags by compiling
+	test programs.
+
+	(GAWK_AC_SYS_LARGEFILE): Define _XOPEN_SOURCE to be 500 to
+	work around glibc 2.1.3 bug.
+
+	(GAWK_AC_SYS_LARGEFILE_FLAGS): Don't use -n32 on IRIX if the
+	installer said otherwise.
+
+	(GAWK_AC_SYS_LARGEFILE_FLAGS): Work around a bug in the QNX shell,
+	which doesn't propagate exit status of failed commands inside
+	shell assignments.
+
+Wed Jun  7 13:23:09 2000  Arnold D. Robbins  <[email protected]>
+
+	* Updated copyright dates in appropriate files.
+
+Mon May 22 17:29:43 2000  Arnold D. Robbins  <[email protected]>
+
+	* Makefile.in (clean): get `*/core' too.
+
+Sun May  7 16:33:05 2000  Arnold D. Robbins  <[email protected]>
+
+	* array.c (concat_exp): Change ref to `lnode->stlen' and
+	  `lnode->stptr' for SUBSEP to use `var_value->...'.
+
+Tue May  2 09:54:29 2000  Arnold D. Robbins  <[email protected]>
+
+	Fix referencing freed memory as shown by test/arynocls.* tests.
+	* awk.h [Node_array_ref]: new node type.
+	  [orig_array]: new macro element in NODE structure.
+	* field.c (do_split): handle case for Node_array_ref, fetch
+	  the original array.
+	* array.c (in_array, do_delete): ditto.
+	* eval.c (nodetypes[]): add Node_array_ref string.
+	  (r_tree_eval): handle case for Node_array_ref.
+	  (push_args): push arrays as Node_array_ref, and pass them on.
+	  (pop_fcall): don't unref lnode if it's an array when releasing
+	  local arguments.  Check for both Node_array and Node_array_ref.
+	  (r_get_lhs): choke on Node_array_ref as for Node_array.
+	  For Node_subscript, handle Node_array_ref.
+
+Tue May  2 09:52:12 2000  Bruno Haible  <[email protected]>
+
+	* io.c (redirect): After reopening a `struct redirect', move it to
+	  the head of the list.
+
+Sun Apr  2 17:51:40 2000  Arnold D. Robbins  <[email protected]>
+
+	* re.c (re_update): Check if IGNORECASE has changed, and
+	  if so recompute the re.  See test/igncdym.awk.
+
+Mon Mar 20 16:18:34 2000  Arnold D. Robbins  <[email protected]>
+
+	* io.c (set_RS): Added a lint warning about multicharacter RS,
+	  per suggestion from Akim DeMaille ([email protected]).
+
+Sun Feb 13 14:40:32 2000  Arnold D. Robbins  <[email protected]>
+
+	* eval.c (push_args): Fix from Nide Naoyuki <[email protected]>,
+	  re-assign `f' in case tree_eval moved fcall_list around.
+
+Sun Feb  6 11:39:33 2000  Arnold D. Robbins  <[email protected]>
+
+	* eval.c (op_assign):  Fix it right.  For ++ and --, get the lhs
+	  in the operations, do the op, and then return.  For += etc,
+	  get the rhs FIRST, since the lhs can move around as a result,
+	  *then* get the lhs and do the operation. See test/opasnidx.awk.
+
+Tue Feb  1 18:41:40 2000  Arnold D. Robbins  <[email protected]>
+
+	* eval.c (op_assign): reget the rval after regetting
+	  the left hand side.  See test/opasnslf.awk for why.
+
+Thu Jan 27 18:06:31 2000  Arnold D. Robbins  <[email protected]>
+
+	* awk.y (yylex): Made ']' not one of the characters
+	  that sets `want_assign' to false.  `a[i] /= 2' was
+	  broken.  Per bug report from Kristofer T. Karas
+	  <[email protected]>.
+
+Wed Dec 22 15:06:37 1999  Arnold D. Robbins  <[email protected]>
+
+	* awk.y: Removed declarations of functions before
+	  definition of `tokentab[]'.  They're redundant with
+	  what's in awk.h.
+
+Thu Dec  9 17:01:07 1999  Arnold D. Robbins  <[email protected]>
+
+	* node.c (parse_escape): Add lint warning for unrecognized
+	  escape sequences.
+
+Mon Dec  6 15:17:34 1999  Arnold D. Robbins  <[email protected]>
+
+	* main.c (usage): Changed bug reporting email addresses to
+	  be a reference to `Bugs' node in the online and printed
+	  doc, instead.
+
+Thu Dec  2 13:08:18 1999  Arnold D. Robbins  <[email protected]>
+
+	* builtin.c (do_compl): test `d' for negative inside the do_lint
+	  test, not uval.  Ooops.
+
+Fri Nov 26 10:58:36 1999  Arnold D. Robbins  <[email protected]>
+
+	* array.c (assoc_find):  ALWAYS compare indexes as strings,
+	  don't use cmp_nodes in case they are numeric.  Oh my.
+	  Talk about a Day 1 bug!
+
+Tue Nov 23 11:58:53 1999  Arnold D. Robbins  <[email protected]>
+
+	* regex.c (SYNTAX): cast argument to `unsigned char' instead of
+	  &-ing with 0xFF.  Hopefully somewhat more portable, ala 21 Nov 99
+	  changes to awk.y.
+
+Sun Nov 21 22:25:27 1999  Paul Eggert  <[email protected]>
+
+	* aclocal.m4 (AC_SYS_LARGEFILE_FLAGS): Work around a
+	  problem with the QNX 4.25 shell, which doesn't propagate exit
+	  status of failed commands inside shell assignments.
+
+Sun Nov 21 20:33:35 1999 Arnold D. Robbins  <[email protected]>
+
+	* awk.h (nextc): remove declaration, don't need it here.
+	  awk.y (nextc): Cast values to unsigned char so that latin-1
+	  characters in strings don't turn themselves into EOF.
+	  Most notably y-umlaut, which is decimal 255.
+
+Mon Nov  1 20:00:25 1999  Arnold D. Robbins  <[email protected]>
+
+	* regex.c (init_syntax_once): move below definition of
+	  ISALNUM etc., then use ISALNUM to init the table, so that
+	  the word ops will work if i18n'ed.
+	  (SYNTAX): And subscript with 0xFF for Latin-1 characters.
+
+Mon Oct 25 18:37:13 1999  Arnold D. Robbins  <[email protected]>
+
+	* awk.h, main.c, io.c: undo previous changes (22 Oct 1999).
+	* main.c (main): move call to `init_fields()' to before
+	  arg parsing.  This allows `-v NF=blah' to work ok.
+
+Fri Oct 22 17:43:40 1999  Arnold D. Robbins  <[email protected]>
+
+	* main.c (arg_assign): Add new arg, `initing' for icky special
+	  casing of -v of special variables.  Use it to check for NF.
+	  May need to add other cases later.
+	  (pre_assign): change call arg_assign, passing initing=TRUE;
+	  io.c (nextfile): change call arg_assign, passing initing=FALSE;
+	  awk.h: Change prototype for arg_assign.
+
+Tue Oct 19 16:06:48 1999  Paul Eggert  <[email protected]>
+
+	* io.c (close_redir): Don't munge errno between setting it and
+	  using it.
+
+Wed Oct  6 17:47:47 1999  Arnold D. Robbins  <[email protected]>
+
+	* main.c (arg_assign): return NULL on bad variable.  Allows
+	  things like `./3x=stuff' to work as a filename.
+
+Thu Sep 23 21:35:46 1999  Paul Eggert  <[email protected]>
+
+	* aclocal.m4 (GAWK_AC_SYS_LARGEFILE_FLAGS): Work around GCC
+	  2.95.1 bug in HP-UX 10.20 or later. (Had to fix the fix. ADR. :-)
+
+Tue Sep 21 13:31:36 1999  Arnold D. Robbins  <[email protected]>
+
+	* builtin.c (format_tree): For '0', only set zero_flag if we
+	  haven't seen the field width or precision yet.
+
+Mon Aug  9 13:06:01 1999  Arnold D. Robbins  <[email protected]>
+
+	* array.c (assoc_lookup): Removed code that gave each array
+	  a private copy of each index.  Balloons memory usage for
+	  no good reason that I can see.  Just use dupnode in all
+	  cases.
+	* configure.in: check for $srcdir/.developing adds extra
+	  defines for my testing/debugging use.  Yes, hack alert.
+
+Sun Aug  1 11:02:02 1999  Arnold D. Robbins  <[email protected]>
+
+	* node.c (dupnode): turn off FIELD when copying nodes.
+	* array.c (do_adump, assoc_dump): new functions for array debugging.
+	* awk.y (tokentab): conditionally add "adump" function for debugging.
+	* awk.h: delcare new functions.
+
+Thu Jul 29 23:26:40 1999  Arnold D. Robbins  <[email protected]>
+
+	From [email protected]:
+	* Makefile.in (install-strip): new target, coding stds. compatibility.
+	* config.guess, config.sub: Add MacOS X recognition.
+
+Thu Jul 29 19:09:19 1999  Arnold D. Robbins  <[email protected]>
+
+	* awk.y (func_install): make `function foo(foo)' a fatal error.
+	  eval.c (r_tree_eval): diagnose use of a function name as a
+	  variable inside the function.
+
+Sun Jul  4 16:53:14 1999  Arnold D. Robbins  <[email protected]>
+
+	* eval.c (eval_condition): add extra braces to avoid
+	  gcc warning.  I'm not going to bother for the library
+	  code like dfa and regex.
+
 Wed Jun 30 16:14:36 1999  Arnold D. Robbins  <[email protected]>

 	* Release 3.0.4: Release tar file made.  This time for sure.
@@ -103,7 +397,7 @@ Wed Apr 28 12:27:49 1999  Arnold D. Robbins  <[email protected]>
 Sun Apr 25 13:39:16 1999  Arnold D. Robbins  <[email protected]>

 	* Makefile.in (gawk): add $(CFLAGS) to linking step.
-	* configure.in: correctly do AC_FUNC_GETPRGP on HP systems too.
+	* configure.in: correctly do AC_FUNC_GETPGRP on HP systems too.

 Tue Apr 13 20:21:00 1999  Arnold D. Robbins  <[email protected]>

@@ -149,7 +443,7 @@ Sun Nov  1 15:24:52 1998  Arnold D. Robbins  <[email protected]>

 Wed Oct 28 20:40:17 1998  Arnold D. Robbins  <[email protected]>

-	* eval.c (r_tree_eval): Case for Node_concat. Get lengthes
+	* eval.c (r_tree_eval): Case for Node_concat. Get lengths
 	  separately, in case one expression has a side effect that
 	  that changes another. Ugly, but it keeps gawk from core
 	  dumping. See test/nasty.awk.
@@ -418,7 +712,7 @@ Mon Apr  7 18:22:37 1997  Arnold D. Robbins  <[email protected]>

 	* awk.h: Add decls of new routines do_compl() and set_loc().
 	* awk.y (tokentab): add entry for "compl" function.
-	* builtin.c (do_compl): new functionto do ones complement.
+	* builtin.c (do_compl): new function to do ones complement.
 	  (do_substr): rationalized yet again, now notices negative start
 	  and length parameters.
 	* eval.c (push_args): fix if call_list gets realloc'ed in the
@@ -517,7 +811,7 @@ Wed Feb 19 23:29:02 1997  Arnold D. Robbins  <[email protected]>

 Fri Feb 14 09:47:31 1997  Arnold D. Robbins  <[email protected]>

-	* io.c [#include "awk.h"]: undef HAVE_MMAP to just use thoe old code.
+	* io.c [#include "awk.h"]: undef HAVE_MMAP to just use the old code.
 	  Something is causing a file descriptor leak, and this is getting to
 	  be just too much hair. I reserve the right to rip out the mmap
 	  code entirely at a future date.
@@ -616,7 +910,7 @@ Wed Dec 18 10:09:44 1996  Arnold D. Robbins  <[email protected]>
 	* configure.in [AC_PREREQ]: Update to 2.12 in order to switch to
 	  autoconf 2.12. Lots of other files will be rebuilt automatically.
 	  [AM_SANITY_CHECK_CC]: Removed, autoconf does it now.
-	* alocal.m4 [AM_SANITY_CHECK_CC]: Removed, autoconf does it now.
+	* aclocal.m4 [AM_SANITY_CHECK_CC]: Removed, autoconf does it now.

 Tue Dec 17 22:23:16 1996  Arnold D. Robbins  <[email protected]>

@@ -808,7 +1102,7 @@ Fri Sep 20 17:35:54 1996  Pat Rankin  <[email protected]>
 Fri Sep 20 11:54:31 1996  Arnold D. Robbins  <[email protected]>

 	* builtin.c (do_print): evaluate all the expressions first and
-	  then print them. Avoids suprising behavior. See test/prtoeval.awk
+	  then print them. Avoids surprising behavior. See test/prtoeval.awk
 	  for an example.

 Tue Sep 10 06:21:40 1996  Arnold D. Robbins  <[email protected]>
@@ -976,7 +1270,7 @@ Fri May 17 08:46:07 1996  Arnold D. Robbins  <[email protected]>
 Wed May 15 02:34:55 1996  Arnold D. Robbins  <[email protected]>

 	* Makefile.in (awklib/all): now depends on gawk, fixes problem
-	  with parrallel make.
+	  with parallel make.

 Tue May 14 15:02:52 1996  Arnold D. Robbins  <[email protected]>

@@ -1027,7 +1321,7 @@ Thu Mar  7 08:08:51 1996  Arnold D. Robbins  <[email protected]>
 	* field.c (set_NF): If NF is decremented, clear fields between
 	  NF and parse_high_water, otherwise if NF incremented, clear
 	  fields between parse_high_water and NF.
-	* eval.c (nodetype2str): new function, used for diganostics.
+	* eval.c (nodetype2str): new function, used for diagnostics.
 	  eval.c (interpret): use nodetype2str when finding invalid node.
 	  
 Mon Mar  4 09:02:28 1996  Arnold D. Robbins  <[email protected]>
@@ -1066,7 +1360,7 @@ Thu Feb  1 08:56:46 1996  Arnold D. Robbins  <[email protected]>
 Sun Jan 28 07:00:56 1996  Arnold D. Robbins  <[email protected]>

 	* builtin.c (do_substr): rationalized handling of missing length
-	  argument, as well as various accompagnying lint warnings. Previous
+	  argument, as well as various accompanying lint warnings. Previous
 	  code was slightly bogus. Talk about your Day 1 bugs.

 Thu Jan 25 14:09:11 1996  Arnold D. Robbins  <[email protected]>
@@ -1,15 +1,14 @@
 $FreeBSD$

-Import of GNU awk 3.0.4
+Import of GNU awk 3.0.6

-Original source available as ftp://prep.ai.mit.edu/pub/gnu/gawk-3.0.4.tar.gz
+Obtained from: ftp://prep.ai.mit.edu/pub/gnu/gawk/gawk-3.0.6.tar.gz

 The following files and directories were removed for this import:

-Makefile.in
 README_d/README.VMS
 README_d/README.atari
-README_d/README.irix
+README_d/README.beos
 README_d/README.linux
 README_d/README.pc
 README_d/README.sco
@@ -19,43 +18,7 @@ README_d/README.sony
 README_d/README.sunos4
 README_d/README.ultrix
 README_d/README.yacc
-aclocal.m4
-alloca.c
 atari/
-awklib/
-awktab.c
-config.guess
-config.sub
-configh.in
-configure
-configure.in
-doc/Makefile.in
-doc/README.card
-doc/ad.block
-doc/awkcard.in
-doc/awkforai.txt
-doc/cardfonts
-doc/colors
-doc/igawk.1
-doc/gawk.info
-doc/macros
-doc/no.colors
-doc/setter.outline
-doc/texinfo.tex
-install-sh
 missing/
-missing.c
-mkinstalldirs
 pc/
-protos.h
-random.c
-random.h
-regex.c
-regex.h
-stamp-h.in
-test/
 vms/
-
-In addition, doc/gawk.1 was renamed to awk.1.
-
-[email protected]
@@ -1,3 +1,74 @@
+Changes from 3.0.5 to 3.0.6
+---------------------------
+
+This is a bug fix release only, pending further development on 3.1.0.
+
+Bugs fixed and changes made:
+
+1. Subscripting an array with a variable that is just a number no
+   longer magically converts the variable into a string.
+
+2. Similarly, running a `for (iggy in foo)' loop where `foo' is a
+   function parameter now works correctly.
+
+3. Similarly, `i = ""; v[i] = a; if (v in a) ...' now works again.
+
+4. Gawk now special cases `for (iggy in foo) delete foo[iggy]' and
+   treats it as the moral equivalent of `delete foo'.  This should be
+   a major efficiency win when portably deleting large arrays.
+
+5. VMS port brought up to date.
+
+Changes from 3.0.4 to 3.0.5
+---------------------------
+
+This is a bug fix release only, pending further development on 3.1.0.
+
+Bugs Fixed:
+
+ 1. `function foo(foo)' is now a fatal error.
+
+ 2. Array indexing is now much more efficient: where possible, only one
+    copy of an index string is kept, even if used in multiple arrays.
+
+ 3. Support was added for MacOS X and an `install-strip' target.
+
+ 4. [s]printf formatting for `0' flag and floating point formats now
+    works correctly.
+
+ 5. HP-UX large file support with GCC 2.95.1 now works.
+
+ 6. Arguments that contain `=' but that aren't syntactically valid are
+    now treated as filenames, instead of as fatal errors.
+
+ 7. `-v NF=foo' now works.
+
+ 8. Non-ascii alphanumeric characters are now treated as such in the
+    right locales by regex.c.  Similarly, a Latin-1 y-umlaut (decimal
+    value 255) in the program text no longer acts like EOF.
+
+ 9. Array indexes are always compared as strings; fixes an obscure bug
+    when user input gets used for the `x in array' test.
+
+10. The usage message now points users to the documentation for how
+    to report bugs.
+
+11. `/=' now works after an array.
+
+12. `b += b += 1' now works correctly.
+
+13. IGNORECASE changing with calls match() now works better. (Fix for
+    semi-obscure bug.)
+
+14. Multicharacter values for RS now generate a lint warning.
+
+15. The gawk open file caching is now much more efficient.
+
+16. Global arrays passed to functions are now managed better.  In particular,
+    test/arynocls.awk won't crash referencing freed memory.
+
+17. In obscure cases, `getline var' can no longer clobber $0.
+
 Changes from 3.0.3 to 3.0.4
 ---------------------------

@@ -1,27 +1,29 @@
-Gawk 3.0.4 has been successfully compiled and run "make test"
+Gawk 3.0.5 has been successfully compiled and run "make test"
 on the following:

-Linux 2.2.5                     gcc 2.7.2.3
-Linux 2.0.33                    gcc 2.7.2.1
-IRIX64 6.4                      gcc 2.8.1
-IRIX 5.3                        gcc 2.7.2.2
-UNIX_SV maxion OS 4.2MP         gcc 2.7.2
-IRIX 6.2                        gcc 2.7.2.2
-CYGWIN_95-4.0 20.1 (0.3/1/1)    egcs-2.91.66 (has minor problems due to env.)
+	Linux  2.2.14     gcc 2.95.2
+	Linux  2.2.13-SMP egcs-2.91.66     make test -j5
+	IRIX64 6.5        gcc 2.8.1
+	IRIX   5.3        gcc 2.7.2.2
+	SunOS  5.3        gcc 2.5.8
+	Linux  2.0.33     gcc 2.7.2.1
+	IRIX64 6.5        gcc 2.95.1

-The builds of gawk-3.0.45, and validation and installation, were
-successful on these systems:
-
-        DEC Alpha               OSF/1 3.2
+        Apple Macintosh PPC G3  Rhapsody 5.5
+        DEC Alpha               OSF/1 4.0F
+        DEC Alpha               Linux
        HP 9000/735             HP-UX 10.01
+	HP PA 1.1		HP-UX 11.00
        IBM PowerPC             AIX 4.2
-        Intel Pentium II MMX    GNU/Linux 2.0.35
+        Intel Pentium III       GNU/Linux 2.2.12-20smp (Redhat 6.1)
        NeXT Turbostation       Mach 3.3
-        SGI Indigo/2            IRIX 5.3
-        SGI O2 R10000-SC        IRIX 6.3
+	SGI MIPS		IRIX 6.3
+        SGI Origin 200          IRIX 6.5
+        Sun SPARC               GNU/Linux 2.2.12-42smp (Redhat 6.1)
        Sun SPARC               Solaris 2.6
+        Sun SPARC               Solaris 2.7

-On 
-        SGI Origin 200          IRIX 6.4
-a build with gcc-2.8.1 succeeded, but several tests failed; a rebuild
-with c89 fixed the problem.
+	DEC Alpha		OpenVMS
+	DEC Vax			VMS DEC C
+
+	OS/2			EMX GCC
@@ -1,10 +1,10 @@
 README:

-This is GNU Awk 3.0.4. It should be upwardly compatible with the Bell
+This is GNU Awk 3.0.6. It should be upwardly compatible with the Bell
 Labs research version of awk.  It is almost completely compliant with
 the 1993 POSIX 1003.2 standard for awk. (See the note below about POSIX.)

-Patches 1 through 4 just fix bugs -- see NEWS and ChangeLog for details.
+Patches 1 through 5 just fix bugs -- see NEWS and ChangeLog for details.

 See the file INSTALL for installation instructions.

@@ -3,7 +3,7 @@
 */

 /* 
- * Copyright (C) 1995-1999 the Free Software Foundation, Inc.
+ * Copyright (C) 1995-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -3,7 +3,7 @@
 */

 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -61,8 +61,8 @@ register NODE *tree;
 	r = force_string(tree_eval(tree->lnode));
 	if (tree->rnode == NULL)
 		return r;
-	subseplen = SUBSEP_node->lnode->stlen;
-	subsep = SUBSEP_node->lnode->stptr;
+	subseplen = SUBSEP_node->var_value->stlen;
+	subsep = SUBSEP_node->var_value->stptr;
 	len = r->stlen + subseplen + 2;
 	emalloc(str, char *, len, "concat_exp");
 	memcpy(str, r->stptr, r->stlen+1);
@@ -214,11 +214,23 @@ register NODE *subs;
 int hash1;
 {
 	register NODE *bucket;
+	NODE *s1, *s2;

 	for (bucket = symbol->var_array[hash1]; bucket != NULL;
 			bucket = bucket->ahnext) {
-		if (cmp_nodes(bucket->ahname, subs) == 0)
-			return bucket;
+		/*
+		 * This used to use cmp_nodes() here.  That's wrong.
+		 * Array indexes are strings; compare as such, always!
+		 */
+		s1 = bucket->ahname;
+		s1 = force_string(s1);
+		s2 = subs;
+
+		if (s1->stlen == s2->stlen) {
+			if (s1->stlen == 0	/* "" is a valid index */
+			    || STREQN(s1->stptr, s2->stptr, s1->stlen))
+				return bucket;
+		}
 	}
 	return NULL;
 }
@@ -234,6 +246,8 @@ NODE *symbol, *subs;

 	if (symbol->type == Node_param_list)
 		symbol = stack_ptr[symbol->param_cnt];
+	if (symbol->type == Node_array_ref)
+		symbol = symbol->orig_array;
 	if ((symbol->flags & SCALAR) != 0)
 		fatal("attempt to use scalar as array");
 	/*
@@ -266,6 +280,8 @@ NODE *symbol, *subs;
 	register int hash1;
 	register NODE *bucket;

+	assert(symbol->type == Node_var_array || symbol->type == Node_var);
+
 	(void) force_string(subs);

 	if ((symbol->flags & SCALAR) != 0)
@@ -308,20 +324,9 @@ NODE *symbol, *subs;

 	getnode(bucket);
 	bucket->type = Node_ahash;
-	if (subs->flags & TEMP)
-		bucket->ahname = dupnode(subs);
-	else {
-		unsigned int saveflags = subs->flags;
-
-		subs->flags &= ~MALLOC;
-		bucket->ahname = dupnode(subs);
-		subs->flags = saveflags;
-	}
+	bucket->ahname = dupnode(subs);
 	free_temp(subs);

-	/* array subscripts are strings */
-	bucket->ahname->flags &= ~NUMBER;
-	bucket->ahname->flags |= STRING;
 	bucket->ahvalue = Nnull_string;
 	bucket->ahnext = symbol->var_array[hash1];
 	symbol->var_array[hash1] = bucket;
@@ -343,6 +348,8 @@ NODE *symbol, *tree;
 		if (symbol->type == Node_var)
 			return;
 	}
+	if (symbol->type == Node_array_ref)
+		symbol = symbol->orig_array;
 	if (symbol->type == Node_var_array) {
 		if (symbol->var_array == NULL)
 			return;
@@ -360,9 +367,24 @@ NODE *symbol, *tree;

 	last = NULL;
 	for (bucket = symbol->var_array[hash1]; bucket != NULL;
-			last = bucket, bucket = bucket->ahnext)
-		if (cmp_nodes(bucket->ahname, subs) == 0)
-			break;
+			last = bucket, bucket = bucket->ahnext) {
+		/*
+		 * This used to use cmp_nodes() here.  That's wrong.
+		 * Array indexes are strings; compare as such, always!
+		 */
+		NODE *s1, *s2;
+
+		s1 = bucket->ahname;
+		s1 = force_string(s1);
+		s2 = subs;
+
+		if (s1->stlen == s2->stlen) {
+			if (s1->stlen == 0	/* "" is a valid index */
+			    || STREQN(s1->stptr, s2->stptr, s1->stlen))
+				break;
+		}
+	}
+
 	if (bucket == NULL) {
 		if (do_lint)
 			warning("delete: index `%s' not in array `%s'",
@@ -389,6 +411,50 @@ NODE *symbol, *tree;
 	}
 }

+/* do_delete_loop --- simulate ``for (iggy in foo) delete foo[iggy]'' */
+
+/*
+ * The primary hassle here is that `iggy' needs to have some arbitrary
+ * array index put in it before we can clear the array, we can't
+ * just replace the loop with `delete foo'.
+ */
+
+void
+do_delete_loop(symbol, tree)
+NODE *symbol, *tree;
+{
+	size_t i;
+	NODE *n, **lhs;
+	Func_ptr after_assign = NULL;
+
+	if (symbol->type == Node_param_list) {
+		symbol = stack_ptr[symbol->param_cnt];
+		if (symbol->type == Node_var)
+			return;
+	}
+	if (symbol->type == Node_array_ref)
+		symbol = symbol->orig_array;
+	if (symbol->type == Node_var_array) {
+		if (symbol->var_array == NULL)
+			return;
+	} else
+		fatal("delete: illegal use of variable `%s' as array",
+			symbol->vname);
+
+	/* get first index value */
+	for (i = 0; i < symbol->array_size; i++) {
+		if (symbol->var_array[i] != NULL) {
+			lhs = get_lhs(tree->lnode, & after_assign);
+			unref(*lhs);
+			*lhs = dupnode(symbol->var_array[i]->ahname);
+			break;
+		}
+	}
+
+	/* blast the array in one shot */
+	assoc_clear(symbol);
+}
+
 /* assoc_scan --- start a ``for (iggy in foo)'' loop */

 void
@@ -528,3 +594,82 @@ done:
 	symbol->var_array = new;
 	symbol->array_size = newsize;
 }
+
+/* pr_node --- print simple node info */
+
+static void
+pr_node(n)
+NODE *n;
+{
+	if ((n->flags & (NUM|NUMBER)) != 0)
+		printf("%g", n->numbr);
+	else
+		printf("%.*s", (int) n->stlen, n->stptr);
+}
+
+/* assoc_dump --- dump the contents of an array */
+
+NODE *
+assoc_dump(symbol)
+NODE *symbol;
+{
+	int i;
+	NODE *bucket;
+
+	if (symbol->var_array == NULL) {
+		printf("%s: empty (null)\n", symbol->vname);
+		return tmp_number((AWKNUM) 0);
+	}
+
+	if (symbol->table_size == 0) {
+		printf("%s: empty (zero)\n", symbol->vname);
+		return tmp_number((AWKNUM) 0);
+	}
+
+	printf("%s: table_size = %d, array_size = %d\n", symbol->vname,
+			symbol->table_size, symbol->array_size);
+
+	for (i = 0; i < symbol->array_size; i++) {
+		for (bucket = symbol->var_array[i]; bucket != NULL;
+				bucket = bucket->ahnext) {
+			printf("%s: I: [(%p, %ld, %s) len %d <%.*s>] V: [",
+				symbol->vname,
+				bucket->ahname,
+				bucket->ahname->stref,
+				flags2str(bucket->ahname->flags),
+				(int) bucket->ahname->stlen,
+				(int) bucket->ahname->stlen,
+				bucket->ahname->stptr);
+			pr_node(bucket->ahvalue);
+			printf("]\n");
+		}
+	}
+
+	return tmp_number((AWKNUM) 0);
+}
+
+/* do_adump --- dump an array: interface to assoc_dump */
+
+NODE *
+do_adump(tree)
+NODE *tree;
+{
+	NODE *r, *a;
+
+	a = tree->lnode;
+
+	if (a->type == Node_param_list) {
+		printf("%s: is paramater\n", a->vname);
+		a = stack_ptr[a->param_cnt];
+	}
+
+	if (a->type == Node_array_ref) {
+		printf("%s: array_ref to %s\n", a->vname,
+					a->orig_array->vname);
+		a = a->orig_array;
+	}
+
+	r = assoc_dump(a);
+
+	return r;
+}
@@ -3,7 +3,7 @@
 */

 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -299,6 +299,7 @@ typedef enum nodevals {
 	Node_K_do,		/* lnode is conditional, rnode stuff to run */
 	Node_K_return,		/* lnode is return value */
 	Node_K_delete,		/* lnode is array, rnode is subscript */
+	Node_K_delete_loop,	/* lnode is array, rnode is subscript */
 	Node_K_getline,		/* lnode is opt var, rnode is redirection */
 	Node_K_function,	/* lnode is statement list, rnode is params */
 	Node_K_nextfile,	/* no subs */
@@ -338,6 +339,7 @@ typedef enum nodevals {
 	Node_regex,		/* a regexp, text, compiled, flags, etc */
 	Node_hashnode,		/* an identifier in the symbol table */
 	Node_ahash,		/* an array element */
+	Node_array_ref,		/* array passed by ref as parameter */
 	Node_NF,		/* variables recognized in the grammar */
 	Node_NR,
 	Node_FNR,
@@ -463,6 +465,8 @@ typedef struct exp_node {
 #define array_size sub.nodep.l.ll
 #define table_size sub.nodep.x.xl

+#define orig_array sub.nodep.x.extra
+
 #define condpair lnode
 #define triggered sub.nodep.r.r_ent

@@ -721,16 +725,19 @@ extern unsigned int hash P((const char *s, size_t len, unsigned long hsize));
 extern int in_array P((NODE *symbol, NODE *subs));
 extern NODE **assoc_lookup P((NODE *symbol, NODE *subs));
 extern void do_delete P((NODE *symbol, NODE *tree));
+extern void do_delete_loop P((NODE *symbol, NODE *tree));
 extern void assoc_scan P((NODE *symbol, struct search *lookat));
 extern void assoc_next P((struct search *lookat));
+extern NODE *assoc_dump P((NODE *symbol));
+extern NODE *do_adump P((NODE *tree));
 /* awktab.c */
 extern char *tokexpand P((void));
-extern char nextc P((void));
 extern NODE *node P((NODE *left, NODETYPE op, NODE *right));
 extern NODE *install P((char *name, NODE *value));
 extern NODE *lookup P((const char *name));
 extern NODE *variable P((char *name, int can_free, NODETYPE type));
 extern int yyparse P((void));
+extern NODE *stopme P((NODE *tree));
 /* builtin.c */
 extern double double_to_int P((double d));
 extern NODE *do_exp P((NODE *tree));
@@ -781,6 +788,7 @@ void set_OFS P((void));
 void set_ORS P((void));
 void set_OFMT P((void));
 void set_CONVFMT P((void));
+extern char *flags2str P((int));
 /* field.c */
 extern void init_fields P((void));
 extern void set_record P((char *buf, int cnt, int freeold));
@@ -3,7 +3,7 @@
 */

 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -385,9 +385,30 @@ statement
 		{ $$ = node($6, Node_K_do, $3); }
 	| LEX_FOR '(' NAME LEX_IN NAME r_paren opt_nls statement
 	  {
-		$$ = node($8, Node_K_arrayfor,
-			make_for_loop(variable($3, CAN_FREE, Node_var),
-			(NODE *) NULL, variable($5, CAN_FREE, Node_var_array)));
+		/*
+		 * Efficiency hack.  Recognize the special case of
+		 *
+		 * 	for (iggy in foo)
+		 * 		delete foo[iggy]
+		 *
+		 * and treat it as if it were
+		 *
+		 * 	delete foo
+		 *
+		 * Check that the body is a `delete a[i]' statement,
+		 * and that both the loop var and array names match.
+		 */
+		if ($8->type == Node_K_delete
+		    && $8->rnode != NULL
+		    && strcmp($3, $8->rnode->var_value->vname) == 0
+		    && strcmp($5, $8->lnode->vname) == 0) {
+			$8->type = Node_K_delete_loop;
+			$$ = $8;
+		} else {
+			$$ = node($8, Node_K_arrayfor,
+				make_for_loop(variable($3, CAN_FREE, Node_var),
+				(NODE *) NULL, variable($5, CAN_FREE, Node_var_array)));
+		}
 	  }
 	| LEX_FOR '(' opt_exp semi exp semi opt_exp r_paren opt_nls statement
 	  {
@@ -883,20 +904,16 @@ struct token {
 	NODE *(*ptr)();		/* function that implements this keyword */
 };

-extern NODE
-	*do_exp(),	*do_getline(),	*do_index(),	*do_length(),
-	*do_sqrt(),	*do_log(),	*do_sprintf(),	*do_substr(),
-	*do_split(),	*do_system(),	*do_int(),	*do_close(),
-	*do_atan2(),	*do_sin(),	*do_cos(),	*do_rand(),
-	*do_srand(),	*do_match(),	*do_tolower(),	*do_toupper(),
-	*do_sub(),	*do_gsub(),	*do_strftime(),	*do_systime(),
-	*do_fflush();

 /* Tokentab is sorted ascii ascending order, so it can be binary searched. */
+/* Function pointers come from declarations in awk.h. */

 static struct token tokentab[] = {
 {"BEGIN",	Node_illegal,	 LEX_BEGIN,	0,		0},
 {"END",		Node_illegal,	 LEX_END,	0,		0},
+#ifdef ARRAYDEBUG
+{"adump",	Node_builtin,    LEX_BUILTIN,	GAWKX|A(1),	do_adump},
+#endif
 #ifdef BITOPS
 {"and",		Node_builtin,    LEX_BUILTIN,	GAWKX|A(2),	do_and},
 #endif /* BITOPS */
@@ -947,6 +964,9 @@ static struct token tokentab[] = {
 {"sprintf",	Node_builtin,	 LEX_BUILTIN,	0,		do_sprintf},
 {"sqrt",	Node_builtin,	 LEX_BUILTIN,	A(1),		do_sqrt},
 {"srand",	Node_builtin,	 LEX_BUILTIN,	NOT_OLD|A(0)|A(1), do_srand},
+#ifdef ARRAYDEBUG
+{"stopme",	Node_builtin,    LEX_BUILTIN,	GAWKX|A(0),	stopme},
+#endif
 {"strftime",	Node_builtin,	 LEX_BUILTIN,	GAWKX|A(0)|A(1)|A(2), do_strftime},
 #ifdef BITOPS
 {"strtonum",	Node_builtin,    LEX_BUILTIN,	GAWKX|A(1),	do_strtonum},
@@ -1217,9 +1237,9 @@ nextc()
 	int c;

 	if (lexptr && lexptr < lexend)
-		c = *lexptr++;
+		c = (int) (unsigned char) *lexptr++;
 	else if (get_src_buf())
-		c = *lexptr++;
+		c = (int) (unsigned char) *lexptr++;
 	else
 		c = EOF;

@@ -1227,8 +1247,8 @@ nextc()
 }
 #else
 #define	nextc()	((lexptr && lexptr < lexend) ? \
-			*lexptr++ : \
-			(get_src_buf() ? *lexptr++ : EOF) \
+		    ((int) (unsigned char) *lexptr++) : \
+		    (get_src_buf() ? ((int) (unsigned char) *lexptr++) : EOF) \
 		)
 #endif

@@ -1457,7 +1477,6 @@ retry:
 		return lasttok = c;

 	case ')':
-	case ']':
 	case '(':	
 	case ';':
 	case '{':
@@ -1465,6 +1484,7 @@ retry:
 		want_assign = FALSE;
 		/* fall through */
 	case '[':
+	case ']':
 		return lasttok = c;

 	case '*':
@@ -2143,6 +2163,14 @@ NODE *params;
 NODE *def;
 {
 	NODE *r;
+	NODE *n;
+
+	/* check for function foo(foo) { ... }.  bleh. */
+	for (n = params->rnode; n != NULL; n = n->rnode) {
+		if (strcmp(n->param, params->param) == 0)
+			fatal("function `%s': can't use function name as parameter name",
+					params->param); 
+	}

 	pop_params(params->rnode);
 	pop_var(params, FALSE);
@@ -2441,3 +2469,11 @@ register NODE *n;
 	}
 	return FALSE;
 }
+
+/* for debugging */
+NODE *
+stopme(tree)
+NODE *tree;
+{
+	return tmp_number((AWKNUM) 0.0);
+}
@@ -3,7 +3,7 @@
 */

 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -815,7 +815,8 @@ check_pos:
 				*cp++ = '#';
 			if (zero_flag)
 				*cp++ = '0';
-			cp = strcpy(cp, "*.*") + 3;
+			strcpy(cp, "*.*");
+			cp += 3;
 			*cp++ = cs1;
 			*cp = '\0';
 #ifndef GFMT_WORKAROUND
@@ -2103,9 +2104,11 @@ size_t len;
 			retval = (retval * 16) + val;
 		}
 	} else if (*str == '0') {
+		if (strchr(str, '8') != NULL || strchr(str, '9') != NULL)
+			goto decimal;
 		for (; len > 0; len--) {
-			if (! isdigit(*str) || *str == '8' || *str == '9')
-				goto decimal;
+			if (! isdigit(*str))
+				goto done;
 			retval = (retval * 8) + (*str - '0');
 			str++;
 		}
@@ -1,207 +0,0 @@
-/* config.h.  Generated automatically by configure.  */
-/* configh.in.  Generated automatically from configure.in by autoheader.  */
-/*
- * acconfig.h -- configuration definitions for gawk.
- */
-
-/* 
- * Copyright (C) 1995-1997 the Free Software Foundation, Inc.
- * 
- * This file is part of GAWK, the GNU implementation of the
- * AWK Programming Language.
- * 
- * GAWK is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * GAWK is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- */
-
-
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
-
-/* Define if using alloca.c.  */
-/* #undef C_ALLOCA */
-
-/* Define if type char is unsigned and you are not using gcc.  */
-#ifndef __CHAR_UNSIGNED__
-/* #undef __CHAR_UNSIGNED__ */
-#endif
-
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define to the type of elements in the array set by `getgroups'.
-   Usually this is either `int' or `gid_t'.  */
-#define GETGROUPS_T gid_t
-
-/* Define if the `getpgrp' function takes no argument.  */
-#define GETPGRP_VOID 1
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef gid_t */
-
-/* Define if you have alloca, as a function or macro.  */
-#define HAVE_ALLOCA 1
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define if you don't have vprintf but do have _doprnt.  */
-/* #undef HAVE_DOPRNT */
-
-/* Define if you have a working `mmap' system call.  */
-#define HAVE_MMAP 1
-
-/* Define if your struct stat has st_blksize.  */
-#define HAVE_ST_BLKSIZE 1
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define if your struct tm has tm_zone.  */
-#define HAVE_TM_ZONE 1
-
-/* Define if you don't have tm_zone but do have the external array
-   tzname.  */
-/* #undef HAVE_TZNAME */
-
-/* Define if you have the vprintf function.  */
-#define HAVE_VPRINTF 1
-
-/* Define if on MINIX.  */
-/* #undef _MINIX */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
-
-/* Define if the system does not provide POSIX.1 features except
-   with this defined.  */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define if your <sys/time.h> declares struct tm.  */
-/* #undef TM_IN_SYS_TIME */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef uid_t */
-
-#define HAVE_STRINGIZE 1 /* can use ANSI # operator in cpp */
-#define REGEX_MALLOC 1 /* use malloc instead of alloca in regex.c */
-#define SPRINTF_RET int /* return type of sprintf */
-/* #undef BITOPS */  /* bitwise ops (undocumented feature) */
-/* #undef NONDECDATA */ /* non-decimal input data (undocumented feature) */
-
-/* Define if you have the fmod function.  */
-#define HAVE_FMOD 1
-
-/* Define if you have the getpagesize function.  */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if you have the madvise function.  */
-#define HAVE_MADVISE 1
-
-/* Define if you have the memcmp function.  */
-#define HAVE_MEMCMP 1
-
-/* Define if you have the memcpy function.  */
-#define HAVE_MEMCPY 1
-
-/* Define if you have the memset function.  */
-#define HAVE_MEMSET 1
-
-/* Define if you have the setlocale function.  */
-#define HAVE_SETLOCALE 1
-
-/* Define if you have the strchr function.  */
-#define HAVE_STRCHR 1
-
-/* Define if you have the strerror function.  */
-#define HAVE_STRERROR 1
-
-/* Define if you have the strftime function.  */
-#define HAVE_STRFTIME 1
-
-/* Define if you have the strncasecmp function.  */
-#define HAVE_STRNCASECMP 1
-
-/* Define if you have the strtod function.  */
-#define HAVE_STRTOD 1
-
-/* Define if you have the system function.  */
-#define HAVE_SYSTEM 1
-
-/* Define if you have the tzset function.  */
-#define HAVE_TZSET 1
-
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <locale.h> header file.  */
-#define HAVE_LOCALE_H 1
-
-/* Define if you have the <memory.h> header file.  */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the <signum.h> header file.  */
-/* #undef HAVE_SIGNUM_H */
-
-/* Define if you have the <stdarg.h> header file.  */
-#define HAVE_STDARG_H 1
-
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <strings.h> header file.  */
-/* #undef HAVE_STRINGS_H */
-
-/* Define if you have the <sys/param.h> header file.  */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the m library (-lm).  */
-#define HAVE_LIBM 1
-
-#include <custom.h>	/* overrides for stuff autoconf can't deal with */
@@ -11,7 +11,7 @@
 */

 /* 
- * Copyright (C) 1995-1999 the Free Software Foundation, Inc.
+ * Copyright (C) 1995-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -1,3 +1,56 @@
+Mon Aug  7 15:23:00 2000  Arnold D. Robbins  <[email protected]>
+
+	* Release 3.0.6: Release tar file made.
+
+Sun Jun 25 15:08:19 2000  Arnold D. Robbins  <[email protected]>
+
+	* Release 3.0.5: Release tar file made.
+
+Wed May 17 19:04:54 2000  Arnold D. Robbins  <[email protected]>
+
+	* gawk.texi, gawk.1, awkcard.in: Documented %u.  Ooops.
+
+Tue May  2 11:44:13 2000  Arnold D. Robbins  <[email protected]>
+
+	* texinfo.tex: Updated to version 1999-10-01.07.
+	* gawk.texi: Redid page breaking for new texinfo.tex.
+
+Thu Apr  6 12:32:49 2000  Arnold D. Robbins  <[email protected]>
+
+	* gawk.texi: Change info dir file entry to `(gawk)' from
+	  `(gawk.info)'.
+	* Makefile.in [$(infodir)/gawk.info]: Fix grep test is
+	  accordance with above.
+
+Sun Feb 13 15:36:32 2000  Paul Eggert  <[email protected]>
+
+	* gawk.texi: Mention that arithmetic is done in double
+	  precision floating point, and point to Goldberg's paper for
+	  people who want to know more.  Fix some other minor floating
+	  point discussion issues.
+
+Wed Nov  3 17:04:35 1999  Arnold D. Robbins  <[email protected]>
+
+	* gawk.1: Lots of troff ``lint'' from Paul Eggert.  Not all
+	  of his changes, just the ones I thought worth doing.
+
+Mon Oct 11 16:53:54 1999  Arnold D. Robbins  <[email protected]>
+
+	* Makefile.in (gawk.dvi): Put $(srcdir) first in TEXINPUTS,
+	  and also just use texi2dvi, don't run texindex and tex
+	  manually.  Doing so is no longer necessary.
+
+Mon Aug  9 13:06:01 1999  Arnold D. Robbins  <[email protected]>
+
+	* gawk.texi: New node `Array Efficiency' on the best use
+	  of subscripting to avoid memory bloat.
+
+Thu Jul 29 23:15:34 1999  Arnold D. Robbins  <[email protected]>
+
+	* Makefile.in ($(infodir)/gawk.info): Removed loop around
+	  $(INSTALL_DATA), since there's only one Info file to install,
+	  install it directly.
+
 Wed Jun 30 16:14:36 1999  Arnold D. Robbins  <[email protected]>

 	* Release 3.0.4: Release tar file made.  This time for sure.
@@ -9,7 +9,7 @@
@c I hope this is the right category
@dircategory Programming Languages
@direntry
-* Gawk: (gawk.info).           A Text Scanning and Processing Language.
+* Gawk: (gawk).           A Text Scanning and Processing Language.
@end direntry
@end ifinfo

@@ -21,10 +21,10 @@
@c applies to, and when the document was updated.
@set TITLE Effective AWK Programming
@set SUBTITLE A User's Guide for GNU Awk
-@set PATCHLEVEL 4
+@set PATCHLEVEL 6
@set EDITION 1.0.@value{PATCHLEVEL}
@set VERSION 3.0
-@set UPDATE-MONTH April, 1999
+@set UPDATE-MONTH July, 2000
@iftex
@set DOCUMENT book
@end iftex
@@ -74,7 +74,7 @@ particular records in a file and perform operations upon them.
 This is Edition @value{EDITION} of @cite{@value{TITLE}},
 for the @value{VERSION}.@value{PATCHLEVEL} version of the GNU implementation of AWK.

-Copyright (C) 1989, 1991, 92, 93, 96, 97, 98, 99 Free Software Foundation, Inc.
+Copyright (C) 1989, 1991, 1992, 1993, 1996-2000 Free Software Foundation, Inc.

 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -138,31 +138,27 @@ Corporation. @*
 Registered Trademark of Paramount Pictures Corporation. @*
@c sorry, i couldn't resist
@sp 3
-Copyright @copyright{} 1989, 1991, 92, 93, 96, 97, 98, 99 Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1991, 1992, 1993, 1996-2000 Free Software Foundation, Inc.
@sp 2
        
 This is Edition @value{EDITION} of @cite{@value{TITLE}}, @*
 for the @value{VERSION}.@value{PATCHLEVEL} (or later) version of the GNU implementation of AWK.

@sp 2
-@center Published jointly by:
+Published by:

-@multitable {Specialized Systems Consultants, Inc. (SSC)} {Boston, MA  02111-1307 USA}
-@item Specialized Systems Consultants, Inc. (SSC) @tab Free Software Foundation
-@item PO Box 55549 @tab 59 Temple Place --- Suite 330
-@item Seattle, WA 98155 USA @tab Boston, MA  02111-1307 USA
-@item Phone: +1-206-782-7733 @tab Phone: +1-617-542-5942
-@item Fax: +1-206-782-7191 @tab Fax: +1-617-542-2652
-@item E-mail: @code{sales@@ssc.com} @tab E-mail: @code{gnu@@gnu.org}
-@item URL: @code{http://www.ssc.com/} @tab URL: @code{http://www.fsf.org/}
-@end multitable
+Free Software Foundation @*
+59 Temple Place --- Suite 330 @*
+Boston, MA  02111-1307 USA @*
+Phone: +1-617-542-5942 @*
+Fax: +1-617-542-2652 @*
+Email: @code{gnu@@gnu.org} @*
+URL: @code{http://www.gnu.org/} @*

@sp 1
-@c this ISBN can change! Check with SSC
+@c this ISBN can change!
@c This one is correct for gawk 3.0 and edition 1.0 from the FSF
 ISBN 1-882114-26-4 @*
-@c This one is correct for gawk 3.0.3 and edition 1.0.3 from SSC
-@c ISBN 1-57831-000-8 @*

 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -178,8 +174,7 @@ into another language, under the above conditions for modified versions,
 except that this permission notice may be stated in a translation approved
 by the Foundation.
@sp 2
-@c Cover art by Etienne Suvasa.
-Cover art by Amy Wells Wood.
+Cover art by Etienne Suvasa.
@end titlepage

@c Thanks to Bob Chassell for directions on doing dedications.
@@ -195,6 +190,8 @@ Cover art by Amy Wells Wood.
@center @i{To Rivka, for the exponential increase.}
@sp 1
@center @i{To Nachum, for the added dimension.}
+@sp 1
+@center @i{To Malka, for the new beginning.}
@page
@w{ }
@page
@@ -540,6 +537,8 @@ of AWK.
@center To Rivka, for the exponential increase.
@sp 1
@center To Nachum, for the added dimension.
+@sp 1
+@center To Malka, for the new beginning.
@end ifinfo

@node Preface, What Is Awk, Top, Top
@@ -2686,7 +2685,7 @@ control how @code{gawk} interprets characters in regexps.

@table @asis
@item No options
-In the default case, @code{gawk} provide all the facilities of
+In the default case, @code{gawk} provides all the facilities of
 POSIX regexps and the GNU regexp operators described
@iftex
 above.
@@ -2843,7 +2842,6 @@ $ echo aaaabcd | awk '@{ sub(/a+/, "<A>"); print @}'
@end example

 For simple match/no-match tests, this is not so important. But when doing
-regexp-based field and record splitting, and
 text matching and substitutions with the @code{match}, @code{sub}, @code{gsub},
 and @code{gensub} functions, it is very important.
@ifinfo
@@ -2871,7 +2869,7 @@ regexp.  A regexp that is computed in this way is called a @dfn{dynamic
 regexp}.  For example:

@example
-BEGIN @{ identifier_regexp = "[A-Za-z_][A-Za-z_0-9]+" @}
+BEGIN @{ identifier_regexp = "[A-Za-z_][A-Za-z_0-9]*" @}
 $0 ~ identifier_regexp    @{ print @}
@end example

@@ -2879,6 +2877,12 @@ $0 ~ identifier_regexp    @{ print @}
 sets @code{identifier_regexp} to a regexp that describes @code{awk}
 variable names, and tests if the input record matches this regexp.

+@ignore
+Do we want to use "^[A-Za-z_][A-Za-z_0-9]*$" to restrict the entire
+record to just identifiers?  Doing that also would disrupt the flow of
+the text.
+@end ignore
+
@strong{Caution:} When using the @samp{~} and @samp{!~}
 operators, there is a difference between a regexp constant
 enclosed in slashes, and a string constant enclosed in double quotes.
@@ -3070,8 +3074,10 @@ is one field, consisting of a newline.  The value of the built-in
 variable @code{NF} is the number of fields in the current record.

@example
+@group
 $ echo | awk 'BEGIN @{ RS = "a" @} ; @{ print NF @}'
@print{} 1
+@end group
@end example

@cindex dark corner
@@ -3219,6 +3225,8 @@ when the record has only seven fields, you get the empty string.
 a special case: it represents the whole input record.  @code{$0} is
 used when you are not interested in fields.

+@c NEEDED
+@page
 Here are some more examples:

@example
@@ -3613,8 +3621,10 @@ the record, and then decide where the fields are.
 For example, the following pipeline prints @samp{b}:

@example
+@group
 $ echo ' a b c d ' | awk '@{ print $2 @}'
@print{} b
+@end group
@end example

@noindent
@@ -3914,17 +3924,19 @@ idle time.  (This program uses a number of @code{awk} features that
 haven't been introduced yet.)

@example
-@group
 BEGIN  @{ FIELDWIDTHS = "9 6 10 6 7 7 35" @}
 NR > 2 @{
    idle = $4
    sub(/^  */, "", idle)   # strip leading spaces
    if (idle == "")
        idle = 0
+@group
    if (idle ~ /:/) @{
        split(idle, t, ":")
        idle = t[1] * 60 + t[2]
    @}
+@end group
+@group
    if (idle ~ /days/)
        idle *= 24 * 60 * 60
 
@@ -4042,6 +4054,8 @@ A practical example of a data file organized this way might be a mailing
 list, where each entry is separated by blank lines.  If we have a mailing
 list in a file named @file{addresses}, that looks like this:

+@c NEEDED
+@page
@example
 Jane Doe
 123 Main Street
@@ -4050,7 +4064,6 @@ Anywhere, SE 12345-6789
 John Smith
 456 Tree-lined Avenue
 Smallville, MW 98765-4321
-
@dots{}
@end example

@@ -4426,8 +4439,6 @@ each one.
@c Exercise!!
@c This example is unrealistic, since you could just use system

-@c NEEDED
-@page
 Given the input:

@example
@@ -4974,6 +4985,12 @@ the decimal number eight is represented as @samp{10} in octal.)
@item s
 This prints a string.

+@item u
+This prints an unsigned decimal number.
+(This format is of marginal use, since all numbers in @code{awk}
+are floating point.  It is provided primarily for compatibility
+with C.)
+
@item x
@itemx X
 This prints an unsigned hexadecimal integer.
@@ -5525,7 +5542,7 @@ is important to @emph{not} close any of the files related to file descriptors
 0, 1, and 2.  If you do close one of these files, unpredictable behavior
 will result.

-The special files that provide process-related information may disappear
+The special files that provide process-related information will disappear
 in a future version of @code{gawk}.
@xref{Future Extensions, ,Probable Future Extensions}.

@@ -5624,6 +5641,8 @@ really do its work until the pipe is closed.  For example, if you
 redirect output to the @code{mail} program, the message is not
 actually sent until the pipe is closed.

+@c NEEDED
+@page
@item
 To run the same program a second time, with the same arguments.
 This is not the same thing as giving more input to the first run!
@@ -6017,8 +6036,8 @@ specifier.

@code{CONVFMT}'s default value is @code{"%.6g"}, which prints a value with
 at least six significant digits.  For some applications you will want to
-change it to specify more precision.  Double precision on most modern
-machines gives you 16 or 17 decimal digits of precision.
+change it to specify more precision.  On most modern machines, you must
+print 17 digits to capture a floating point number's value exactly.

 Strange results can happen if you set @code{CONVFMT} to a string that doesn't
 tell @code{sprintf} how to format floating point numbers in a useful way.
@@ -6069,7 +6088,12 @@ for more information on the @code{print} statement.

 The @code{awk} language uses the common arithmetic operators when
 evaluating expressions.  All of these arithmetic operators follow normal
-precedence rules, and work as you would expect them to.
+precedence rules, and work as you would expect them to.  Arithmetic
+operations are evaluated using double precision floating point, which
+has the usual problems of inexactness and exceptions.@footnote{David
+Goldberg, @uref{http://www.validgh.com/goldberg/paper.ps, @cite{What Every
+Computer Scientist Should Know About Floating-point Arithmetic}},
+@cite{ACM Computing Surveys} @strong{23}, 1 (1991-03), 5-48.}

 Here is a file @file{grades} containing a list of student names and
 three test scores per student (it's a small class):
@@ -6117,7 +6141,7 @@ Multiplication.

@item @var{x} / @var{y}
 Division.  Since all numbers in @code{awk} are
-real numbers, the result is not rounded to an integer: @samp{3 / 4}
+floating point numbers, the result is not rounded to an integer: @samp{3 / 4}
 has the value 0.75.

@item @var{x} % @var{y}
@@ -6976,8 +7000,8 @@ x > 0 ? x : -x
@end example

 Each time the conditional expression is computed, exactly one of
-@var{if-true-exp} and @var{if-false-exp} is computed; the other is ignored.
-This is important when the expressions contain side effects.  For example,
+@var{if-true-exp} and @var{if-false-exp} is used; the other is ignored.
+This is important when the expressions have side effects.  For example,
 this conditional expression examines element @code{i} of either array
@code{a} or array @code{b}, and increments @code{i}.

@@ -7975,9 +7999,11 @@ identifies prime numbers:
@example
 awk '# find smallest divisor of num
     @{ num = $1
+@group
       for (div = 2; div*div <= num; div++)
         if (num % div == 0)
           break
+@end group
       if (num % div == 0)
         printf "Smallest divisor of %d is %d\n", num, div
       else
@@ -8049,8 +8075,8 @@ of the loop altogether.
@ignore
 In Texinfo source files, text that the author wishes to ignore can be
 enclosed between lines that start with @samp{@@ignore} and end with
-@samp{@@end ignore}.  Here is a program that strips out lines between
-@samp{@@ignore} and @samp{@@end ignore} pairs.
+@samp{@atend ignore}.  Here is a program that strips out lines between
+@samp{@@ignore} and @samp{@atend ignore} pairs.

@example
 BEGIN @{
@@ -8069,7 +8095,7 @@ BEGIN @{
@end example

 When an @samp{@@ignore} is seen, the @code{ignoring} flag is set to one (true).
-When @samp{@@end ignore} is seen, the flag is reset to zero (false). As long
+When @samp{@atend ignore} is seen, the flag is reset to zero (false). As long
 as the flag is true, the input record is not printed, because the
@code{continue} restarts the @code{while} loop, skipping over the @code{print}
 statement.
@@ -8778,6 +8804,7 @@ same @code{awk} program.
 * Multi-dimensional::           Emulating multi-dimensional arrays in
                                @code{awk}.
 * Multi-scanning::              Scanning multi-dimensional arrays.
+* Array Efficiency::            Implementation-specific tips.
@end menu

@node Array Intro, Reference to Elements, Arrays, Arrays
@@ -9008,12 +9035,14 @@ It is a very simple program, and gets confused if it encounters repeated
 numbers, gaps, or lines that don't begin with a number.

@example
+@group
@c file eg/misc/arraymax.awk
@{
  if ($1 > max)
    max = $1
  arr[$1] = $0
@}
+@end group

 END @{
  for (x = 1; x <= max; x++)
@@ -9308,7 +9337,7 @@ output!

 At first glance, this program should have worked.  The variable @code{lines}
 is uninitialized, and uninitialized variables have the numeric value zero.
-So, the value of @code{l[0]} should have been printed.
+So, @code{awk} should have printed the value of @code{l[0]}.

 The issue here is that subscripts for @code{awk} arrays are @strong{always}
 strings. And uninitialized variables, when used as strings, have the
@@ -9445,7 +9474,7 @@ it produces:
@end group
@end example

-@node Multi-scanning,  , Multi-dimensional, Arrays
+@node Multi-scanning,  Array Efficiency, Multi-dimensional, Arrays
@section Scanning Multi-dimensional Arrays

 There is no special @code{for} statement for scanning a
@@ -9492,6 +9521,34 @@ The result of this is to set @code{separate[1]} to @code{"1"} and
@code{separate[2]} to @code{"foo"}.  Presto, the original sequence of
 separate indices has been recovered.

+@node Array Efficiency, , Multi-scanning, Arrays
+@section Using Array Memory Efficiently
+
+This section applies just to @code{gawk}.
+
+It is often useful to use the same bit of data as an index
+into multiple arrays.
+Due to the way @code{gawk} implements associative arrays,
+when you need to use input data as an index for multiple
+arrays, it is much more effecient to assign the input field
+to a separate variable, and then use that variable as the index.
+
+@example
+@{
+      name = $1
+      ssn = $2
+      nkids = $3
+      @dots{}
+      seniority[name]++    # better than seniority[$1]++
+      kids[name] = nkids   # better than kids[$1] = nkids
+@}
+@end example
+
+Using separate variables with mnemonic names for the input fields
+makes programs more readable, in any case.
+It is an eventual goal to make @code{gawk}'s array indexing as efficient
+as possible, no matter what the source of the index value.
+
@node Built-in, User-defined, Arrays, Top
@chapter Built-in Functions

@@ -9625,7 +9682,7 @@ function randint(n) @{
@end example

@noindent
-The multiplication produces a random real number greater than zero and less
+The multiplication produces a random number greater than zero and less
 than @code{n}.  We then make it an integer (using @code{int}) between zero
 and @code{n} @minus{} 1, inclusive.

@@ -9915,10 +9972,10 @@ Here is another example:
@example
 awk 'BEGIN @{
        str = "daabaaa"
-        sub(/a*/, "c&c", str)
+        sub(/a+/, "C&C", str)
        print str
@}'
-@print{} dcaacbaaa
+@print{} dCaaCbaaa
@end example

@noindent
@@ -10229,7 +10286,8 @@ backslash.@footnote{This consequence was certainly unintended.}
@end enumerate

 The POSIX standard is under revision.@footnote{As of @value{UPDATE-MONTH},
-with final approval and publication hopefully sometime in 1997.}
+with final approval and publication as part of the Austin Group
+Standards hopefully sometime in 2001.}
 Because of the above problems, proposed text for the revised standard
 reverts to rules that correspond more closely to the original existing
 practice. The proposed rules have special cases that make it possible
@@ -10981,6 +11039,8 @@ in an array and start over with a new list of elements
 Instead of having
 to repeat this loop everywhere in your program that you need to clear out
 an array, your program can just call @code{delarray}.
+(This guarantees portability.  The usage @samp{delete @var{array}} to delete
+the contents of an entire array is a non-standard extension.)

 Here is an example of a recursive function.  It takes a string
 as an input parameter, and returns the string in backwards order.
@@ -11012,11 +11072,11 @@ formatted in a well known fashion.  Here is an @code{awk} version:

@example
@c file eg/lib/ctime.awk
-@group
 # ctime.awk
 #
 # awk version of C ctime(3) function

+@group
 function ctime(ts,    format)
@{
    format = "%a %b %d %H:%M:%S %Z %Y"
@@ -11113,10 +11173,12 @@ doing.}  For example:
@end iftex

@example
+@group
 function changeit(array, ind, nvalue)
@{
     array[ind] = nvalue
@}
+@end group

 BEGIN @{
    a[1] = 1; a[2] = 2; a[3] = 3
@@ -11355,6 +11417,11 @@ The @samp{-v} option can only set one variable, but you can use
 it more than once, setting another variable each time, like this:
@samp{awk @w{-v foo=1} @w{-v bar=2} @dots{}}.

+@strong{Caution:}  Using @samp{-v} to set the values of the builtin
+variables may lead to suprising results.  @code{awk} will reset the
+values of those variables as it needs to, possibly ignoring any
+predefined value you may have given.
+
@item -mf @var{NNN}
@itemx -mr @var{NNN}
 Set various memory limits to the value @var{NNN}.  The @samp{f} flag sets
@@ -11656,7 +11723,7 @@ separated by colons.  @code{gawk} gets its search path from the
@code{AWKPATH} environment variable.  If that variable does not exist,
@code{gawk} uses a default path, which is
@samp{.:/usr/local/share/awk}.@footnote{Your version of @code{gawk}
-may use a directory that is different than @file{/usr/local/share/awk}; it
+may use a different directory; it
 will depend upon how @code{gawk} was built and installed. The actual
 directory will be the value of @samp{$(datadir)} generated when
@code{gawk} was configured.  You probably don't need to worry about this
@@ -11958,7 +12025,6 @@ it should stop when it gets to the end of the first occurrence.
 Here is a second version of @code{nextfile} that remedies this problem.

@example
-@group
@c file eg/lib/nextfile.awk
 # nextfile --- skip remaining records in current file
 # correctly handle successive occurrences of the same file
@@ -11969,14 +12035,15 @@ Here is a second version of @code{nextfile} that remedies this problem.

 function nextfile()   @{ _abandon_ = FILENAME; next @}

+@group
 _abandon_ == FILENAME @{
      if (FNR == 1)
          _abandon_ = ""
      else
          next
@}
-@c endfile
@end group
+@c endfile
@end example

 The @code{nextfile} function has not changed.  It sets @code{_abandon_}
@@ -12029,6 +12096,8 @@ print a diagnostic message describing the condition that should have
 been true but was not, and then it kills the program.  In C, using
@code{assert} looks this:

+@c NEEDED
+@page
@example
 #include <assert.h>

@@ -12093,6 +12162,8 @@ program's @code{END} rules will execute.
 For all of this to work correctly, @file{assert.awk} must be the
 first source file read by @code{awk}.

+@c NEEDED
+@page
 You would use this function in your programs this way:

@example
@@ -12158,10 +12229,12 @@ function round(x,   ival, aval, fraction)
      aval = -x     # absolute value
      ival = int(aval)
      fraction = aval - ival
+@group
      if (fraction >= .5)
         return int(x) - 1   # -2.5 --> -3
      else
         return int(x)       # -2.3 --> -2
+@end group
   @} else @{
      fraction = x - ival
      if (fraction >= .5)
@@ -12283,7 +12356,7 @@ function chr(c)
@c endfile
@end group

-@c @group
+@group
@c file eg/lib/ord.awk
 #### test code ####
 # BEGIN    \
@@ -12296,7 +12369,7 @@ function chr(c)
 #    @}
 # @}
@c endfile
-@c @end group
+@end group
@end example

 An obvious improvement to these functions would be to move the code for the
@@ -12381,7 +12454,11 @@ date into a timestamp.
 It would appear at first glance that @code{gawk} would have to supply a
@code{mktime} built-in function that was simply a ``hook'' to the C language
 version.  In fact though, @code{mktime} can be implemented entirely in
-@code{awk}.
+@code{awk}.@footnote{@value{UPDATE-MONTH}: Actually, I was mistaken when
+I wrote this.  The version presented here doesn't always work correctly,
+and the next major version of @code{gawk} will provide @code{mktime}
+as a built-in function.}
+@c sigh.

 Here is a version of @code{mktime} for @code{awk}.  It takes a simple
 representation of the date and time, and converts it into a timestamp.
@@ -12630,13 +12707,14 @@ to the original result.  An example demonstrating this is presented below.
 Finally, there is a ``main'' program for testing the function.

@example
+@c there used to be a blank line after the getline,
+@c squished out for page formatting reasons
@c @group
@c file eg/lib/mktime.awk
 BEGIN  @{
    if (_tm_test) @{
        printf "Enter date as yyyy mm dd hh mm ss: "
        getline _tm_test_date
-    
        t = mktime(_tm_test_date)
        r = strftime("%Y %m %d %H %M %S", t)
        printf "Got back (%s)\n", r
@@ -12722,7 +12800,6 @@ time formatted in the same way as the @code{date} utility.
 #    time["timezone"]     -- abbreviation of timezone name
 #    time["ampm"]         -- AM or PM designation

-@group
 function gettimeofday(time,    ret, now, i)
@{
    # get time once, avoids unnecessary system calls
@@ -12734,9 +12811,7 @@ function gettimeofday(time,    ret, now, i)
    # clear out target array
    for (i in time)
        delete time[i]
-@end group

-@group
    # fill in values, force numeric values to be
    # numeric by adding 0
    time["second"]       = strftime("%S", now) + 0
@@ -12761,7 +12836,6 @@ function gettimeofday(time,    ret, now, i)

    return ret
@}
-@end group
@c endfile
@end example

@@ -13569,9 +13643,11 @@ char **argv;
    int i;
@end group

+@group
    while ((g = getgrent()) != NULL) @{
        printf("%s:%s:%d:", g->gr_name, g->gr_passwd,
                                            g->gr_gid);
+@end group
        for (i = 0; g->gr_mem[i] != NULL; i++) @{
            printf("%s", g->gr_mem[i]);
            if (g->gr_mem[i+1] != NULL)
@@ -14074,11 +14150,11 @@ BEGIN    \
        if (c == "f") @{
            by_fields = 1
            fieldlist = Optarg
-@group
        @} else if (c == "c") @{
            by_chars = 1
            fieldlist = Optarg
            OFS = ""
+@group
        @} else if (c == "d") @{
            if (length(Optarg) > 1) @{
                printf("Using first character of %s" \
@@ -14304,8 +14380,6 @@ Normally, @code{egrep} prints the
 lines that matched.  If multiple file names are provided on the command
 line, each output line is preceded by the name of the file and a colon.

-@c NEEDED
-@page
 The options are:

@table @code
@@ -14457,7 +14531,7 @@ processed.  Finally, @code{fcount} is added to @code{total}, so that we
 know how many lines altogether matched the pattern.

@example
-@c @group
+@group
@c file eg/prog/egrep.awk
 function endfile(file)
@{
@@ -14470,7 +14544,7 @@ function endfile(file)
    total += fcount
@}
@c endfile
-@c @end group
+@end group
@end example

 This rule does most of the work of matching lines. The variable
@@ -14520,10 +14594,8 @@ necessary.

    fcount += matches    # 1 or 0

-@group
    if (! matches)
        next
-@end group

    if (no_print && ! count_only)
        nextfile
@@ -14535,8 +14607,10 @@ necessary.

    if (do_filenames && ! count_only)
        print FILENAME ":" $0
+@group
    else if (! count_only)
        print
+@end group
@}
@c endfile
@c @end group
@@ -15032,7 +15106,6 @@ standard output, @file{/dev/stdout}.

@findex uniq.awk
@example
-@c @group
@c file eg/prog/uniq.awk
 # uniq.awk --- do uniq in awk
 # Arnold Robbins, arnold@@gnu.org, Public Domain
@@ -15047,15 +15120,13 @@ function usage(    e)
@}
@end group

-@group
 # -c    count lines. overrides -d and -u
 # -d    only repeated lines
 # -u    only non-repeated lines
 # -n    skip n fields
 # +n    skip n characters, skip fields first
-@end group

-BEGIN    \
+BEGIN   \
@{
    count = 1
    outputfile = "/dev/stdout"
@@ -15072,10 +15143,12 @@ BEGIN    \
            # this messes us up for things like -5
            if (Optarg ~ /^[0-9]+$/)
                fcount = (c Optarg) + 0
+@group
            else @{
                fcount = c + 0
                Optind--
            @}
+@end group
        @} else
            usage()
    @}
@@ -15091,14 +15164,12 @@ BEGIN    \
    if (repeated_only == 0 && non_repeated_only == 0)
        repeated_only = non_repeated_only = 1

-@group
    if (ARGC - Optind == 2) @{
        outputfile = ARGV[ARGC - 1]
        ARGV[ARGC - 1] = ""
    @}
@}
@c endfile
-@end group
@end example

 The following function, @code{are_equal}, compares the current line,
@@ -15315,23 +15386,22 @@ for the file that was just read. It relies on @code{beginfile} to reset the
 numbers for the following data file.

@example
-@c @group
+@c left brace on line with `function' because of page breaking
@c file eg/prog/wc.awk
-function beginfile(file)
-@{
+@group
+function beginfile(file) @{
    chars = lines = words = 0
    fname = FILENAME
@}
+@end group

 function endfile(file)
@{
    tchars += chars
    tlines += lines
    twords += words
-@group
    if (do_lines)
        printf "\t%d", lines
-@end group
    if (do_words)
        printf "\t%d", words
    if (do_chars)
@@ -15339,7 +15409,6 @@ function endfile(file)
    printf "\t%s\n", fname
@}
@c endfile
-@c @end group
@end example

 There is one rule that is executed for each line. It adds the length of the
@@ -15565,11 +15634,12 @@ message in a loop, again using @code{sleep} to delay for however many
 seconds are necessary.

@example
-@c @group
@c file eg/prog/alarm.awk
+@group
    # zzzzzz..... go away if interrupted
    if (system(sprintf("sleep %d", naptime)) != 0)
        exit 1
+@end group

    # time to notify!
    command = sprintf("sleep %d", delay)
@@ -15583,7 +15653,6 @@ seconds are necessary.
    exit 0
@}
@c endfile
-@c @end group
@end example

@node Translate Program, Labels Program, Alarm Program, Miscellaneous Programs
@@ -15625,7 +15694,7 @@ functions
 (@pxref{String Functions, ,Built-in Functions for String Manipulation}).@footnote{This
 program was written before @code{gawk} acquired the ability to
 split each character in a string into separate array elements.
-How might this ability simplify the program?}
+How might you use this new feature to simplify the program?}

 There are two functions.  The first, @code{stranslate}, takes three
 arguments.
@@ -15683,19 +15752,19 @@ function stranslate(from, to, target,     lf, lt, t_ar, i, c)
    return target
@}

-@group
 function translate(from, to)
@{
    return $0 = stranslate(from, to, $0)
@}
-@end group

+@group
 # main program
 BEGIN @{
    if (ARGC < 3) @{
        print "usage: translate from to" > "/dev/stderr"
        exit
    @}
+@end group
    FROM = ARGV[1]
    TO = ARGV[2]
    ARGC = 2
@@ -15852,10 +15921,12 @@ awk '
        freq[$i]++
@}

+@group
 END @{
    for (word in freq)
        printf "%s\t%d\n", word, freq[word]
@}'
+@end group
@end example

 The first thing to notice about this program is that it has two rules.  The
@@ -15914,10 +15985,12 @@ the program:
@}
@c endfile

+@group
 END @{
    for (word in freq)
        printf "%s\t%d\n", word, freq[word]
@}
+@end group
@end example

 Assuming we have saved this program in a file named @file{wordfreq.awk},
@@ -16126,8 +16199,7 @@ exited with a zero exit status, signifying OK.
@c file eg/prog/extract.awk
 # extract.awk --- extract files and run programs
 #                 from texinfo files
-# Arnold Robbins, arnold@@gnu.org, Public Domain
-# May 1993
+# Arnold Robbins, arnold@@gnu.org, Public Domain, May 1993

 BEGIN    @{ IGNORECASE = 1 @}

@@ -16315,18 +16387,18 @@ are provided, the standard input is used.
 # Arnold Robbins, arnold@@gnu.org, Public Domain
 # August 1995

-@group
 function usage()
@{
    print "usage: awksed pat repl [files...]" > "/dev/stderr"
    exit 1
@}
-@end group

+@group
 BEGIN @{
    # validate arguments
    if (ARGC < 3)
        usage()
+@end group

    RS = ARGV[1]
    ORS = ARGV[2]
@@ -16515,7 +16587,6 @@ argument (e.g., @samp{--file=}).
 The source text is echoed into @file{/tmp/ig.s.$$}.

@item --version
-@itemx --version
@itemx -Wversion
@code{igawk} prints its version number, and runs @samp{gawk --version}
 to get the @code{gawk} version information, and then exits.
@@ -16660,11 +16731,13 @@ slower.
@end ignore

@example
-@c @group
@c file eg/prog/igawk.sh
 gawk -- '
 # process @@include directives
+@c endfile

+@group
+@c file eg/prog/igawk.sh
 function pathto(file,    i, t, junk)
@{
    if (index(file, "/") != 0)
@@ -16681,7 +16754,7 @@ function pathto(file,    i, t, junk)
    return ""
@}
@c endfile
-@c @end group
+@end group
@end example

 The main program is contained inside one @code{BEGIN} rule.  The first thing it
@@ -18068,19 +18141,19 @@ Prints expressions, sending the output down a pipe to @var{command}.
 The pipeline to the command stays open until the @code{close} function
 is called.

-@item printf @var{fmt, expr-list}
+@item printf @var{fmt}, @var{expr-list}
 Format and print.

-@item printf @var{fmt, expr-list} > file
+@item printf @var{fmt}, @var{expr-list} > @var{file}
 Format and print to @var{file}. If @var{file} does not exist, it is
 created. If it does exist, its contents are deleted the first time the
@code{printf} is executed.

-@item printf @var{fmt, expr-list} >> @var{file}
+@item printf @var{fmt}, @var{expr-list} >> @var{file}
 Format and print to @var{file}.  The previous contents of @var{file}
 are retained, and the output of @code{printf} is appended to the file.

-@item printf @var{fmt, expr-list} | @var{command}
+@item printf @var{fmt}, @var{expr-list} | @var{command}
 Format and print, sending the output down a pipe to @var{command}.
 The pipeline to the command stays open until the @code{close} function
 is called.
@@ -18128,7 +18201,10 @@ string, with non-significant zeros suppressed.
@samp{%G} will use @samp{%E} instead of @samp{%e}.

@item %o
-An unsigned octal number (again, an integer).
+An unsigned octal number (also an integer).
+
+@item %u
+An unsigned decimal number (again, an integer).

@item %s
 A character string.
@@ -18256,6 +18332,8 @@ provides the motivation for this feature.
@code{awk} provides a number of built-in functions for performing
 numeric operations, string related operations, and I/O related operations.

+@c NEEDED
+@page
 The built-in arithmetic functions are:

@table @code
@@ -18592,7 +18670,8 @@ Free Software Foundation @*
 Boston, MA  02111-1307 USA @*
 Phone: +1-617-542-5942 @*
 Fax (including Japan): +1-617-542-2652 @*
-E-mail: @code{gnu@@gnu.org} @*
+Email: @code{gnu@@gnu.org} @*
+URL: @code{http://www.gnu.org/} @*
@end quotation

@noindent
@@ -18617,6 +18696,8 @@ You should use a site that is geographically close to you.
@itemx utsun.s.u-tokyo.ac.jp:/ftpsync/prep
@end table

+@c NEEDED
+@page
@item Australia:
@table @code
@item archie.au:/gnu
@@ -19412,22 +19493,13 @@ some idea of what kind of Unix system you're using, and the exact results
@code{gawk} gave you.  Also say what you expected to occur; this will help
 us decide whether the problem was really in the documentation.

-Once you have a precise problem, there are two e-mail addresses you
-can send mail to.
+Once you have a precise problem, send email to @email{bug-gawk@@gnu.org}.

-@table @asis
-@item Internet:
-@samp{bug-gnu-utils@@gnu.org}
-
-@item UUCP:
-@samp{uunet!gnu.org!bug-gnu-utils}
-@end table
-
-Please include the
-version number of @code{gawk} you are using.  You can get this information
-with the command @samp{gawk --version}.
-You should send a carbon copy of your mail to Arnold Robbins, who can
-be reached at @samp{arnold@@gnu.org}.
+Please include the version number of @code{gawk} you are using.
+You can get this information with the command @samp{gawk --version}.
+Using this address will automatically send a carbon copy of your
+mail to Arnold Robbins.  If necessary, he can be reached directly at
+@email{arnold@@gnu.org}.

@cindex @code{comp.lang.awk}
@strong{Important!} Do @emph{not} try to report bugs in @code{gawk} by
@@ -19514,8 +19586,8 @@ retrieve @file{awk.bundle.gz}.
 This is a shell archive that has been compressed with the GNU @code{gzip}
 utility. It can be uncompressed with the @code{gunzip} utility.

-You can also retrieve this version via the World Wide Web from
-@uref{http://cm.bell-labs.com/who/bwk, Brian Kernighan's home page}.
+You can also retrieve this version via the World Wide Web from his
+@uref{http://cm.bell-labs.com/who/bwk, home page}.

 This version requires an ANSI C compiler; GCC (the GNU C compiler)
 works quite nicely.
@@ -19729,6 +19801,11 @@ Using this format makes it easy for me to apply your changes to the
 master version of the @code{gawk} source code (using @code{patch}).
 If I have to apply the changes manually, using a text editor, I may
 not do so, particularly if there are lots of changes.
+
+@item
+Include an entry for the @file{ChangeLog} file with your submission.
+This further helps minimize the amount of work I have to do,
+making it easier for me to accept patches.
@end enumerate

 Although this sounds like a lot of work, please remember that while you
@@ -19736,6 +19813,7 @@ may write the new code, I have to maintain it and support it, and if it
 isn't possible for me to do that with a minimum of extra work, then I
 probably will not.

+
@node New Ports, , Adding Code, Additions
@appendixsubsec Porting @code{gawk} to a New Operating System

@@ -19900,7 +19978,7 @@ It may be possible to map a GDBM/NDBM/SDBM file into an @code{awk} array.
@item A @code{PROCINFO} Array
 The special files that provide process-related information
 (@pxref{Special Files, ,Special File Names in @code{gawk}})
-may be superseded by a @code{PROCINFO} array that would provide the same
+will be superseded by a @code{PROCINFO} array that would provide the same
 information, in an easier to access fashion.

@item More @code{lint} warnings
@@ -20771,7 +20849,7 @@ the ``copyright'' line and a pointer to where the full notice is found.

@smallexample
@var{one line to give the program's name and an idea of what it does.}
-Copyright (C) 19@var{yy}  @var{name of author}
+Copyright (C) @var{year}  @var{name of author}

 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -20794,7 +20872,7 @@ If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:

@smallexample
-Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author}
+Gnomovision version 69, Copyright (C) @var{year} @var{name of author}
 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
 type `show w'.  This is free software, and you are welcome
 to redistribute it under certain conditions; type `show c' 
@@ -3,7 +3,7 @@
 */

 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -68,6 +68,11 @@ static int func_tag_valid = FALSE;
 static jmp_buf func_tag;
 extern int exiting, exit_val;

+/* This rather ugly macro is for VMS C */
+#ifdef C
+#undef C
+#endif
+#define C(c) ((char)c)  
 /*
 * This table is used by the regexp routines to do case independant
 * matching. Basically, every ascii character maps to itself, except
@@ -110,45 +115,47 @@ char casetable[] = {
 	/* 'x'     'y'     'z'     '{'     '|'     '}'     '~' */
 	'\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
 #ifndef USE_PURE_ASCII
-	'\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-	'\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-	'\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-	'\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-	'\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
-	'\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
-	'\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
-	'\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
-	'\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-	'\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-	'\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
-	'\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
-	'\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-	'\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-	'\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-	'\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
+	C('\200'), C('\201'), C('\202'), C('\203'), C('\204'), C('\205'), C('\206'), C('\207'),
+	C('\210'), C('\211'), C('\212'), C('\213'), C('\214'), C('\215'), C('\216'), C('\217'),
+	C('\220'), C('\221'), C('\222'), C('\223'), C('\224'), C('\225'), C('\226'), C('\227'),
+	C('\230'), C('\231'), C('\232'), C('\233'), C('\234'), C('\235'), C('\236'), C('\237'),
+	C('\240'), C('\241'), C('\242'), C('\243'), C('\244'), C('\245'), C('\246'), C('\247'),
+	C('\250'), C('\251'), C('\252'), C('\253'), C('\254'), C('\255'), C('\256'), C('\257'),
+	C('\260'), C('\261'), C('\262'), C('\263'), C('\264'), C('\265'), C('\266'), C('\267'),
+	C('\270'), C('\271'), C('\272'), C('\273'), C('\274'), C('\275'), C('\276'), C('\277'),
+	C('\340'), C('\341'), C('\342'), C('\343'), C('\344'), C('\345'), C('\346'), C('\347'),
+	C('\350'), C('\351'), C('\352'), C('\353'), C('\354'), C('\355'), C('\356'), C('\357'),
+	C('\360'), C('\361'), C('\362'), C('\363'), C('\364'), C('\365'), C('\366'), C('\327'),
+	C('\370'), C('\371'), C('\372'), C('\373'), C('\374'), C('\375'), C('\376'), C('\337'),
+	C('\340'), C('\341'), C('\342'), C('\343'), C('\344'), C('\345'), C('\346'), C('\347'),
+	C('\350'), C('\351'), C('\352'), C('\353'), C('\354'), C('\355'), C('\356'), C('\357'),
+	C('\360'), C('\361'), C('\362'), C('\363'), C('\364'), C('\365'), C('\366'), C('\367'),
+	C('\370'), C('\371'), C('\372'), C('\373'), C('\374'), C('\375'), C('\376'), C('\377'),
 #else
-	'\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-	'\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-	'\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-	'\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-	'\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
-	'\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
-	'\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
-	'\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
-	'\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
-	'\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
-	'\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
-	'\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
-	'\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-	'\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-	'\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-	'\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
+	C('\200'), C('\201'), C('\202'), C('\203'), C('\204'), C('\205'), C('\206'), C('\207'),
+	C('\210'), C('\211'), C('\212'), C('\213'), C('\214'), C('\215'), C('\216'), C('\217'),
+	C('\220'), C('\221'), C('\222'), C('\223'), C('\224'), C('\225'), C('\226'), C('\227'),
+	C('\230'), C('\231'), C('\232'), C('\233'), C('\234'), C('\235'), C('\236'), C('\237'),
+	C('\240'), C('\241'), C('\242'), C('\243'), C('\244'), C('\245'), C('\246'), C('\247'),
+	C('\250'), C('\251'), C('\252'), C('\253'), C('\254'), C('\255'), C('\256'), C('\257'),
+	C('\260'), C('\261'), C('\262'), C('\263'), C('\264'), C('\265'), C('\266'), C('\267'),
+	C('\270'), C('\271'), C('\272'), C('\273'), C('\274'), C('\275'), C('\276'), C('\277'),
+	C('\300'), C('\301'), C('\302'), C('\303'), C('\304'), C('\305'), C('\306'), C('\307'),
+	C('\310'), C('\311'), C('\312'), C('\313'), C('\314'), C('\315'), C('\316'), C('\317'),
+	C('\320'), C('\321'), C('\322'), C('\323'), C('\324'), C('\325'), C('\326'), C('\327'),
+	C('\330'), C('\331'), C('\332'), C('\333'), C('\334'), C('\335'), C('\336'), C('\337'),
+	C('\340'), C('\341'), C('\342'), C('\343'), C('\344'), C('\345'), C('\346'), C('\347'),
+	C('\350'), C('\351'), C('\352'), C('\353'), C('\354'), C('\355'), C('\356'), C('\357'),
+	C('\360'), C('\361'), C('\362'), C('\363'), C('\364'), C('\365'), C('\366'), C('\367'),
+	C('\370'), C('\371'), C('\372'), C('\373'), C('\374'), C('\375'), C('\376'), C('\377'),
 #endif
 };
 #else
 #include "You lose. You will need a translation table for your character set."
 #endif

+#undef C
+
 /*
 * This table maps node types to strings for debugging.
 * KEEP IN SYNC WITH awk.h!!!!
@@ -207,6 +214,7 @@ static char *nodetypes[] = {
 	"Node_K_do",
 	"Node_K_return",
 	"Node_K_delete",
+	"Node_K_delete_loop",
 	"Node_K_getline",
 	"Node_K_function",
 	"Node_K_nextfile",
@@ -227,6 +235,7 @@ static char *nodetypes[] = {
 	"Node_regex",
 	"Node_hashnode",
 	"Node_ahash",
+	"Node_array_ref",
 	"Node_NF",
 	"Node_NR",
 	"Node_FNR",
@@ -482,6 +491,8 @@ register NODE *volatile tree;
 		t = tree->arrvar;
 		if (t->type == Node_param_list)
 			t = stack_ptr[t->param_cnt];
+		if (t->type == Node_array_ref)
+			t = t->orig_array;
 		stable_tree = tree;
 		if ((t->flags & SCALAR) != 0)
 			fatal("attempt to use scalar as array");
@@ -565,6 +576,10 @@ register NODE *volatile tree;
 		do_delete(tree->lnode, tree->rnode);
 		break;

+	case Node_K_delete_loop:
+		do_delete_loop(tree->lnode, tree->rnode);
+		break;
+
 	case Node_K_next:
 		if (in_begin_rule)
 			fatal("`next' cannot be called from a BEGIN rule");
@@ -661,12 +676,18 @@ int iscond;
 	if (tree->type == Node_param_list) {
 		int paramnum = tree->param_cnt + 1;

+		if ((tree->flags & FUNC) != 0)
+			fatal("can't use function name `%s' as variable or array",
+					tree->vname);
+
 		tree = stack_ptr[tree->param_cnt];
 		if (tree == NULL)
 			return Nnull_string;
 		sprintf(namebuf, "parameter #%d", paramnum);
 		tree->vname = namebuf;
-	}
+	} 
+	if (tree->type == Node_array_ref)
+		tree = tree->orig_array;

 	switch (tree->type) {
 	case Node_var:
@@ -986,11 +1007,12 @@ register NODE *tree;
 		 * able to begin and end on a single input record, so this
 		 * isn't an ELSE IF, as noted above.
 		 */
-		if (! tree->triggered)
+		if (! tree->triggered) {
 			if (! eval_condition(tree->condpair->lnode))
 				return FALSE;
 			else
 				tree->triggered = TRUE;
+		}
 		/* Else we are triggered */
 		if (eval_condition(tree->condpair->rnode))
 			tree->triggered = FALSE;
@@ -1071,16 +1093,17 @@ register NODE *tree;
 	NODE *tmp;
 	Func_ptr after_assign = NULL;

-	lhs = get_lhs(tree->lnode, &after_assign);
-	lval = force_number(*lhs);
-
 	/*
-	 * Can't unref *lhs until we know the type; doing so
-	 * too early breaks   x += x   sorts of things.
+	 * For ++ and --, get the lhs when doing the op and then
+	 * return.  For += etc, do the rhs first, since it can
+	 * rearrange things, and *then* get the lhs.
 	 */
+
 	switch(tree->type) {
 	case Node_preincrement:
 	case Node_predecrement:
+		lhs = get_lhs(tree->lnode, &after_assign);
+		lval = force_number(*lhs);
 		unref(*lhs);
 		*lhs = make_number(lval +
 			       (tree->type == Node_preincrement ? 1.0 : -1.0));
@@ -1091,6 +1114,8 @@ register NODE *tree;

 	case Node_postincrement:
 	case Node_postdecrement:
+		lhs = get_lhs(tree->lnode, &after_assign);
+		lval = force_number(*lhs);
 		unref(*lhs);
 		*lhs = make_number(lval +
 			       (tree->type == Node_postincrement ? 1.0 : -1.0));
@@ -1102,16 +1127,16 @@ register NODE *tree;
 		break;	/* handled below */
 	}

+	/*
+	 * It's a += kind of thing.  Do the rhs, then the lhs.
+	 */
+
 	tmp = tree_eval(tree->rnode);
 	rval = force_number(tmp);
 	free_temp(tmp);

-	/*
-	 * Do this again; the lhs and the rhs could both be fields.
-	 * Accessing the rhs could cause the lhs to have moved around.
-	 * (Yet another special case. Gack.)
-	 */
 	lhs = get_lhs(tree->lnode, &after_assign);
+	lval = force_number(*lhs);

 	unref(*lhs);
 	switch(tree->type) {
@@ -1227,7 +1252,7 @@ pop_fcall()
 		if (arg->type == Node_param_list)
 			arg = stack_ptr[arg->param_cnt];
 		n = *sp++;
-		if ((arg->type == Node_var || arg->type == Node_var_array)
+		if ((arg->type == Node_var /* || arg->type == Node_var_array */)
 		    && n->type == Node_var_array) {
 			/* should we free arg->var_value ? */
 			arg->var_array = n->var_array;
@@ -1237,7 +1262,7 @@ pop_fcall()
 			arg->flags = n->flags;
 		}
 		/* n->lnode overlays the array size, don't unref it if array */
-		if (n->type != Node_var_array)
+		if (n->type != Node_var_array && n->type != Node_array_ref)
 			unref(n->lnode);
 		freenode(n);
 		count--;
@@ -1247,7 +1272,9 @@ pop_fcall()
 		/* if n is a local array, all the elements should be freed */
 		if (n->type == Node_var_array)
 			assoc_clear(n);
-		unref(n->lnode);
+		/* n->lnode overlays the array size, don't unref it if array */
+		if (n->type != Node_var_array && n->type != Node_array_ref)
+			unref(n->lnode);
 		freenode(n);
 	}
 	if (f->stack)
@@ -1307,11 +1334,19 @@ char *func_name;
 		r->type = Node_var;

 		/* call by reference for arrays; see below also */
-		if (arg->type == Node_param_list)
+		if (arg->type == Node_param_list) {
+			/* we must also reassign f here; see below */
+			f = & fcall_list[curfcall];
 			arg = f->prevstack[arg->param_cnt];
-		if (arg->type == Node_var_array)
+		}
+		if (arg->type == Node_var_array) {
+			r->type = Node_array_ref;
+			r->flags &= ~SCALAR;
+			r->orig_array = arg;
+			r->vname = arg->vname;
+		} else if (arg->type == Node_array_ref) {
 			*r = *arg;
-		else {
+		} else {
 			n = tree_eval(arg);
 			r->lnode = dupnode(n);
 			r->rnode = (NODE *) NULL;
@@ -1445,6 +1480,7 @@ Func_ptr *assign;
 	}

 	switch (ptr->type) {
+	case Node_array_ref:
 	case Node_var_array:
 		fatal("attempt to use array `%s' in a scalar context",
 			ptr->vname);
@@ -1567,7 +1603,12 @@ Func_ptr *assign;
 			n = stack_ptr[n->param_cnt];
 			if ((n->flags & SCALAR) != 0)
 				fatal("attempt to use scalar parameter %d as an array", i);
-		} else if (n->type == Node_func) {
+		}
+		if (n->type == Node_array_ref) {
+			n = n->orig_array;
+			assert(n->type == Node_var_array || n->type == Node_var);
+		}
+		if (n->type == Node_func) {
 			fatal("attempt to use function `%s' as array",
 				n->lnode->param);
 		}
@@ -1581,6 +1622,8 @@ Func_ptr *assign;
 	case Node_builtin:
 		fatal("assignment is not allowed to result of builtin function");
 	default:
+		fprintf(stderr, "type = %s\n", nodetype2str(ptr->type));
+		fflush(stderr);
 		cant_happen();
 	}
 	return aptr;
@@ -3,7 +3,7 @@
 */

 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -221,6 +221,11 @@ rebuild_record()
 * set_record:
 * setup $0, but defer parsing rest of line until reference is made to $(>0)
 * or to NF.  At that point, parse only as much as necessary.
+ *
+ * Manage a private buffer for the contents of $0.  Doing so keeps us safe
+ * if `getline var' decides to rearrange the contents of the IOBUF that
+ * $0 might have been pointing into.  The cost is the copying of the buffer;
+ * but better correct than fast.
 */
 void
 set_record(buf, cnt, freeold)
@@ -230,6 +235,10 @@ int freeold;
 {
 	register int i;
 	NODE *n;
+	static char *databuf;
+	static unsigned long databuf_size;
+#define INITIAL_SIZE	512
+#define MAX_SIZE	((unsigned long) ~0)	/* maximally portable ... */

 	NF = -1;
 	for (i = 1; i <= parse_high_water; i++) {
@@ -250,9 +259,28 @@ int freeold;
 		save_FS = dupnode(FS_node->var_value);
 	}
 	if (freeold) {
+		/* buffer management: */
+		if (databuf_size == 0) {	/* first time */
+			emalloc(databuf, char *, INITIAL_SIZE, "set_record");
+			databuf_size = INITIAL_SIZE;
+		}
+		/*
+		 * Make sure there's enough room. Since we sometimes need
+		 * to place a sentinel at the end, we make sure
+		 * databuf_size is > cnt after allocation.
+		 */
+		if (cnt >= databuf_size) {
+			while (cnt >= databuf_size && databuf_size <= MAX_SIZE)
+				databuf_size *= 2;
+			erealloc(databuf, char *, databuf_size, "set_record");
+		}
+		/* copy the data */
+		memcpy(databuf, buf, cnt);
+
+		/* manage field 0: */
 		unref(fields_arr[0]);
 		getnode(n);
-		n->stptr = buf;
+		n->stptr = databuf;
 		n->stlen = cnt;
 		n->stref = 1;
 		n->type = Node_val;
@@ -262,6 +290,9 @@ int freeold;
 	}
 	fields_arr[0]->flags |= MAYBE_NUM;
 	field0_valid = TRUE;
+
+#undef INITIAL_SIZE
+#undef MAX_SIZE
 }

 /* reset_record --- start over again with current $0 */
@@ -761,6 +792,8 @@ NODE *tree;

 	if (arr->type == Node_param_list)
 		arr = stack_ptr[arr->param_cnt];
+	if (arr->type == Node_array_ref)
+		arr = arr->orig_array;
 	if (arr->type != Node_var && arr->type != Node_var_array)
 		fatal("second argument of split is not an array");
 	arr->type = Node_var_array;
@@ -3,7 +3,7 @@
 */

 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -3,7 +3,7 @@
 */

 /* 
- * Copyright (C) 1976, 1988, 1989, 1991-1999 the Free Software Foundation, Inc.
+ * Copyright (C) 1976, 1988, 1989, 1991-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -479,6 +479,15 @@ int *errflg;
 				}
 				if (rp->fp != NULL && isatty(fd))
 					rp->flag |= RED_NOBUF;
+				/* Move rp to the head of the list. */
+				if (red_head != rp) {
+					if ((rp->prev->next = rp->next) != NULL)
+						rp->next->prev = rp->prev;
+					red_head->prev = rp;
+					rp->prev = NULL;
+					rp->next = red_head;
+					red_head = rp;
+				}
 			}
 		}
 		if (rp->fp == NULL && rp->iop == NULL) {
@@ -490,6 +499,13 @@ int *errflg;
 			/* it is also needed for MINGW32 */
 			else if (errno == 0)    /* HACK! */
 				close_one();
+#endif
+#ifdef VMS
+			/* Alpha/VMS V7.1's C RTL is returning this instead
+			   of EMFILE (haven't tried other post-V6.2 systems) */
+#define SS$_EXQUOTA 0x001C
+			else if (errno == EIO && vaxc$errno == SS$_EXQUOTA)
+				close_one();
 #endif
 			else {
 				/*
@@ -628,10 +644,6 @@ int exitwarn;

 	what = ((rp->flag & RED_PIPE) != 0) ? "pipe" : "file";

-	if (exitwarn) 
-		warning("no explicit close of %s `%s' provided",
-			what, rp->value);
-
 	/* SVR4 awk checks and warns about status of close */
 	if (status != 0) {
 		char *s = strerror(errno);
@@ -650,6 +662,11 @@ int exitwarn;
 			ERRNO_node->var_value = make_string(s, strlen(s));
 		}
 	}
+
+	if (exitwarn) 
+		warning("no explicit close of %s `%s' provided",
+			what, rp->value);
+
 	if (rp->next != NULL)
 		rp->next->prev = rp->prev;
 	if (rp->prev != NULL)
@@ -1953,8 +1970,16 @@ set_RS()
 	}
 	if (RS->stlen == 0)
 		RS_is_null = TRUE;
-	else if (RS->stlen > 1)
+	else if (RS->stlen > 1) {
+		static int warned = FALSE;
+
 		RS_regexp = make_regexp(RS->stptr, RS->stlen, IGNORECASE, TRUE);

+		if (do_lint && ! warned) {
+			warning("multicharacter value of `RS' is not portable");
+			warned = TRUE;
+		}
+	}
+
 	set_FS_if_not_FIELDWIDTHS();
 }
@@ -3,7 +3,7 @@
 */

 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -177,10 +177,17 @@ char **argv;
 	/* Set up the special variables */
 	/*
 	 * Note that this must be done BEFORE arg parsing else -F
-	 * breaks horribly 
+	 * breaks horribly.
 	 */
 	init_vars();

+	/* Set up the field variables */
+	/*
+	 * Do this before arg parsing so that `-v NF=blah' won't
+	 * break anything.
+	 */
+	init_fields();
+
 	/* worst case */
 	emalloc(srcfiles, struct src *, argc * sizeof(struct src), "main");
 	memset(srcfiles, '\0', argc * sizeof(struct src));
@@ -379,9 +386,6 @@ out:
 	(void) alloca(0);
 #endif

-	/* Set up the field variables */
-	init_fields();
-
 	if (do_lint && begin_block == NULL && expression_value == NULL
 	     && end_block == NULL)
 		warning("no program");
@@ -441,8 +445,9 @@ FILE *fp;
 	fputs("\t-W traditional\t\t--traditional\n", fp);
 	fputs("\t-W usage\t\t--usage\n", fp);
 	fputs("\t-W version\t\t--version\n", fp);
-	fputs("\nReport bugs to [email protected],\n", fp);
-	fputs("with a Cc: to [email protected]\n", fp);
+	fputs("\nTo report bugs, see node `Bugs' in `gawk.info', which\n", fp);
+	fputs("is section `Reporting Problems and Bugs' in the\n", fp);
+	fputs("printed version.\n", fp);
 	exit(exitval);
 }

@@ -452,7 +457,7 @@ static void
 copyleft()
 {
 	static char blurb_part1[] =
-"Copyright (C) 1989, 1991-1999 Free Software Foundation.\n\
+"Copyright (C) 1989, 1991-2000 Free Software Foundation.\n\
 \n\
 This program is free software; you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
@@ -654,8 +659,13 @@ char *arg;
 					badvar = TRUE;
 					break;
 				}
-		if (badvar)
-			fatal("illegal name `%s' in variable assignment", arg);
+
+		if (badvar) {
+			if (do_lint)
+				warning("illegal name `%s' in variable assignment", arg);
+			*--cp = '=';	/* restore original text of ARGV */
+			return NULL;
+		}

 		/*
 		 * Recent versions of nawk expand escapes inside assignments.
@@ -3,7 +3,7 @@
 */

 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -3,7 +3,7 @@
 */

 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -205,8 +205,10 @@ register NODE *s;
 		cant_happen();
 	if (s->type != Node_val)
 		cant_happen();
+/*
 	if ((s->flags & NUM) == 0)
 		cant_happen();
+*/
 	if (s->stref <= 0)
 		cant_happen();
 	if ((s->flags & STR) != 0
@@ -241,7 +243,7 @@ NODE *n;
 	}
 	getnode(r);
 	*r = *n;
-	r->flags &= ~(PERM|TEMP);
+	r->flags &= ~(PERM|TEMP|FIELD);
 	r->flags |= MALLOC;
 	if (n->type == Node_val && (n->flags & STR) != 0) {
 		r->stref = 1;
@@ -513,6 +515,18 @@ char **string_ptr;
 		}
 		return i;
 	default:
+		if (do_lint) {
+			static short warned[256];
+			unsigned char uc = (unsigned char) c;
+
+			/* N.B.: use unsigned char here to avoid Latin-1 problems */
+
+			if (! warned[uc]) {
+				warned[uc] = TRUE;
+
+				warning("escape sequence `\\%c' treated as plain `%c'", uc, uc);
+			}
+		}
 		return c;
 	}
 }
@@ -1 +1 @@
-#define PATCHLEVEL	4
+#define PATCHLEVEL	6
@@ -1,3 +1,11 @@
+Mon Aug  7 15:23:00 2000  Arnold D. Robbins  <[email protected]>
+
+	* Release 3.0.6: Release tar file made.
+
+Sun Jun 25 15:08:19 2000  Arnold D. Robbins  <[email protected]>
+
+	* Release 3.0.5: Release tar file made.
+
 Wed Jun 30 16:14:36 1999  Arnold D. Robbins  <[email protected]>

 	* Release 3.0.4: Release tar file made.  This time for sure.
@@ -3,7 +3,7 @@
 */

 /* 
- * Copyright (C) 1991-1996 the Free Software Foundation, Inc.
+ * Copyright (C) 1991-2000 the Free Software Foundation, Inc.
 * 
 * This file is part of GAWK, the GNU implementation of the
 * AWK Programming Language.
@@ -216,7 +216,6 @@ NODE *t;
 {
 	NODE *t1;

-/* #	define	CASE	1 */
 	if ((t->re_flags & CASE) == IGNORECASE) {
 		if ((t->re_flags & CONST) != 0)
 			return t->re_reg;
@@ -237,7 +236,7 @@ NODE *t;
 		t->re_cnt++;
 	if (t->re_cnt > 10)
 		t->re_cnt = 0;
-	if (t->re_text == NULL) {
+	if (t->re_text == NULL || (t->re_flags & CASE) != IGNORECASE) {
 		t1 = force_string(tree_eval(t->re_exp));
 		t->re_text = dupnode(t1);
 		free_temp(t1);
@@ -1,4 +1,4 @@
-Phil Nelson <phil@cs.wwu.edu> wrote bc, including the number.c
+Phil Nelson <phil[email protected]> wrote bc, including the number.c
 source in the "lib" directory.

 Ken Pizzini wrote dc.
@@ -1,3 +1,224 @@
+Wed Sep 27 17:19:48 2000  Phil Nelson  <[email protected]>
+
+	* doc/bc.texi: Added new file. Mainly translated from bc.1
+		       by Brian Youmans.
+	  doc/bc.1: Minor changes made as part of reviewing bc.texi.
+
+Wed Sep 20 11:45:00 2000  Phil Nelson  <[email protected]>
+
+	* bc/bc.y:  Added a comment on the meanings of lvals.
+
+Wed Sep 13 11:40:24 2000  Phil Nelson  <[email protected]>
+
+	* bc/main.c: add --interactive to long options.
+	  bc/bc.1: add -i/--interactive to doc.
+	  MANY: Update FSF address and Phil's e-mail.
+	
+Tue Sep 12 13:58:16 2000  Phil Nelson  <[email protected]>
+
+	* NEWS: update for recent changes.
+	  bc/bc.y: remove required parens around return expression.
+	  doc/bc.1: update for recent changes.
+
+Fri Sep  8 10:20:01 2000  Phil Nelson  <[email protected]>
+
+	* bc/Makefile.am, dc/Makefile.am, lib/Makefile.am:
+	    Compile with unsigned characters.
+	  bc/main.c: Add --help option.
+	  bc/scan.l: Print illegal, non-printable characters in octal.
+
+Fri Sep  8 09:36:54 2000  Phil Nelson  <[email protected]>
+
+	* bc/bc.y: Allow more newlines in function definitions.
+	  bc/proto.h: Don't prototype main.
+
+Fri Sep  1 16:09:50 2000  Phil Nelson  <[email protected]>
+
+	* bc/bc.y: Spelling correction
+	  bc/execute.c: Correct expressions for multi-byte names.
+	  bc/load.c: Add parens for correct casting.
+	  doc/bc.1: Typos.
+	  Above fixes pointed out by [email protected] (Karl Heuer).
+
+Tue Aug 29 23:03:30 PDT 2000 Phil Nelson  <[email protected]>
+
+	* lib/testmul.c: #ifdef out a declaration matching #ifdef out
+	  code.
+
+Mon Jul 31 07:01:42 2000 Ken Pizzini <[email protected]>
+
+	* dc/numeric.c: use of the "n" command can cause a number to be printed
+	  without a trailing newline, which would cause the column counter to
+	  fail to be reset and result in inappropriately wrapped numeric outputs.
+	  Fixed by always clearing the column counter before outputting each number.
+
+	* dc/stack.c: if a stack is used without ever using the correspondingly
+	  named register, it is perfectly legitimate for the register to be
+	  uninitialized; added an "else if" to handle this case without aborting.
+
+	* dc/eval.c: updated the comment explaining the restrictions
+	  on the | command to better reflect reality.
+
+	* doc/dc.texi: update the FSF office address in the copyright notice
+
+Thu Jul 13 18:13:00 2000 Phil Nelson  <[email protected]>
+
+	* README: note --with-libedit configure parameter.
+
+Tue Jun 20 22:52:10 2000  Phil Nelson  <[email protected]>
+
+	* bc/bcdefs.h: Include <readline/history.h> to quiet warnings. 
+
+	* configure.in: make --with-readline and --with-libedit work correctly.
+
+	* Makefile.am: use $(MAKE) instead of directly calling make.
+
+	* lib/testmul.c: Update to use bc_ on all number.c routines.
+
+Sat Jun 10 22:44:29 2000  Phil Nelson  <[email protected]>
+
+	* bc/Makefile.am: Add scan.c to maintainer-clean target.
+
+	* acconfig.h configure.in stamp-h.in bc/Makefile.am bc/execute.c
+	  bc/fix-libmath_h bc/global.c bc/load.c bc/main.c bc/storage.c:
+	    Remove long string for libmath.  Clean up for compiler errors.
+
+	* dc/numeric.c: Correct parameter name.
+
+Wed May 10 15:51:16 2000  Phil Nelson  <[email protected]>
+
+	* {bc,doc,dc,lib}/Makefile.am: Add Makefile.in to maintainer-clean.
+
+	* bootstrap.sh: Added script to run the auto* tools.
+
+	* Imported all into CVS tree.
+
+Sun 2000-05-07  Phil Nelson  <[email protected]>
+
+	* bc/Makefile.am, dc/Makefile.am, lib/Makefile.am: Add -Wall to CFLAGS.
+
+	* bc/{execute.c,proto.h,storage.c,util.c}, dc/numeric.c: Changes for
+	  -Wall and for name changes in lib/number.c.  (Added bc_ to several
+	  routine.  Updated copyright notice.)
+
+	* h/number.h, lib/number.c:  Now comes from bcmath library which is  
+	  distributed in a different place. 
+
+Wed Mar 29 17:47:34 2000  Phil Nelson  <[email protected]>
+
+	* bc/{bc.y,bcdefs.h,global.h,main.c,proto.h,scan.l,storage.c}:
+	  Added BSD libedit support.  Generic support for both where possible.
+	  Fixed bugs in readline support noticed during libedit addition.
+	  Works with NetBSD-1.4.1 libedit.
+	* doc/bc.1: Documented libedit addition.
+
+Wed Mar 29 10:20:18 2000  Phil Nelson  <[email protected]>
+
+	* FAQ: Added this file.
+	* Makfile.am: Added FAQ to distribution
+
+Tue Mar 28 13:52:35 2000  Phil Nelson  <[email protected]>
+
+	* lib/number.c, h/number.h: Moved definitions so 
+	  number.c/number.h is a stand-alone "library".
+	  Changed definition of out_num to not reference a global.
+	* lib/testmul.c: updated #includes for number.h changes.
+	* h/{bcdefs.h,const.h,global.h,proto.h} moved to
+	  bc where they really belong.
+	* bc/execute.c: Changed calls to out_num for correctness.
+	* dc/numeric.c: Changed calls to out_num for correctness,
+	  include only number.h now and not all the other junk.
+	* configure.in, acconfig.h: Start of support for BSD libedit,
+	  added --with-pkg for NetBSD /usr/pkg tree.
+
+Tue Mar 28 11:20:00 2000  Phil Nelson  <[email protected]>
+
+	* Test/{exp.b,fact.b,jn.b,mul.b,raise.b}: Tweeks on the tests
+	  run to do more computation and test the recursive multiply.
+	* bc/scan.l: Removed a printf('\r') that was unneeded.
+
+Mon Mar 27 14:00:00 2000  Phil Nelson  <[email protected]>
+
+	* NEWS: Updated for 1.06.
+	* lib/number.c, h/number.h: Fixed bugs in recursive multiply.
+		Changed these files to be under the LGPL.
+	* Tests/jn.b: Added more tests.
+	* lib/Makefile.am: Only generate a timed version of number.o if
+		requested.
+	* README: Updated with information on how to generate a timed
+	        version of number.o.
+	* h/version.h: Updated copyright and version number for dc.
+
+Thu Mar 16 14:01:45 2000  Phil Nelson  <[email protected]>
+
+	* doc/bc.1, doc/dc.1, doc/dc.texi: Changed bug reporting address
+	  to [email protected] to update with what we hope will be reality.
+
+Tue Feb  8 08:54:19 2000  Phil Nelson  <[email protected]>
+
+	* doc/bc.1, bc/util.c: Removed "multiply digits"
+	  limit due to new recursive algorithm that doesn't
+	  have those limits.
+
+Tue Feb  8 08:47:05 2000  Phil Nelson  <[email protected]>
+
+	* lib/Makefile.am, lib/testmul.c, lib/number.c, Makefile.am:
+	  Finally got a resonable version of the program
+	  to test the crossover between non-recursive and
+	  recursive multiply algorithms.  Added to distribution
+	  and build process.  Does increase build time by 
+	  about 10 minutes.
+
+Wed Oct  6 13:28:59 1999  Phil Nelson  <[email protected]>
+
+	* lib/Makefile.am: Added rules to allow DEFSADD definitions.
+
+Sat Oct  2 19:59:51 1999  Phil Nelson  <[email protected]>
+
+	* bc/libmath.b: Correctly do the cosine accuracy.
+
+Fri Oct  1 12:41:51 1999  Phil Nelson  <[email protected]>
+
+	* lib/number.c: Increase accuracy of computing raise.
+	  Also turn off use of recursive multiply routines
+	  until furthur testing.
+	* bc/libmath.b: Increase accuracy of cosine.
+	* bc/Makefile.am: Remove -lfl from items to make.
+
+Wed Jul 28 10:29:28 1999  Phil Nelson  <[email protected]>
+
+	* bc/scan.l:  rl_len from char to int.  (From FreeBSD
+	  bug tracking system and Nick Hibma <[email protected]>)
+
+Tue Jun 22 08:00:28 1999  Phil Nelson  <[email protected]>
+
+	* lib/number.c: Rewrote bc_multiply to use a faster
+	  algorithm.  Old code not removed yet.
+
+Mon Jun 21 03:08:02 1999  Phil Nelson  <[email protected]>
+
+	* h/version.h: Updated version number to 1.06.
+	  bc/bc.y: Corrected bug in for statement, not popping.
+	  bc/execute.c: Improved stack dump/instruction tracing.
+
+Tue Jun 15 22:30:42 1999  Phil Nelson  <[email protected]>
+
+	* configure.in: Updated bc version to 1.06.
+
+Tue Jun 15 22:27:44 1999  Phil Nelson  <[email protected]>
+
+	* h/bcdefs.h, h/const.h, bc/execute.c, bc/load.c, bc/storage.c,
+	  bc/util.c: Removed segmented function storaged.  Now
+	  dynamically expands (by doubling, starting at 1024 bytes)
+	  to allow arbitrary sized functions.
+
+Thu Jun 10 22:33:44 1999  Phil Nelson  <[email protected]>
+
+	* bc/libmath.b: change scaling in computation of j(n,x) so
+	  it correctly computes the value.
+
+Wed Jun 10 10:10:10 1998 Release of bc-1.05a.
+
 Fri Apr 17 10:40:59 1998  Phil Nelson  <[email protected]>

 	* bc/main.c: Enable readline only if interactive.
@@ -820,4 +1041,3 @@ Tue Oct 29 10:06:32 1991  Phil Nelson  (phil at cs.wwu.edu)
 	* Called current version 1.00.

 	* Submitted GNU bc-1.00 to comp.sources.reviewed
-