This commit was manufactured by cvs2svn to create tag

'RELENG_4_4_0_RELEASE'.
This commit was manufactured by cvs2svn to create branch 'RELENG_4_4'.
2026-10-30 20:35:03 +01:00 · 2002-02-04 19:23:43 +00:00 · 2002-02-04 19:23:42 +00:00 · 2002-01-29 17:44:37 +00:00 · 2002-01-28 02:30:13 +00:00 · 2002-01-28 01:29:51 +00:00
6754 changed files with 376043 additions and 483013 deletions
@@ -84,7 +84,7 @@
 # Define the user-driven targets. These are listed here in alphabetical
 # order, but that's not important.
 #
-TGTS=	afterdistribute all buildkernel buildworld checkdpadd clean \
+TGTS=	afterdistribute all all-man buildkernel buildworld checkdpadd clean \
 	cleandepend cleandir depend distribute everything hierarchy includes \
 	install installkernel installmost installworld kernel libraries lint \
 	maninstall mk most obj objlink regress reinstallkernel rerelease \
@@ -171,7 +171,11 @@ CROSSENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
 		COMPILER_PATH=${WORLDTMP}/usr/libexec:${WORLDTMP}/usr/bin \
 		LIBRARY_PATH=${WORLDTMP}${SHLIBDIR}:${WORLDTMP}/usr/lib \
 		OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \
-		PERL5LIB=${WORLDTMP}/usr/libdata/perl/5.00503
+		CFLAGS="-nostdinc ${CFLAGS}" \
+		PERL5LIB=${WORLDTMP}/usr/libdata/perl/5.00503 \
+		GROFF_BIN_PATH=${WORLDTMP}/usr/bin \
+		GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \
+		GROFF_TMAC_PATH=${WORLDTMP}/usr/share/tmac

 # bootstrap-tool stage
 BMAKEENV=	${BOOTSTRAPENV}
@@ -208,13 +212,29 @@ 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
+		usr/libexec/${OBJFORMAT} usr/sbin usr/share/misc \
+		usr/share/dict \
+		usr/share/groff_font/devX100 \
+		usr/share/groff_font/devX100-12 \
+		usr/share/groff_font/devX75 \
+		usr/share/groff_font/devX75-12 \
+		usr/share/groff_font/devascii \
+		usr/share/groff_font/devcp1047 \
+		usr/share/groff_font/devdvi \
+		usr/share/groff_font/devhtml \
+		usr/share/groff_font/devkoi8-r \
+		usr/share/groff_font/devlatin1 \
+		usr/share/groff_font/devlbp \
+		usr/share/groff_font/devlj4 \
+		usr/share/groff_font/devps \
+		usr/share/groff_font/devutf8 \
+		usr/share/tmac/mdoc usr/share/tmac/mm

 .if ${MACHINE_ARCH} == "i386" && ${MACHINE} == "pc98"
 USRDIRS+=	usr/libexec/aout
 .endif

-INCDIRS=	arpa g++/std objc protocols readline rpc rpcsvc openssl \
+INCDIRS=	arpa g++/std isc objc protocols readline rpc rpcsvc openssl \
 		security ss

 #
@@ -231,10 +251,9 @@ buildworld:
 .if !defined(NOCLEAN)
 	rm -rf ${WORLDTMP}
 .else
-	for dir in bin games include lib sbin; do \
+	for dir in bin games include lib sbin share; do \
 		rm -rf ${WORLDTMP}/usr/$$dir; \
 	done
-	rm -f ${WORLDTMP}/sys
 	# XXX - Work-around for broken cc/cc_tools/Makefile.
 	# This is beyond dirty...
 	rm -f ${OBJTREE}${.CURDIR}/gnu/usr.bin/cc/cc_tools/.depend
@@ -245,7 +264,7 @@ buildworld:
 .for _dir in ${INCDIRS}
 	mkdir -p ${WORLDTMP}/usr/include/${_dir}
 .endfor
-	ln -sf ${.CURDIR}/sys ${WORLDTMP}/sys
+	ln -sf ${.CURDIR}/sys ${WORLDTMP}
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 1: bootstrap tools"
@@ -277,7 +296,7 @@ buildworld:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4: populating ${WORLDTMP}/usr/include"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes
+	cd ${.CURDIR}; ${WMAKE} SHARED=copies includes
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4: building libraries"
@@ -308,7 +327,7 @@ everything:
 installworld:
 	mkdir -p ${INSTALLTMP}
 	for prog in [ awk cat chflags chmod chown date echo egrep find grep \
-	    install ln make makewhatis mtree mv perl rm sed sh sysctl \
+	    ln make makewhatis mtree mv perl rm sed sh sysctl \
 	    test true uname wc zic; do \
 		cp `which $$prog` ${INSTALLTMP}; \
 	done
@@ -489,7 +508,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_4 -P -d
 .endif

 #
@@ -548,8 +567,9 @@ _strfile=	games/fortune/strfile
 .endif

 bootstrap-tools:
-.for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef usr.sbin/config \
-    gnu/usr.bin/gperf gnu/usr.bin/texinfo
+.for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef usr.bin/xinstall \
+    usr.sbin/config \
+    gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo
 	cd ${.CURDIR}/${_tool}; \
 		${MAKE} obj; \
 		${MAKE} depend; \
@@ -588,7 +608,7 @@ _perl=	gnu/usr.bin/perl

 build-tools:
 .for _tool in bin/csh bin/sh ${_games} gnu/usr.bin/cc/cc_tools ${_fortran} \
-    ${_libroken4} ${_libkrb5} lib/libncurses ${_share} ${_perl}
+    ${_libroken4} ${_libkrb5} lib/libncurses ${_share} ${_perl} usr.bin/file
 	cd ${.CURDIR}/${_tool}; ${MAKE} build-tools
 .endfor

@@ -1,10 +1,85 @@
 Updating Information for FreeBSD STABLE users

-This file is maintained by [email protected].  Please send new entries
-directly to him.  See end of file for further details.  A reverse
-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 file is maintained and copyrighted by M. Warner Losh
+<[email protected]>.  Please send new entries directly to him.  See end
+of file for further details.  For commonly done items, please see the
+COMMON ITEMS: section later in the file.
+
+A reverse 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.
+
+20010915:
+	FreeBSD 4.4-RELEASE.
+
+20010814:
+	The pci attachment for pcic device was merged from current.  You
+	should update your pccardd at the same time as you update your
+	kernel.
+
+	Note: Interrupts will now be shared between the CardBus bridge
+	and the cards.  This is a change over the hand configuration
+	before.
+
+20010811:
+	isdn4bsd was updated to version 1.00.1. for users of the isp<N>
+	(kernel PPP over ISDN) devices, this means that they now _must_
+	use ispppcontrol instead of spppcontrol to configure and control
+	their isp<N> devices. see /usr/share/examples/isdn for more info.
+
+20010725:
+	The ed driver has been updated.  It now allows mii attachments,
+	which means that you must include the miibus in your kernel if
+	you use the ed driver.
+
+20010724:
+	The gif(4) interface has been converted to use cloning
+	rather then allocating a static number of devices a compile
+	time.  If you use gif interfaces and configure them by any
+	method other then setting standard variables in /etc/rc.conf
+	you will need to update your system to create devices with
+	"ifconfig gifX create" before attempting to configure them.
+	
+	See the ifconfig(8) man page and /etc/rc.network for more
+	information.
+
+20010611:
+	The TCP_RESTRICT_RST option has been removed. You should entirely
+	remove it from your kernel configuration.
+
+	The same functionality is available from the blackhole(4) MIB.
+
+20010531:
+	The wd compat devices were removed from the ata driver.  Kernels
+	after this date will fail to work with /dev/ nodes that you may
+	have on your disk.  /etc/fstab is a common place to find these
+	files hanging out, as are dump devices in /etc/rc.conf.
+
+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
+
+20010516:
+	Size changes in the cred structures introduced a binary
+	incompatibility for modules using the crhold() macro.  Modules
+	should be recompiled for kernel later than this date.
+
+20010510:
+	The fxp driver from current has been ported to -stable.  This
+	requires kernels that include fxp to also include mii bus devices.
+	See GENERIC for details.
+
+20010421:
+	FreeBSD 4.3 RELEASE
+
+20010402:
+	It appears that PERL_THREADED=true in /etc/make.conf is not
+	compatible with mod_perl.  Not sure the exact date of this problem,
+	but it post dates 4.2 and predates 4.3.

 20010202:
 	The KERNEL variable for buildkernel and installkernel has been
@@ -195,7 +270,7 @@ COMMON ITEMS:
 	make install
 	<follow rebuild disk /dev entries above>	[1]
 	reboot
-	<in single user>
+	<in single user>				[6]
 	cd /usr/src
 	cd gnu/usr.bin/texinfo/install-info
 	make install
@@ -219,9 +294,19 @@ COMMON ITEMS:
 	couple of months, be sure they have all the components listed
 	in /usr/share/examples/cvsup.  Crypto and secure are now
 	required.
-	[4] This step is optional, but is generally a good idea.  If
-	you wish to use many of the new features in 4.x, you must do
-	this anyway.
+	[4] This step is not optional.  If you fail to do this, you
+	will not have critical system config files updated for their
+	4.x functionality.  This will lead to reduced system
+	functionality, the biggest problem being with /etc/pam.conf
+	not having the entries necessary to allow remote ssh access.
+	[5] Note: This won't upgrade your perl install.  You will
+	need to rebuild the world on 4.x to update perl.
+	[6] From the bootblocks, boot -s, and then do
+		fsck -p
+		mount -u /
+		mount -a
+		cd /usr/src
+		adjkerntz -i		# if COMS is wall time

 	To update from 4.0-RELEASE or later to the most current
 	4.x-STABLE
@@ -231,7 +316,7 @@ COMMON ITEMS:
 	make installkernel KERNCONF=YOUR_KERNEL_HERE
 	reboot	(in single user) [1]
 	make installworld
-	mergemaster
+	mergemaster		[2]
 	reboot

 	[1] You can often get away without doing this step as the
@@ -241,7 +326,10 @@ COMMON ITEMS:
 	otherwise quiet as unpredictable results may happen.  If in
 	doubt, reboot into single user.  For remote installs, keep
 	a separate kernel around and use a serial console if at all
-	possible.
+	possible.  See also note [6] above.
+	[2] If you do not run mergemaster, you will likely hit a
+	number of show stopper problems.  The biggest one is that
+	your /etc/pam.conf won't let you log in using ssh.

 What follows are older entries for those people upgrading from earlier
 versions of -stable/-current.
@@ -868,4 +956,27 @@ version of FreeBSD, you are on your own to get to November 18, 1998.
 Please filter your entries through Warner Losh ([email protected]) so
 that the style, formatting, etc of this file can be maintained.

+Copyright information:
+
+Copyright 1998, 2001 M. Warner Losh.  All Rights Reserved.
+
+Redistribution, translation and use, with or without modification, in
+full or in part, are permitted provided that the above copyright
+notice is retained.
+
+THIS DOCUMENT IS PROVIDED BY WARNER LOSH ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL WARNER LOSH BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+If you find this document useful, and you want to, you may buy the
+author a beer.
+
 $FreeBSD$
@@ -97,9 +97,7 @@ characters (with the high bit set) are printed as
 (for meta) followed by the character for the low 7 bits.
 .El
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success or >0 if an error occurred.
+.Ex -std
 .Sh EXAMPLES
 The command:
 .Bd -literal -offset indent
@@ -157,6 +155,7 @@ operand.
 .Xr sh 1 ,
 .Xr tail 1 ,
 .Xr vis 1 ,
+.Xr zcat 1 ,
 .Xr setbuf 3
 .Rs
 .%A Rob Pike
@@ -57,6 +57,7 @@ static const char rcsid[] =
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>

 int bflag, eflag, nflag, sflag, tflag, vflag;
@@ -4,6 +4,7 @@
 CFLAGS+=-I${.CURDIR}/../../sys

 PROG=	chio
+WARNS?=	2
 SRCS=	chio.c

 .include <bsd.prog.mk>
@@ -94,7 +94,6 @@ and the
 .Em EU
 would be
 .Dq 0 .
-.Pp
 .Sh SUPPORTED COMMANDS
 .Bl -tag -width indent
 .It Ic move Xo
@@ -194,7 +193,7 @@ is only supported by few media changers.  If it is not supported by a
 device, using this command will usually result in a "Invalid Field in
 CDB" error message on the console.
 .Pp
-If the 
+If the
 .Fl c
 flag is specified, the volume tag of the specified element is
 cleared.  If the
@@ -237,8 +236,7 @@ element address is not normally used with this driver.  It is reported
 for diagnostic purposes only.
 .It Fl a
 Print all additional information (as in
-.Fl vVsSba
-).
+.Fl vVsSba ) .
 .El
 .Pp
 The status bits are defined as follows:
@@ -256,7 +254,6 @@ Element supports passing media (exporting) to an outside human operator.
 .It INENAB
 Element supports receiving media (importing) from an outside human operator.
 .El
-.Pp
 .Sh EXAMPLES
 .Bl -tag -width indent
 .It Li chio move slot 3 drive 0
@@ -63,21 +63,22 @@ static	int parse_element_unit __P((char *));
 static	const char * element_type_name __P((int et));
 static	int parse_special __P((char *));
 static	int is_special __P((char *));
-static	const char *bits_to_string __P((int, const char *));
+static	const char *bits_to_string __P((ces_status_flags, const char *));

 static	void find_element __P((char *, u_int16_t *, u_int16_t *));
-static	struct changer_element_status *get_element_status __P((u_int16_t, u_int16_t));
+static	struct changer_element_status *get_element_status
+	    __P((unsigned int, unsigned int));

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

 #ifndef CHET_VT
 #define	CHET_VT		10			/* Completely Arbitrary */
@@ -176,7 +177,7 @@ main(argc, argv)

 static int
 do_move(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -257,7 +258,7 @@ do_move(cname, argc, argv)

 static int
 do_exchange(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -369,7 +370,7 @@ do_exchange(cname, argc, argv)

 static int
 do_position(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -433,7 +434,7 @@ do_position(cname, argc, argv)
 /* ARGSUSED */
 static int
 do_params(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -479,7 +480,7 @@ do_params(cname, argc, argv)
 /* ARGSUSED */
 static int
 do_getpicker(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -509,7 +510,7 @@ do_getpicker(cname, argc, argv)

 static int
 do_setpicker(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -540,14 +541,14 @@ do_setpicker(cname, argc, argv)

 static int
 do_status(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
 	struct changer_params cp;
 	struct changer_element_status_request cesr;
 	int i, count, base, chet, schet, echet;
-	char *description;
+	const char *description;
 	int pvoltag = 0;
 	int avoltag = 0;
 	int sense = 0;
@@ -689,7 +690,7 @@ do_status(cname, argc, argv)
 		/* Allocate storage for the status structures. */
 		cesr.cesr_element_status =
 		  (struct changer_element_status *) 
-		  calloc(count, sizeof(struct changer_element_status));
+		  calloc((size_t)count, sizeof(struct changer_element_status));
 		
 		if (!cesr.cesr_element_status)
 			errx(1, "can't allocate status storage");
@@ -762,7 +763,7 @@ do_status(cname, argc, argv)

 static int
 do_ielem(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -788,7 +789,7 @@ do_ielem(cname, argc, argv)

 static int
 do_voltag(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int argc;
 	char **argv;
 {
@@ -845,7 +846,7 @@ do_voltag(cname, argc, argv)
 			goto usage;
 		}

-		strncpy(csvr.csvr_voltag.cv_volid, argv[2],
+		strlcpy((char *)csvr.csvr_voltag.cv_volid, argv[2],
 		       sizeof(csvr.csvr_voltag.cv_volid));

 		if (argc == 4) {
@@ -944,7 +945,7 @@ is_special(cp)

 static const char *
 bits_to_string(v, cp)
-	int v;
+	ces_status_flags v;
 	const char *cp;
 {
 	const char *np;
@@ -977,7 +978,7 @@ bits_to_string(v, cp)
 */
 static int
 do_return(cname, argc, argv)
-	char *cname;
+	const char *cname;
 	int  argc;
 	char **argv;
 {
@@ -1006,7 +1007,8 @@ do_return(cname, argc, argv)
 	}
 	++argv; --argc;

-	ces = get_element_status(type, element);	/* Get the status */
+	/* Get the status */
+	ces = get_element_status((unsigned int)type, (unsigned int)element);

 	if (NULL == ces)
 		errx(1, "%s: null element status pointer", cname);
@@ -1042,22 +1044,22 @@ usage:
 */
 static struct changer_element_status *
 get_element_status(type, element)
-	u_int16_t	type;
-	u_int16_t	element;
+	unsigned int	type;
+	unsigned int	element;
 {
 	struct changer_element_status_request cesr;
 	struct changer_element_status *ces;
 	
 	ces = (struct changer_element_status *)
-	    calloc(1, sizeof(struct changer_element_status));
+	    calloc((size_t)1, sizeof(struct changer_element_status));

 	if (NULL == ces)
 		errx(1, "can't allocate status storage");

 	(void)memset(&cesr, 0, sizeof(cesr));

-	cesr.cesr_element_type = type;
-	cesr.cesr_element_base = element;
+	cesr.cesr_element_type = (u_int16_t)type;
+	cesr.cesr_element_base = (u_int16_t)element;
 	cesr.cesr_element_count = 1;		/* Only this one element */
 	cesr.cesr_flags |= CESR_VOLTAGS;	/* Grab voltags as well */
 	cesr.cesr_element_status = ces;
@@ -1088,7 +1090,8 @@ find_element(voltag, et, eu)
 	struct changer_params cp;
 	struct changer_element_status_request cesr;
 	struct changer_element_status *ch_ces, *ces;
-	int elem, total_elem, found = 0;
+	int found = 0;
+	size_t elem, total_elem;

 	/*
 	 * Get the changer parameters, we're interested in the counts
@@ -1185,7 +1188,8 @@ find_element(voltag, et, eu)
 			continue;

 		/* Check to see if it is our target */
-		if (strcasecmp(voltag, ces->ces_pvoltag.cv_volid) == 0) {
+		if (strcasecmp(voltag,
+		    (const char *)ces->ces_pvoltag.cv_volid) == 0) {
 			*et = ces->ces_type;
 			*eu = ces->ces_addr;
 			++found;
@@ -33,18 +33,18 @@
 */

 struct element_type {
-	char	*et_name;	/* name; i.e. "picker, "slot", etc. */
+	const	char *et_name;	/* name; i.e. "picker, "slot", etc. */
 	int	et_type;	/* type number */
 };

 struct changer_command {
-	char	*cc_name;	/* command name */
+	const	char *cc_name;	/* command name */
 				/* command handler */
-	int	(*cc_handler) __P((char *, int, char **));
+	int	(*cc_handler) __P((const char *, int, char **));
 };

 struct special_word {
-	char	*sw_name;	/* special word */
+	const	char *sw_name;	/* special word */
 	int	sw_value;	/* token value */
 };

@@ -3,4 +3,6 @@

 PROG=	chmod

+WARNS?=	2
+
 .include <bsd.prog.mk>
@@ -44,10 +44,9 @@
 .Sh SYNOPSIS
 .Nm
 .Oo
-.Fl f
+.Fl fv
 .Fl R
 .Op Fl H | Fl L | Fl P
-.Fl v
 .Oc
 .Ar mode
 .Ar
@@ -75,6 +74,7 @@ option is specified, all symbolic links are followed.
 If the
 .Fl R
 option is specified, no symbolic links are followed.
+This is the default.
 .It Fl R
 Change the modes of the file hierarchies rooted in the files
 instead of just the files themselves.
@@ -110,9 +110,7 @@ command's actions are determined by the last one specified.
 Only the owner of a file or the super-user is permitted to change
 the mode of a file.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh MODES
 Modes may be absolute or symbolic.
 An absolute mode is an octal number constructed from the sum of
@@ -120,42 +118,42 @@ one or more of the following values:
 .Pp
 .Bl -tag -width 6n -compact -offset indent
 .It Li 4000
-(the set-user-ID-on-execution bit) Executable files with this bit set 
+(the set-user-ID-on-execution bit) Executable files with this bit set
 will run with effective uid set to the uid of the file owner.
-Directories with the set-user-id bit set will force all files and 
-sub-directories created in them to be owned by the directory owner 
-and not by the uid of the creating process, if the underlying file 
-system supports this feature: see 
+Directories with the set-user-id bit set will force all files and
+sub-directories created in them to be owned by the directory owner
+and not by the uid of the creating process, if the underlying file
+system supports this feature: see
 .Xr chmod 2
-and the 
+and the
 .Ar suiddir
 option to
 .Xr mount 8 .
 .It Li 2000
-(the set-group-ID-on-execution bit)  Executable files with this bit set 
-will run with effective gid set to the gid of the file owner.  
+(the set-group-ID-on-execution bit)  Executable files with this bit set
+will run with effective gid set to the gid of the file owner.
 .It Li 1000
-(the sticky bit)  
+(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 
+only those files in the directory that are owned by them, regardless of
 the permissions on the directory.  Under
 .Fx ,
-the sticky bit is 
-ignored for executable files and may only be set for directories (see 
+the sticky bit is
+ignored for executable files and may only be set for directories (see
 .Xr sticky 8 ) .
 .It Li 0400
 Allow read by owner.
 .It Li 0200
 Allow write by owner.
 .It Li 0100
-For files, allow execution by owner.  For directories, allow the owner to 
+For files, allow execution by owner.  For directories, allow the owner to
 search in the directory.
 .It Li 0040
 Allow read by group members.
 .It Li 0020
 Allow write by group members.
 .It Li 0010
-For files, allow execution by group members.  For directories, allow 
+For files, allow execution by group members.  For directories, allow
 group members to search in the directory.
 .It Li 0004
 Allow read by others.
@@ -166,9 +164,9 @@ For files, allow execution by others.  For directories allow others to
 search in the directory.
 .El
 .Pp
-For example, the absolute mode that permits read, write and execute by 
-the owner, read and execute by group members, read and execute by 
-others, and no set-uid or set-gid behaviour is 755 
+For example, the absolute mode that permits read, write and execute by
+the owner, read and execute by group members, read and execute by
+others, and no set-uid or set-gid behaviour is 755
 (400+200+100+040+010+004+001).
 .Pp
 The symbolic mode is described by the following grammar:
@@ -57,6 +57,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>

+int main __P((int, char *[]));
 void usage __P((void));

 int
@@ -37,7 +37,7 @@
 .\"
 .Dd April 18, 1994
 .Dt CP 1
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm cp
 .Nd copy files
@@ -90,6 +90,7 @@ option is specified, all symbolic links are followed.
 If the
 .Fl R
 option is specified, no symbolic links are followed.
+This is the default.
 .It Fl R
 If
 .Ar source_file
@@ -127,7 +128,7 @@ Cause
 to write a prompt to the standard error output before copying a file
 that would overwrite an existing file.
 If the response from the standard input begins with the character
-.Sq Li y 
+.Sq Li y
 or
 .Sq Li Y ,
 the file copy is attempted.
@@ -167,12 +168,12 @@ ID are unchanged unless the
 .Fl p
 option was specified.
 .Pp
-In the second synopsis form, 
-.Ar target_directory 
+In the second synopsis form,
+.Ar target_directory
 must exist unless there is only one named
 .Ar source_file
-which is a directory and the 
-.Fl R 
+which is a directory and the
+.Fl R
 flag is specified.
 .Pp
 If the destination file does not exist, the mode of the source file is
@@ -191,12 +192,12 @@ conditions must be fulfilled or both bits are removed.
 .Pp
 Appropriate permissions are required for file creation or overwriting.
 .Pp
-Symbolic links are always followed unless the 
-.Fl R 
+Symbolic links are always followed unless the
+.Fl R
 flag is set, in which case symbolic links are not followed, by default.
 The
 .Fl H
-or 
+or
 .Fl L
 flags (in conjunction with the
 .Fl R
@@ -212,9 +213,7 @@ option is specified.
 In addition, these options override each other and the
 command's actions are determined by the last one specified.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh COMPATIBILITY
 Historic versions of the
 .Nm
@@ -231,7 +230,7 @@ option is non-standard and its use in scripts is not recommended.
 .Sh SEE ALSO
 .Xr mv 1 ,
 .Xr rcp 1 ,
-.Xr umask 2 , 
+.Xr umask 2 ,
 .Xr fts 3 ,
 .Xr symlink 7
 .Sh STANDARDS
@@ -69,7 +69,9 @@ static const char rcsid[] =
 #include <err.h>
 #include <errno.h>
 #include <fts.h>
+#include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

@@ -82,9 +84,7 @@ static const char rcsid[] =

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

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

 enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE };

@@ -169,17 +169,10 @@ main(argc, argv)
 		fts_options |= FTS_LOGICAL;
 	}

-	myuid = getuid();
-
-	/* Copy the umask for explicit mode setting. */
-	myumask = umask(0);
-	(void)umask(myumask);
-
 	/* Save the target base in "to". */
 	target = argv[--argc];
-	if (strlen(target) > MAXPATHLEN)
+	if (strlcpy(to.p_path, target, sizeof(to.p_path)) >= sizeof(to.p_path))
 		errx(1, "%s: name too long", target);
-	(void)strcpy(to.p_path, target);
 	to.p_end = to.p_path + strlen(to.p_path);
        if (to.p_path == to.p_end) {
 		*to.p_end++ = '.';
@@ -318,7 +311,7 @@ copy(argv, type, fts_options)
 			if (*p != '/' && target_mid[-1] != '/')
 				*target_mid++ = '/';
 			*target_mid = 0;
-			if (target_mid - to.p_path + nlen > MAXPATHLEN) {
+			if (target_mid - to.p_path + nlen >= PATH_MAX) {
 				warnx("%s%s: name too long (not copied)",
 				    to.p_path, p);
 				badcp = rval = 1;
@@ -37,12 +37,11 @@
 typedef struct {
 	char *p_end;			/* pointer to NULL at end of path */
 	char *target_end;               /* pointer to end of target base */
-	char p_path[MAXPATHLEN + 1];	/* pointer to the start of a path */
+	char p_path[PATH_MAX];		/* pointer to the start of a path */
 } PATH_T;

 extern PATH_T to;
-extern uid_t myuid;
-extern int iflag, pflag, fflag, vflag, myumask;
+extern int iflag, pflag, fflag, vflag;

 #include <sys/cdefs.h>

@@ -50,7 +50,9 @@ static const char rcsid[] =
 #include <errno.h>
 #include <fcntl.h>
 #include <fts.h>
+#include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sysexits.h>
 #include <unistd.h>

@@ -62,7 +64,7 @@ copy_file(entp, dne)
 	int dne;
 {
 	static char buf[MAXBSIZE];
-	struct stat to_stat, *fs;
+	struct stat *fs;
 	int ch, checkch, from_fd, rcount, rval, to_fd, wcount, wresid;
 	char *bufp;
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
@@ -179,22 +181,6 @@ copy_file(entp, dne)

 	if (pflag && setfile(fs, to_fd))
 		rval = 1;
-	/*
-	 * If the source was setuid or setgid, lose the bits unless the
-	 * copy is owned by the same user and group.
-	 */
-#define	RETAINBITS \
-	(S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)
-	else if (fs->st_mode & (S_ISUID | S_ISGID) && fs->st_uid == myuid) {
-		if (fstat(to_fd, &to_stat)) {
-			warn("%s", to.p_path);
-			rval = 1;
-		} else if (fs->st_gid == to_stat.st_gid &&
-		    fchmod(to_fd, fs->st_mode & RETAINBITS & ~myumask)) {
-			warn("%s", to.p_path);
-			rval = 1;
-		}
-	}
 	(void)close(from_fd);
 	if (close(to_fd)) {
 		warn("%s", to.p_path);
@@ -209,7 +195,7 @@ copy_link(p, exists)
 	int exists;
 {
 	int len;
-	char link[MAXPATHLEN];
+	char link[PATH_MAX];

 	if ((len = readlink(p->fts_path, link, sizeof(link) - 1)) == -1) {
 		warn("readlink: %s", p->fts_path);
@@ -259,6 +245,8 @@ copy_special(from_stat, exists)
 	return (pflag ? setfile(from_stat, 0) : 0);
 }

+#define	RETAINBITS \
+	(S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)

 int
 setfile(fs, fd)
@@ -29,7 +29,6 @@ SRCS+=	tc.alloc.c tc.bind.c tc.const.c tc.decls.h tc.disc.c \
 GENHDRS= ed.defns.h sh.err.h tc.const.h tc.defs.c
 SRCS+=	${GENHDRS}

-MAN1=	csh.1
 MLINKS= csh.1 tcsh.1
 # MLINKS for Shell built in commands for which there are no userland
 # utilities of the same name are handled with the associated manpage,
@@ -119,7 +119,7 @@ for it in the glossary.
 Acknowledgements
 .PP
 Numerous people have provided good input about previous versions
-of 
+of
 .I csh
 and aided in its debugging and in the debugging of its documentation.
 I would especially like to thank Michael Ubell
@@ -209,7 +209,7 @@ is to be read ``control-\fIx\fR'' and represents the striking of the \fIx\fR
 key while the control key is held down.)
 The mail program
 then echoed the characters `EOT' and transmitted our message.
-The characters `% ' were printed before and after the mail command 
+The characters `% ' were printed before and after the mail command
 by the shell to indicate that input was needed.
 .PP
 After typing the `% ' prompt the shell was reading command input from
@@ -292,7 +292,7 @@ rather than having a large number of hard to remember options.
 .NH 2
 Output to files
 .PP
-Commands that normally read input or write output on the terminal 
+Commands that normally read input or write output on the terminal
 can also be executed with this input and/or output done to
 a file.
 .PP
@@ -679,7 +679,7 @@ beginning are treated specially.
 Neither `*' or `?' or the `[' `]' mechanism will match it.
 This prevents accidental matching of the filenames `.' and `..'
 in the working directory which have special meaning to the system,
-as well as other files such as 
+as well as other files such as
 .I \&.cshrc
 which are not normally
 visible.
@@ -732,7 +732,7 @@ as it is used less frequently.
 Quotation
 .PP
 We have already seen a number of metacharacters used by the shell.
-These metacharacters pose a problem in that we cannot use them directly 
+These metacharacters pose a problem in that we cannot use them directly
 as parts of words.
 Thus the command
 .DS
@@ -742,7 +742,7 @@ will not echo the character `*'.
 It will either echo an sorted list of filenames in the
 current
 .I "working directory,"
-or print the message `No match' if there are 
+or print the message `No match' if there are
 no files in the working directory.
 .PP
 The recommended mechanism for placing characters which are neither numbers,
@@ -826,7 +826,7 @@ The shell also terminates when it gets an end-of-file printing `logout';
 \s-2UNIX\s0 then logs you off the system.
 Since this means that typing too many ^D's can accidentally log us off,
 the shell has a mechanism for preventing this.
-This 
+This
 .I ignoreeof
 option will be discussed in section 2.2.
 .PP
@@ -49,7 +49,7 @@ We will later see what kinds of commands are usefully placed there.
 For now we need not have this file and the shell does not complain about
 its absence.
 .PP
-A 
+A
 .I "login shell" ,
 executed after you login to the system,
 will, after it reads commands from
@@ -131,7 +131,7 @@ processing my
 .I \&.login
 file and begin reading commands from the terminal, prompting for each with
 `% '.
-When I log off (by giving the 
+When I log off (by giving the
 .I logout
 command) the shell
 will print `logout' and execute commands from the file `.logout'
@@ -328,11 +328,11 @@ main()
 	printf("hello);
 }
 % cc !$
-cc bug.c 
+cc bug.c
 "bug.c", line 4: newline in string or char constant
 "bug.c", line 5: syntax error
 % ed !$
-ed bug.c 
+ed bug.c
 29
 4s/);/"&/p
        printf("hello");
@@ -340,10 +340,10 @@ w
 30
 q
 % !c
-cc bug.c 
+cc bug.c
 % a.out
 hello% !e
-ed bug.c 
+ed bug.c
 30
 4s/lo/lo\e\en/p
        printf("hello\en");
@@ -356,7 +356,7 @@ cc bug.c \-o bug
 a.out: 2784+364+1028 = 4176b = 0x1050b
 bug: 2784+364+1028 = 4176b = 0x1050b
 % ls \-l !*
-ls \-l a.out bug 
+ls \-l a.out bug
 \(mirwxr\(mixr\(mix 1 bill       3932 Dec 19 09:41 a.out
 \(mirwxr\(mixr\(mix 1 bill       3932 Dec 19 09:42 bug
 % bug
@@ -364,14 +364,14 @@ hello
 % num bug.c | spp
 spp: Command not found.
 % ^spp^ssp
-num bug.c | ssp 
+num bug.c | ssp
    1	main()
    3	{
    4		printf("hello\en");
    5	}
 % !! | lpr
 num bug.c | ssp | lpr
-% 
+%
 .DE
 .KE
 In this example we have a very simple C program which has a bug (or two)
@@ -645,7 +645,7 @@ EOT
 .DE
 If the job did not terminate normally the `Done' message might say
 something else like `Killed'.
-If you want the 
+If you want the
 terminations of background jobs to be reported at the time they occur
 (possibly interrupting the output of other foreground jobs), you can set
 the
@@ -770,7 +770,7 @@ job \- identified by a `\-' in the output of
 .I jobs.
 When the current job terminates, the previous job becomes the current job.
 When given, the argument is either `%\-' (indicating
-the previous job); `%#', where # is the job number; 
+the previous job); `%#', where # is the job number;
 `%pref' where pref is some unique prefix of the command name
 and arguments of one of the jobs; or `%?' followed by some string found
 in only one of the jobs.
@@ -859,7 +859,7 @@ text editor might take a long time.
 Stopped
 % bg
 [1] ed bigfile &
-% 
+%
 . . .  some foreground commands
 .ta 1.75i
 [1] Stopped (tty input)	ed bigfile
@@ -868,7 +868,7 @@ ed bigfile
 w
 120000
 q
-% 
+%
 .so tabs
 .DE
 So after the `s' command was issued, the `ed' job was stopped with ^Z
@@ -311,7 +311,7 @@ of the shell and some of its control structure follows:
 # already in ~/backup
 #
 set noglob
-foreach i ($argv) 
+foreach i ($argv)

        if ($i !~ *.c) continue  # not a .c file so do nothing

@@ -339,7 +339,7 @@ for each of the values given between `(' and `)' with the named
 variable, in this case `i' set to successive values in the list.
 Within this loop we may use the command
 .I break
-to stop executing the loop 
+to stop executing the loop
 and
 .I continue
 to prematurely terminate one iteration
@@ -50,22 +50,16 @@
 .Oo
 .Fl v
 .Sm off
-.Op Cm + | - Xo
+.Op Cm + | -
 .Ar val Op Ar ymwdHMS
-.Xc
 .Sm on
 .Oc
-.Ar ...\&
+.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
+.Op Oo Oo Oo Oo Ar cc Oc Ar yy Oc Ar mm Oc Ar dd Oc Ar HH
 .Ar MM Op Ar .ss
 .Sm on
 .Oc
@@ -145,7 +139,7 @@ Set the system's value for minutes west of
 .Tn GMT .
 .Ar minutes_west
 specifies the number of minutes returned in
-.Fa tz_minuteswest  
+.Fa tz_minuteswest
 by future calls to
 .Xr gettimeofday 2 .
 .It Fl u
@@ -153,9 +147,10 @@ Display or set the date in
 .Tn UTC
 (Coordinated Universal) time.
 .It Fl v
-Adjust the second, minute, hour, month day, week day,
-month or year according to
-.Ar val .  
+Adjust (i.e., take the current date and display the result of the
+adjustment; not actually set the date) the second, minute, hour, month
+day, week day, month or year according to
+.Ar val .
 If
 .Ar val
 is preceded with a plus or minus sign,
@@ -165,13 +160,11 @@ The date can be adjusted as many times as required using these flags.
 Flags are processed in the order given.
 .Pp
 When setting values
-.Pq rather than adjusting them ,
+(rather than adjusting them),
 seconds are in the range 0-59, minutes are in the range 0-59, hours are
 in the range 1-12, month days are in the range 1-31, week days are in the
-range 0-6
-.Pq Sun-Sat ,
-months are in the range 1-12
-.Pq Jan-Dec
+range 0-6 (Sun-Sat),
+months are in the range 1-12 (Jan-Dec)
 and years are in the range 80-38 or 1980-2038.
 .Pp
 If
@@ -190,11 +183,11 @@ must be used to specify which part of the date is to be adjusted.
 The week day or month may be specified using a name rather than a
 number.
 If a name is used with the plus
-.Pq or minus
+(or minus)
 sign, the date will be put forwards
-.Pq or backwards
+(or backwards)
 to the next
-.Pq previous
+(previous)
 date that matches the given week day or month.
 This will not adjust the date,
 if the given week day or month is the same as the current one.
@@ -212,13 +205,11 @@ the clock goes back at 02:00 to 01:00, using
 will be necessary to reach October 29, 2:30.
 .Pp
 When the date is adjusted to a specific value that doesn't actually exist
-.Po
-for example March 26, 1:30 BST 2000 in the Europe/London timezone
-.Pc ,
+(for example March 26, 1:30 BST 2000 in the Europe/London timezone),
 the date will be silently adjusted forwards in units of one hour until it
 reaches a valid time.
 When the date is adjusted to a specific value that occurs twice
-.Pq for example October 29, 1:30 2000 ,
+(for example October 29, 1:30 2000),
 the resulting timezone will be set so that the date matches the earlier of
 the two times.
 .Pp
@@ -230,7 +221,7 @@ An operand with a leading plus
 sign signals a user-defined format string
 which specifies the format in which to display the date and time.
 The format string may contain any of the conversion specifications
-described in the 
+described in the
 .Xr strftime 3
 manual page, as well as any arbitrary text.
 A newline
@@ -247,11 +238,11 @@ The canonical representation for setting the date and time is:
 .Bl -tag -width Ds -compact -offset indent
 .It Ar cc
 Century
-.Pq either 19 or 20
+(either 19 or 20)
 prepended to the abbreviated year.
 .It Ar yy
 Year in abbreviated form
-.Pq e.g. 89 for 1989, 06 for 2006 .
+(e.g. 89 for 1989, 06 for 2006).
 .It Ar mm
 Numeric month, a number from 1 to 12.
 .It Ar dd
@@ -262,7 +253,7 @@ Hour, a number from 0 to 23.
 Minutes, a number from 0 to 59.
 .It Ar ss
 Seconds, a number from 0 to 61
-.Pq 59 plus a maximum of two leap seconds .
+(59 plus a maximum of two leap seconds).
 .El
 .Pp
 Everything but the minutes is optional.
@@ -268,6 +268,9 @@ setthetime(fmt, p, jflag, nflag)
 		}
 	}

+	/* Let mktime() decide whether summer time is in effect. */
+	lt->tm_isdst = -1;
+
 	/* convert broken-down time to GMT clock time */
 	if ((tval = mktime(lt)) == -1)
 		errx(1, "nonexistent time");
@@ -300,7 +303,7 @@ static void
 usage()
 {
 	(void)fprintf(stderr, "%s\n%s\n",
-	    "usage: date [-nu] [-d dst] [-r seconds] [-t west] "
+	    "usage: date [-jnu] [-d dst] [-r seconds] [-t west] "
 	    "[-v[+|-]val[ymwdHMS]] ... ",
 	    "            "
 	    "[-f fmt date | [[[[[cc]yy]mm]dd]HH]MM[.ss]] [+format]");
@@ -147,7 +147,7 @@ loop:
 	if (!getsockopt(s,
 	    SOL_SOCKET, SO_ERROR, (char *)&err, &length) && err) {
 		if (err != ECONNREFUSED)
-			warn("send (delayed error)");
+			warnc(err, "send (delayed error)");
 		goto bad;
 	}

@@ -181,7 +181,9 @@ The value
 .Cm oldascii
 specifies the one used in historic
 .Tn AT&T
-and pre-4.3BSD-reno systems.
+and
+.No pre- Ns Bx 4.3 reno
+systems.
 .It Cm block
 Treats the input as a sequence of newline or end-of-file terminated variable
 length records independent of input and output block boundaries.
@@ -226,7 +228,9 @@ and
 .Cm oldibm
 are maps used in historic
 .Tn AT&T
-and pre-4.3BSD-reno systems.
+and
+.No pre- Ns Bx 4.3 reno
+systems.
 .It Cm lcase
 Transform uppercase characters into lowercase characters.
 .It Cm noerror
@@ -343,9 +347,7 @@ in the same format as the standard completion message and
 .Nm
 will exit.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success or >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr cp 1 ,
 .Xr mt 1 ,
@@ -87,7 +87,7 @@ const	u_char *ctab;		/* conversion table */

 int
 main(argc, argv)
-	int argc;
+	int argc __unused;
 	char *argv[];
 {
 	(void)setlocale(LC_CTYPE, "");
@@ -48,6 +48,8 @@ static const char rcsid[] =

 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
 #include <unistd.h>

 #include "dd.h"
@@ -88,7 +90,7 @@ summary()
 /* ARGSUSED */
 void
 summaryx(notused)
-	int notused;
+	int notused __unused;
 {
 	int save_errno = errno;

@@ -102,6 +104,6 @@ terminate(sig)
 	int sig;
 {

-	/* XXX exit() shouldn't call exit() from a signal handler. */
-	exit(sig == 0 ? 0 : 1);
+	summary();
+	_exit(sig == 0 ? 0 : 1);
 }
@@ -13,4 +13,6 @@ CFLAGS+= -I${MOUNT}
 DPADD=	${LIBM}
 LDADD=	-lm

+WARNS?=	2
+
 .include <bsd.prog.mk>
@@ -34,7 +34,7 @@
 .\"
 .Dd May 8, 1995
 .Dt DF 1
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm df
 .Nd display free disk space
@@ -44,7 +44,7 @@
 .Fl b | h | H | k |
 .Fl m | P
 .Oc
-.Op Fl ain
+.Op Fl ailn
 .Op Fl t Ar type
 .Op Ar file | filesystem ...
 .Sh DESCRIPTION
@@ -91,6 +91,8 @@ Use 1024-byte (1-Kbyte) blocks rather than the default.  Note that
 this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
+.It Fl l
+Only display information about locally-mounted filesystems.
 .It Fl m
 Use 1048576-byte (1-Mbyte) blocks rather than the default.  Note that
 this overrides the
@@ -106,7 +108,7 @@ When this option is specified,
 will not request new statistics from the filesystems, but will respond
 with the possibly stale statistics that were previously obtained.
 .It Fl P
-Use POSIX compliant output of 512-byte blocks rather than the default. 
+Use POSIX compliant output of 512-byte blocks rather than the default.
 Note that this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
@@ -54,6 +54,7 @@ static const char rcsid[] =
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
+#include <sys/sysctl.h>
 #include <ufs/ufs/ufsmount.h>

 #include <err.h>
@@ -95,14 +96,16 @@ typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t;

 int unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA };

-int	  checkvfsname __P((const char *, char **));
-char	**makevfslist __P((char *));
-long	  regetmntinfo __P((struct statfs **, long, char **));
+int	  main __P((int, char *[]));
 int	  bread __P((off_t, void *, int));
+int	  checkvfsname __P((const char *, char **));
+char	 *makenetvfslist __P((void));
+char	**makevfslist __P((char *));
 char	 *getmntpt __P((char *));
 void	  prthuman __P((struct statfs *, long));
 void	  prthumanval __P((double));
 void	  prtstat __P((struct statfs *, int));
+long	  regetmntinfo __P((struct statfs **, long, char **));
 int	  ufs_df __P((char *, int));
 unit_t	  unit_adjust __P((double *));
 void	  usage __P((void));
@@ -118,11 +121,11 @@ main(argc, argv)
 	struct stat stbuf;
 	struct statfs statfsbuf, *mntbuf;
 	long mntsize;
-	int ch, err, i, maxwidth, rv, width;
+	int ch, eno, i, maxwidth, rv, width;
 	char *mntpt, *mntpath, **vfslist;

 	vfslist = NULL;
-	while ((ch = getopt(argc, argv, "abgHhikmnPt:")) != -1)
+	while ((ch = getopt(argc, argv, "abgHhiklmnPt:")) != -1)
 		switch (ch) {
 		case 'a':
 			aflag = 1;
@@ -152,6 +155,11 @@ main(argc, argv)
 			putenv("BLOCKSIZE=1k");
 			hflag = 0;
 			break;
+		case 'l':
+			if (vfslist != NULL)
+				errx(1, "-l and -t are mutually exclusive.");
+			vfslist = makevfslist(makenetvfslist());
+			break;
 		case 'm':
 			putenv("BLOCKSIZE=1m");
 			hflag = 0;
@@ -199,7 +207,7 @@ main(argc, argv)

 	for (; *argv; argv++) {
 		if (stat(*argv, &stbuf) < 0) {
-			err = errno;
+			eno = errno;
 			if ((mntpt = getmntpt(*argv)) == 0) {
 				warn("%s", *argv);
 				rv = 1;
@@ -378,7 +386,7 @@ prtstat(sfsp, maxwidth)
 {
 	static long blocksize;
 	static int headerlen, timesthrough;
-	static char *header;
+	static const char *header;
 	long used, availblks, inodes;

 	if (maxwidth < 11)
@@ -445,7 +453,7 @@ ufs_df(file, maxwidth)
 {
 	struct statfs statfsbuf;
 	struct statfs *sfsp;
-	char *mntpt;
+	const char *mntpt;
 	static int synced;

 	if (synced++ == 0)
@@ -506,6 +514,52 @@ usage()
 {

 	(void)fprintf(stderr,
-	    "usage: df [-b | -H | -h | -k | -m | -P] [-ain] [-t type] [file | filesystem ...]\n");
+	    "usage: df [-b | -H | -h | -k | -m | -P] [-ailn] [-t type] [file | filesystem ...]\n");
 	exit(EX_USAGE);
 }
+
+char *makenetvfslist()
+{
+	char *str, *strptr, **listptr;
+	int mib[3], maxvfsconf, miblen, cnt=0, i;
+	struct ovfsconf *ptr;
+
+	mib[0] = CTL_VFS; mib[1] = VFS_GENERIC; mib[2] = VFS_MAXTYPENUM;
+	miblen=sizeof(maxvfsconf);
+	if (sysctl(mib, sizeof(mib)/sizeof(mib[0]), &maxvfsconf, &miblen, NULL, 0)) {
+		warnx("sysctl failed");
+		return (NULL);
+	}
+
+	if ((listptr=malloc(sizeof(char*) * maxvfsconf)) == NULL) {
+		warnx("malloc failed");
+		return (NULL);
+	}
+
+	for (ptr=getvfsent();ptr;ptr=getvfsent())
+		if (ptr->vfc_flags & VFCF_NETWORK) {
+			listptr[cnt++] = strdup (ptr->vfc_name);
+			if (! listptr[cnt-1]) {
+				warnx("malloc failed");
+				return (NULL);
+			}
+		}
+
+	if ((str = malloc(sizeof(char)*(32*cnt+cnt+2))) == NULL) {
+		warnx("malloc failed");
+		free(listptr);
+		return (NULL);
+	}
+
+	*str = 'n'; *(str+1) = 'o';
+	for (i = 0,strptr=str+2; i < cnt; i++,strptr++) {
+		strncpy (strptr, listptr[i], 32);
+		strptr+=strlen(listptr[i]);
+		*strptr=',';
+		free(listptr[i]);
+	}
+	*(--strptr) = NULL;
+
+	free(listptr);
+	return (str);
+}
@@ -2,4 +2,6 @@

 PROG=	domainname

+WARNS?=	2
+
 .include <bsd.prog.mk>
@@ -34,7 +34,7 @@
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
-.Os FreeBSD
+.Os
 .Sh NAME
 .Nm domainname
 .Nd set or print name of current YP/NIS domain
@@ -58,7 +58,7 @@ convenience.
 .Xr getdomainname 3
 .Sh HISTORY
 The
-.Nm 
+.Nm
 command appeared in
 .Fx
 1.1, based on a similar command in
@@ -53,6 +53,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>

+int main __P((int, char *[]));
 void usage __P((void));

 int
@@ -75,10 +76,10 @@ main(argc,argv)
 		usage();

 	if (*argv) {
-		if (setdomainname(*argv, strlen(*argv)))
+		if (setdomainname(*argv, (int)strlen(*argv)))
 			err(1, "setdomainname");
 	} else {
-		if (getdomainname(domainname, sizeof(domainname)))
+		if (getdomainname(domainname, (int)sizeof(domainname)))
 			err(1, "getdomainname");
 		(void)printf("%s\n", domainname);
 	}
@@ -3,4 +3,6 @@

 PROG=	echo

+WARNS?=	2
+
 .include <bsd.prog.mk>
@@ -72,9 +72,7 @@ Consult the
 .Xr builtin 1
 manual page.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr builtin 1 ,
 .Xr csh 1 ,
@@ -49,9 +49,11 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>

+int main __P((int, char *[]));
+
 int
 main(argc, argv)
-	int argc;
+	int argc __unused;
 	char *argv[];
 {
 	int nflag;
@@ -56,12 +56,6 @@ static char * const rcsid =
 #include "ed.h"


-/*
- * Define a divisor for rand() that yields a uniform distribution in the
- * range 0-255.
- */
-#define	RAND_DIV (((unsigned) RAND_MAX + 1) >> 8)
-
 /*
 * BSD and System V systems offer special library calls that do
 * block move_liness and fills, so if possible we take advantage of them
@@ -125,9 +119,8 @@ init_des_cipher()
 	MEMZERO(ivec, 8);

 	/* initialize the padding vector */
-	srand((unsigned) time((time_t *) 0));
 	for (i = 0; i < 8; i++)
-		CHAR(pvec, i) = (char) (rand()/RAND_DIV);
+		CHAR(pvec, i) = (char) (arc4random() % 256);
 #endif
 }

@@ -3,7 +3,6 @@
 .Dt ED 1
 .Os
 .Sh NAME
-.\" ed, red \- text editor
 .Nm ed ,
 .Nm red
 .Nd text editor
@@ -224,7 +223,7 @@ The next line.
 This is equivalent to
 .Em +1
 and may be repeated with cumulative effect.
-.It +n 
+.It +n
 The
 .Em n Ns th
 next line, where
@@ -434,7 +433,7 @@ However, most commands accept a print suffix, which is any of
 .Em p
 (print),
 .Em l
-(list) ,
+(list),
 or
 .Em n
 (enumerate),
@@ -526,7 +525,7 @@ and
 .Em V .
 A newline alone in
 .Ar command-list
-is equivalent to a 
+is equivalent to a
 .Em p
 command.
 .It (1,$)G/re/
@@ -535,7 +534,7 @@ Interactively edit the addressed lines matching a regular expression
 For each matching line,
 the line is printed,
 the current address is set,
-and the user is prompted to enter a 
+and the user is prompted to enter a
 .Ar command-list .
 At the end of the
 .Em G
@@ -571,17 +570,17 @@ Mark a line with a lower case letter
 The  line can then be addressed as
 .Em 'lc
 (i.e., a single quote followed by
-.Em lc
-) in subsequent commands.  The mark is not cleared until the line is
+.Em lc )
+in subsequent commands.  The mark is not cleared until the line is
 deleted or otherwise modified.
 .It (.,.)l
 Print the addressed lines unambiguously.
 If a single line fills for than one screen (as might be the case
-when viewing a binary file, for instance), a `--More--' 
-prompt is printed on the last line. 
+when viewing a binary file, for instance), a `--More--'
+prompt is printed on the last line.
 .Nm Ed
 waits until the RETURN key is pressed
-before displaying the next screen. 
+before displaying the next screen.
 The current address is set to the last line
 printed.
 .It (.,.)m(.)
@@ -871,7 +870,7 @@ printed with the
 .Em h
 (help) command.
 .Pp
-Since the 
+Since the
 .Em g
 (global) command  masks any errors from failed searches and substitutions,
 it can be used to perform conditional operations in scripts; e.g.,
@@ -900,7 +899,7 @@ results in an error.
 If the command is entered a second time, it succeeds,
 but any changes to the buffer are lost.
 .Sh HISTORY
-A
+An
 .Nm
 command appeared in
 Version 1 AT&T UNIX.
@@ -28,11 +28,9 @@
 * $FreeBSD$
 */

-#include <sys/param.h>		/* for MAXPATHLEN */
+#include <sys/param.h>
 #include <errno.h>
-#if defined(sun) || defined(__NetBSD__)
-# include <limits.h>
-#endif
+#include <limits.h>
 #include <regex.h>
 #include <signal.h>
 #include <stdio.h>
@@ -44,10 +42,6 @@
 #define EMOD		(-3)
 #define FATAL		(-4)

-#ifndef MAXPATHLEN
-# define MAXPATHLEN 255		/* _POSIX_PATH_MAX */
-#endif
-
 #define MINBUFSZ 512		/* minimum buffer size - must be > 0 */
 #define SE_MAX 30		/* max subexpressions in a regular expression */
 #ifdef INT_MAX
@@ -96,7 +96,7 @@ int scripted = 0;		/* if set, suppress diagnostics */
 int sigflags = 0;		/* if set, signals received while mutex set */
 int sigactive = 0;		/* if set, signal handlers are enabled */

-char old_filename[MAXPATHLEN + 1] = "";	/* default filename */
+char old_filename[PATH_MAX] = "";	/* default filename */
 long current_addr;		/* current address in editor buffer */
 long addr_last;			/* last address in editor buffer */
 int lineno;			/* script line number */
@@ -948,9 +948,10 @@ get_filename()
 			ibufp++;
 			if ((n = get_shell_command()) < 0)
 				return NULL;
-			if (n) printf("%s\n", shcmd + 1);
+			if (n)
+				printf("%s\n", shcmd + 1);
 			return shcmd;
-		} else if (n - 1 > MAXPATHLEN) {
+		} else if (n > PATH_MAX - 1) {
 			sprintf(errmsg, "filename too long");
 			return  NULL;
 		}
@@ -961,7 +962,7 @@ get_filename()
 		return  NULL;
 	}
 #endif
-	REALLOC(file, filesz, MAXPATHLEN + 1, NULL);
+	REALLOC(file, filesz, PATH_MAX, NULL);
 	for (n = 0; *ibufp != '\n';)
 		file[n++] = *ibufp++;
 	file[n] = '\0';
@@ -1338,7 +1339,7 @@ has_trailing_escape(s, t)
 }


-/* strip_escapes: return copy of escaped string of at most length MAXPATHLEN */
+/* strip_escapes: return copy of escaped string of at most length PATH_MAX */
 char *
 strip_escapes(s)
 	char *s;
@@ -1348,7 +1349,7 @@ strip_escapes(s)

 	int i = 0;

-	REALLOC(file, filesz, MAXPATHLEN + 1, NULL);
+	REALLOC(file, filesz, PATH_MAX, NULL);
 	while (i < filesz - 1	/* Worry about a possible trailing escape */
 	       && (file[i++] = (*s == '\\') ? *++s : *s))
 		s++;
@@ -1391,7 +1392,7 @@ handle_hup(signo)
 	sigflags &= ~(1 << (signo - 1));
 	if (addr_last && write_file("ed.hup", "w", 1, addr_last) < 0 &&
 	    (s = getenv("HOME")) != NULL &&
-	    (n = strlen(s)) + 8 <= MAXPATHLEN &&	/* "ed.hup" + '/' */
+	    (n = strlen(s)) + 8 <= PATH_MAX &&	/* "ed.hup" + '/' */
 	    (hup = (char *) malloc(n + 10)) != NULL) {
 		strcpy(hup, s);
 		if (hup[n - 1] != '/')
@@ -40,7 +40,7 @@ static char * const rcsid =

 extern int patlock;

-char errmsg[MAXPATHLEN + 40] = "";
+char errmsg[PATH_MAX + 40] = "";

 /* get_compiled_pattern: return pointer to compiled pattern from command
   buffer */
@@ -3,5 +3,6 @@
 PROG=	expr
 SRCS=	expr.y
 YFLAGS=
+WARNS?=	2

 .include <bsd.prog.mk>
@@ -42,7 +42,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility evaluates 
+utility evaluates
 .Ar expression
 and writes the result on standard output.
 .Pp
@@ -55,8 +55,8 @@ Operators are listed below in order of increasing precedence.
 Operators with equal precedence are grouped within { } symbols.
 .Bl -tag -width indent
 .It Ar expr1 Li | Ar expr2
-Return the evaluation of 
-.Ar expr1 
+Return the evaluation of
+.Ar expr1
 if it is neither an empty string nor zero;
 otherwise, returns the evaluation of
 .Ar expr2 .
@@ -66,7 +66,7 @@ Return the evaluation of
 if neither expression evaluates to an empty string or zero;
 otherwise, returns zero.
 .It Ar expr1 Li "{=, >, >=, <, <=, !=}" Ar expr2
-Return the results of integer comparison if both arguments are integers; 
+Return the results of integer comparison if both arguments are integers;
 otherwise, returns the results of string comparison using the locale-specific
 collation sequence.
 The result of each comparison is 1 if the specified relation is true,
@@ -76,23 +76,23 @@ Return the results of addition or subtraction of integer-valued arguments.
 .It Ar expr1 Li "{*, /, %}" Ar expr2
 Return the results of multiplication, integer division, or remainder of integer-valued arguments.
 .It Ar expr1 Li : Ar expr2
-The 
+The
 .Dq \&:
-operator matches 
-.Ar expr1 
-against 
+operator matches
+.Ar expr1
+against
 .Ar expr2 ,
 which must be a regular expression.  The regular expression is anchored
-to the beginning of  the string with an implicit 
+to the beginning of  the string with an implicit
 .Dq ^ .
 .Pp
 If the match succeeds and the pattern contains at least one regular
-expression subexpression 
-.Dq "\e(...\e)" , 
-the string corresponding to 
+expression subexpression
+.Dq "\e(...\e)" ,
+the string corresponding to
 .Dq "\e1"
 is returned;
-otherwise the matching operator returns the number of characters matched. 
+otherwise the matching operator returns the number of characters matched.
 If the match fails and the pattern contains a regular expression subexpression
 the null string is returned;
 otherwise 0.
@@ -101,7 +101,7 @@ otherwise 0.
 Parentheses are used for grouping in the usual manner.
 .Sh EXAMPLES
 .Bl -enum
-.It 
+.It
 The following example adds one to the variable a.
 .Dl a=`expr $a + 1`
 .It
@@ -31,20 +31,36 @@ struct val {
 } ;

 struct val *result;
-struct val *op_or ();
-struct val *op_and ();
-struct val *op_eq ();
-struct val *op_gt ();
-struct val *op_lt ();
-struct val *op_ge ();
-struct val *op_le ();
-struct val *op_ne ();
-struct val *op_plus ();
-struct val *op_minus ();
-struct val *op_times ();
-struct val *op_div ();
-struct val *op_rem ();
-struct val *op_colon ();
+
+int		chk_div __P((quad_t, quad_t));
+int		chk_minus __P((quad_t, quad_t, quad_t));
+int		chk_plus __P((quad_t, quad_t, quad_t));
+int		chk_times __P((quad_t, quad_t, quad_t));
+void		free_value __P((struct val *));
+int		is_zero_or_null __P((struct val *));
+int		isstring __P((struct val *));
+int		main __P((int, char **));
+struct val	*make_integer __P((quad_t));
+struct val	*make_str __P((const char *));
+struct val	*op_and __P((struct val *, struct val *));
+struct val	*op_colon __P((struct val *, struct val *));
+struct val	*op_div __P((struct val *, struct val *));
+struct val	*op_eq __P((struct val *, struct val *));
+struct val	*op_ge __P((struct val *, struct val *));
+struct val	*op_gt __P((struct val *, struct val *));
+struct val	*op_le __P((struct val *, struct val *));
+struct val	*op_lt __P((struct val *, struct val *));
+struct val	*op_minus __P((struct val *, struct val *));
+struct val	*op_ne __P((struct val *, struct val *));
+struct val	*op_or __P((struct val *, struct val *));
+struct val	*op_plus __P((struct val *, struct val *));
+struct val	*op_rem __P((struct val *, struct val *));
+struct val	*op_times __P((struct val *, struct val *));
+quad_t		to_integer __P((struct val *));
+void		to_string __P((struct val *));
+int		yyerror __P((const char *));
+int		yylex __P((void));
+int		yyparse __P((void));

 char **av;
 %}
@@ -107,10 +123,11 @@ quad_t i;

 struct val *
 make_str (s)
-char *s;
+const char *s;
 {
 	struct val *vp;
-	int i, isint;
+	size_t i;
+	int isint;

 	vp = (struct val *) malloc (sizeof (*vp));
 	if (vp == NULL || ((vp->u.s = strdup (s)) == NULL)) {
@@ -176,12 +193,12 @@ struct val *vp;
 	if (vp->type == string || vp->type == numeric_string)
 		return;

-	tmp = malloc (25);
+	tmp = malloc ((size_t)25);
 	if (tmp == NULL) {
 		errx (2, "malloc() failed");
 	}

-	sprintf (tmp, "%qd", vp->u.i);
+	sprintf (tmp, "%lld", (long long)vp->u.i);
 	vp->type = string;
 	vp->u.s  = tmp;
 }
@@ -233,11 +250,9 @@ struct val *vp;
 	/* NOTREACHED */
 }

-int yyparse ();
-
 int
 main (argc, argv)
-int argc;
+int argc __unused;
 char **argv;
 {
 	setlocale (LC_ALL, "");
@@ -247,7 +262,7 @@ char **argv;
 	yyparse ();

 	if (result->type == integer)
-		printf ("%qd\n", result->u.i);
+		printf ("%lld\n", (long long)result->u.i);
 	else
 		printf ("%s\n", result->u.s);

@@ -256,7 +271,7 @@ char **argv;

 int
 yyerror (s)
-char *s;
+const char *s __unused;
 {
 	errx (2, "syntax error");
 }
@@ -515,8 +530,8 @@ struct val *a, *b;
 }

 int
-chk_div (a, b, r)
-quad_t a, b, r;
+chk_div (a, b)
+quad_t a, b;
 {
 	/* div by zero has been taken care of before */
 	/* only QUAD_MIN / -1 causes overflow */
@@ -541,7 +556,7 @@ struct val *a, *b;
 	}

 	r = make_integer (/*(quad_t)*/(a->u.i / b->u.i));
-	if (chk_div (a->u.i, b->u.i, r->u.i)) {
+	if (chk_div (a->u.i, b->u.i)) {
 		errx (2, "overflow");
 	}
 	free_value (a);
@@ -592,7 +607,7 @@ struct val *a, *b;

 	/* compare string against pattern */
 	/* remember that patterns are anchored to the beginning of the line */
-	if (regexec(&rp, a->u.s, 2, rm, 0) == 0 && rm[0].rm_so == 0) {
+	if (regexec(&rp, a->u.s, (size_t)2, rm, 0) == 0 && rm[0].rm_so == 0) {
 		if (rm[1].rm_so >= 0) {
 			*(a->u.s + rm[1].rm_eo) = '\0';
 			v = make_str (a->u.s + rm[1].rm_so);
@@ -3,4 +3,6 @@

 PROG=	hostname

+WARNS?=	2
+
 .include <bsd.prog.mk>
@@ -34,7 +34,7 @@
 .\"
 .Dd April 28, 1995
 .Dt HOSTNAME 1
-.Os BSD 4.2
+.Os
 .Sh NAME
 .Nm hostname
 .Nd set or print name of current host system
@@ -62,7 +62,7 @@ Trim off any domain information from the printed
 name.
 .El
 .Sh SEE ALSO
-.Xr gethostname 3 , 
+.Xr gethostname 3 ,
 .Xr rc.conf 5
 .Sh HISTORY
 The
@@ -53,6 +53,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>

+int main __P((int, char *[]));
 void usage __P((void));

 int
@@ -80,10 +81,10 @@ main(argc,argv)
 		usage();

 	if (*argv) {
-		if (sethostname(*argv, strlen(*argv)))
+		if (sethostname(*argv, (int)strlen(*argv)))
 			err(1, "sethostname");
 	} else {
-		if (gethostname(hostname, sizeof(hostname)))
+		if (gethostname(hostname, (int)sizeof(hostname)))
 			err(1, "gethostname");
 		if (sflag && (p = strchr(hostname, '.')))
 			*p = '\0';
@@ -3,4 +3,6 @@

 PROG=	kill

+WARNS?=	2
+
 .include <bsd.prog.mk>
@@ -53,6 +53,7 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>

+int main __P((int, char *[]));
 void nosig __P((char *));
 void printsignals __P((FILE *));
 int signame_to_signum __P((char *));
@@ -144,7 +145,7 @@ signame_to_signum(sig)
 {
 	int n;

-	if (!strncasecmp(sig, "sig", 3))
+	if (!strncasecmp(sig, "sig", (size_t)3))
 		sig += 3;
 	for (n = 1; n < NSIG; n++) {
 		if (!strcasecmp(sys_signame[n], sig))
@@ -2,10 +2,11 @@
 # $FreeBSD$

 PROG=	ln
-MAN1=	ln.1
-MAN7=	symlink.7
+MAN=	ln.1 symlink.7

 LINKS=	${BINDIR}/ln ${BINDIR}/link
 MLINKS=	ln.1 link.1

+CFLAGS?=	2
+
 .include <bsd.prog.mk>
@@ -37,18 +37,18 @@
 .\"
 .Dd December 30, 1993
 .Dt LN 1
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm ln ,
 .Nm link
 .Nd make links
 .Sh SYNOPSIS
 .Nm
-.Op Fl fisv
+.Op Fl fhinsv
 .Ar source_file
 .Op target_file
 .Nm
-.Op Fl fisv
+.Op Fl fhinsv
 .Ar source_file ...
 .Op target_dir
 .Nm link
@@ -79,12 +79,20 @@ then unlink it so that the link may occur.
 option overrides any previous
 .Fl i
 options.)
+.It Fl h
+If the
+.Ar target_file
+or
+.Ar target_dir
+is a symbolic link, do not follow it.  This is most useful with the
+.Fl f
+option, to replace a symlink which may point to a directory.
 .It Fl i
 Cause
 .Nm
 to write a prompt to standard error if the target file exists.
 If the response from the standard input begins with the character
-.Sq Li y 
+.Sq Li y
 or
 .Sq Li Y ,
 then unlink the target file so that the link may occur.
@@ -94,6 +102,12 @@ Otherwise, do not attempt the link.
 option overrides any previous
 .Fl f
 options.)
+.It Fl n
+Same as
+.Fl h ,
+for compatibility with other
+.Nm
+implementations.
 .It Fl s
 Create a symbolic link.
 .It Fl v
@@ -163,17 +177,28 @@ operation using the two passed arguments.
 .Xr symlink 2 ,
 .Xr symlink 7
 .Sh COMPATIBILITY
-The 
-.Fl i
+The
+.Fl h ,
+.Fl i ,
+.Fl n
 and
 .Fl v
 options are non-standard and their use in scripts is not recommended.
+They are provided solely for compatibility with other
+.Nm
+implementations.
+.Sh STANDARDS
+The
+.Nm
+utility conforms to
+.St -p1003.2-92 .
+.Pp
+The simplified
+.Nm link
+command conforms to
+.St -susv2 .
 .Sh HISTORY
 An
 .Nm
 command appeared in
 .At v1 .
-The simplified
-.Nm link
-command conforms to
-.St -susv2 .
@@ -50,12 +50,14 @@ static const char rcsid[] =

 #include <err.h>
 #include <errno.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

 int	fflag;				/* Unlink existing files. */
+int	hflag;				/* Check new name for symlink first. */
 int	iflag;				/* Interactive mode. */
 int	sflag;				/* Symbolic, not hard, link. */
 int	vflag;				/* Verbose output. */
@@ -63,7 +65,8 @@ int	vflag;				/* Verbose output. */
 int (*linkf) __P((const char *, const char *));
 char	linkch;

-int	linkit __P((char *, char *, int));
+int	linkit __P((const char *, const char *, int));
+int	main __P((int, char *[]));
 void	usage __P((void));

 int
@@ -72,8 +75,8 @@ main(argc, argv)
 	char *argv[];
 {
 	struct stat sb;
-	int ch, exitval;
 	char *p, *sourcedir;
+	int ch, exitval;

 	/*
 	 * Test for the special case where the utility is called as
@@ -92,12 +95,16 @@ main(argc, argv)
 			usage();
 	}

-	while ((ch = getopt(argc, argv, "fisv")) != -1)
+	while ((ch = getopt(argc, argv, "fhinsv")) != -1)
 		switch (ch) {
 		case 'f':
 			fflag = 1;
 			iflag = 0;
 			break;
+		case 'h':
+		case 'n':
+			hflag = 1;
+			break;
 		case 'i':
 			iflag = 1;
 			fflag = 0;
@@ -122,6 +129,7 @@ main(argc, argv)
 	switch(argc) {
 	case 0:
 		usage();
+		/* NOTREACHED */
 	case 1:				/* ln target */
 		exit(linkit(argv[0], ".", 1));
 	case 2:				/* ln target source */
@@ -129,6 +137,14 @@ main(argc, argv)
 	}
 					/* ln target1 target2 directory */
 	sourcedir = argv[argc - 1];
+	if (hflag && lstat(sourcedir, &sb) == 0 && S_ISLNK(sb.st_mode)) {
+		/*
+		 * We were asked not to follow symlinks, but found one at
+		 * the target--simulate "not a directory" error
+		 */
+		errno = ENOTDIR;
+		err(1, "%s", sourcedir);
+	}
 	if (stat(sourcedir, &sb))
 		err(1, "%s", sourcedir);
 	if (!S_ISDIR(sb.st_mode))
@@ -140,12 +156,13 @@ main(argc, argv)

 int
 linkit(target, source, isdir)
-	char *target, *source;
+	const char *target, *source;
 	int isdir;
 {
 	struct stat sb;
+	const char *p;
 	int ch, exists, first;
-	char *p, path[MAXPATHLEN];
+	char path[PATH_MAX];

 	if (!sflag) {
 		/* If target doesn't exist, quit now. */
@@ -161,18 +178,22 @@ linkit(target, source, isdir)
 		}
 	}

-	/* If the source is a directory, append the target's name. */
-	if (isdir || ((exists = !stat(source, &sb)) && S_ISDIR(sb.st_mode))) {
+	/*
+	 * If the source is a directory (and not a symlink if hflag),
+	 * append the target's name.
+	 */
+	if (isdir ||
+	    (lstat(source, &sb) == 0 && S_ISDIR(sb.st_mode)) ||
+	    (!hflag && stat(source, &sb) == 0 && S_ISDIR(sb.st_mode))) {
 		if ((p = strrchr(target, '/')) == NULL)
 			p = target;
 		else
 			++p;
 		(void)snprintf(path, sizeof(path), "%s/%s", source, p);
 		source = path;
-		exists = !lstat(source, &sb);
-	} else
-		exists = !lstat(source, &sb);
+	}

+	exists = !lstat(source, &sb);
 	/*
 	 * If the file exists, then unlink it forcibly if -f was specified
 	 * and interactively if -i was specified.
@@ -214,8 +235,8 @@ void
 usage()
 {
 	(void)fprintf(stderr, "%s\n%s\n%s\n",
-	    "usage: ln [-fisv] file1 file2",
-	    "       ln [-fisv] file ... directory",
+	    "usage: ln [-fhinsv] file1 file2",
+	    "       ln [-fhinsv] file ... directory",
 	    "       link file1 file2");
 	exit(1);
 }
@@ -34,7 +34,7 @@
 .\"
 .Dd March 31, 1994
 .Dt SYMLINK 7
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm symlink
 .Nd symbolic link handling
@@ -135,7 +135,9 @@ permissions, are not used by the system and cannot be changed.
 .Pp
 The
 .Bx 4.4
-system differs from historical 4BSD systems in that the system call
+system differs from historical
+.Bx 4
+systems in that the system call
 .Xr chown 2
 has been changed to follow symbolic links.
 The
@@ -149,7 +151,7 @@ name arguments, to commands which are not traversing a file tree.
 .Pp
 Except as noted below, commands follow symbolic links named as command
 line arguments.
-For example, if there were a symbolic link 
+For example, if there were a symbolic link
 .Dq Li slink
 which pointed to a file named
 .Dq Li afile ,
@@ -230,7 +232,7 @@ command is also an exception to this rule.
 The
 .Xr file 1
 command does not follow symbolic links named as argument by default.
-The 
+The
 .Xr file 1
 command does follow symbolic links named as argument if
 .Fl L
@@ -238,7 +240,9 @@ option is specified.
 .Pp
 The
 .Bx 4.4
-system differs from historical 4BSD systems in that the
+system differs from historical
+.Bx 4
+systems in that the
 .Nm chown
 and
 .Nm chgrp
@@ -303,7 +307,7 @@ walk (where symbolic links referencing directories are followed).
 As consistently as possible, you can make commands doing a file tree
 walk follow any symbolic links named on the command line, regardless
 of the type of file they reference, by specifying the
-.Fl H 
+.Fl H
 (for
 .Dq half\-logical )
 flag.
@@ -126,7 +126,7 @@ Display whiteouts when scanning directories.
 Include directory entries whose names begin with a
 dot (.).
 .It Fl b
-As 
+As
 .Fl B ,
 but use C escape codes whenever possible.
 .It Fl c
@@ -137,7 +137,7 @@ Directories are listed as plain files (not searched recursively).
 Output is not sorted.
 .It Fl g
 This option is deprecated and is only available for compatibility
-with 
+with
 .Bx 4.3 ;
 it was used to display the group name in the long
 .Pq Fl l
@@ -145,7 +145,7 @@ format output.
 .It Fl i
 For each file, print the file's file serial number (inode number).
 .It Fl k
-If the 
+If the
 .Fl s
 option is specified, print the file size allocation in kilobytes,
 not blocks.  This option overrides the environment variable BLOCKSIZE.
@@ -358,10 +358,23 @@ or
 .Xr sticky 8 . )
 .El
 .El
-.Sh DIAGNOSTICS
-The
+.Sh EXAMPLES
+The following is how to do an
 .Nm
-utility exits 0 on success, and >0 if an error occurs.
+listing sorted by size (and shows why
+.Nm
+does not need a separate option for this):
+.Pp
+.Dl "ls -l | sort -n +4"
+.Pp
+Additionally, the
+.Fl r
+flag to
+.Xr sort 1
+may be used
+to get the results sorted from largest to smallest (a reverse sort).
+.Sh DIAGNOSTICS
+.Ex -std
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
 .Nm :
@@ -389,12 +402,12 @@ capabilities.
 The default
 .Dq cons25
 console has the proper capabilities,
-however if you want to display the colors in an
-.Xr xterm 1
+but to display the colors in an
+.Xr xterm 1 ,
 for example,
-you need to set your
+the
 .Ev TERM
-variable to
+variable must be set to
 .Dq xterm-color .
 Other terminal types may require similar adjustments.  Colorization
 is silently disabled if the output isn't directed to a terminal
@@ -467,7 +480,7 @@ Note that the above are standard
 .Tn ANSI
 colors.
 The actual display may differ
-depending on the color capabilities of your terminal.
+depending on the color capabilities of the terminal in use.
 .Pp
 The order of the attributes are as follows:
 .Pp
@@ -525,6 +538,7 @@ specification.
 .Sh SEE ALSO
 .Xr chflags 1 ,
 .Xr chmod 1 ,
+.Xr sort 1 ,
 .Xr xterm 1 ,
 .Xr termcap 5 ,
 .Xr symlink 7 ,
@@ -2,5 +2,6 @@
 # $FreeBSD$

 PROG=	mkdir
+WARNS?=	2

 .include <bsd.prog.mk>
@@ -73,6 +73,8 @@ are interpreted relative to an initial mode of
 Create intermediate directories as required.
 If this option is not specified, the full path prefix of each
 operand must already exist.
+On the other hand, with this option specified, no error will
+be reported if a directory given as an operand already exists.
 Intermediate directories are created with permission bits of
 .Li rwxrwxrwx (\&0777)
 as modified by the current umask, plus write and search
@@ -83,9 +85,7 @@ Be verbose when creating directories, listing them as they are created.
 .Pp
 The user must have write permission in the parent directory.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr rmdir 1
 .Sh COMPATIBILITY
@@ -58,6 +58,7 @@ static const char rcsid[] =
 #include <unistd.h>

 int	build __P((char *, mode_t));
+int	main __P((int, char *[]));
 void	usage __P((void));

 int vflag;
@@ -2,5 +2,6 @@
 # $FreeBSD$

 PROG=	mv
+WARNS?=	2

 .include <bsd.prog.mk>
@@ -88,7 +88,7 @@ Cause
 to write a prompt to standard error before moving a file that would
 overwrite an existing file.
 If the response from the standard input begins with the character
-.Sq Li y 
+.Sq Li y
 or
 .Sq Li Y ,
 the move is attempted.
@@ -129,9 +129,7 @@ rm -f destination_path && \e
 \trm -rf source_file
 .Ed
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr cp 1 ,
 .Xr rm 1 ,
@@ -57,6 +57,7 @@ static const char rcsid[] =
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -70,6 +71,7 @@ int fflg, iflg, vflg;
 int	copy __P((char *, char *));
 int	do_move __P((char *, char *));
 int	fastcopy __P((char *, char *, struct stat *));
+int	main __P((int, char *[]));
 void	usage __P((void));

 int
@@ -81,7 +83,7 @@ main(argc, argv)
 	register char *p, *endp;
 	struct stat sb;
 	int ch;
-	char path[MAXPATHLEN];
+	char path[PATH_MAX];

 	while ((ch = getopt(argc, argv, "fiv")) != -1)
 		switch (ch) {
@@ -136,11 +138,11 @@ main(argc, argv)
 		while (p != *argv && p[-1] != '/')
 			--p;

-		if ((baselen + (len = strlen(p))) >= MAXPATHLEN) {
+		if ((baselen + (len = strlen(p))) >= PATH_MAX) {
 			warnx("%s: destination pathname too long", *argv);
 			rval = 1;
 		} else {
-			memmove(endp, p, len + 1);
+			memmove(endp, p, (size_t)len + 1);
 			if (do_move(*argv, path))
 				rval = 1;
 		}
@@ -178,8 +180,8 @@ do_move(from, to)
 			strmode(sb.st_mode, modep);
 			(void)fprintf(stderr, "override %s%s%s/%s for %s? %s",
 			    modep + 1, modep[9] == ' ' ? "" : " ",
-			    user_from_uid(sb.st_uid, 0),
-			    group_from_gid(sb.st_gid, 0), to, YESNO);
+			    user_from_uid((unsigned long)sb.st_uid, 0),
+			    group_from_gid((unsigned long)sb.st_gid, 0), to, YESNO);
 			ask = 1;
 		}
 		if (ask) {
@@ -200,7 +202,7 @@ do_move(from, to)

 	if (errno == EXDEV) {
 		struct statfs sfs;
-		char path[MAXPATHLEN];
+		char path[PATH_MAX];

 		/* Can't mv(1) a mount point. */
 		if (realpath(from, path) == NULL) {
@@ -247,7 +249,7 @@ fastcopy(from, to, sbp)
 	if (blen < sbp->st_blksize) {
 		if (bp != NULL)
 			free(bp);
-		if ((bp = malloc(sbp->st_blksize)) == NULL) {
+		if ((bp = malloc((size_t)sbp->st_blksize)) == NULL) {
 			blen = 0;
 			warnx("malloc failed");
 			return (1);
@@ -262,8 +264,8 @@ fastcopy(from, to, sbp)
 		(void)close(from_fd);
 		return (1);
 	}
-	while ((nread = read(from_fd, bp, blen)) > 0)
-		if (write(to_fd, bp, nread) != nread) {
+	while ((nread = read(from_fd, bp, (size_t)blen)) > 0)
+		if (write(to_fd, bp, (size_t)nread) != nread) {
 			warn("%s", to);
 			goto err;
 		}
@@ -298,7 +300,7 @@ err:		if (unlink(to))
 	 * on a file that we copied, i.e., that we didn't create.)
 	 */
 	errno = 0;
-	if (fchflags(to_fd, sbp->st_flags))
+	if (fchflags(to_fd, (u_long)sbp->st_flags))
 		if (errno != EOPNOTSUPP || sbp->st_flags != 0)
 			warn("%s: set flags (was: 0%07o)", to, sbp->st_flags);

@@ -329,7 +331,8 @@ copy(from, to)
 	int pid, status;

 	if ((pid = fork()) == 0) {
-		execl(_PATH_CP, "mv", vflg ? "-PRpv" : "-PRp", from, to, NULL);
+		execl(_PATH_CP, "mv", vflg ? "-PRpv" : "-PRp", from, to,
+		    (char *)NULL);
 		warn("%s", _PATH_CP);
 		_exit(1);
 	}
@@ -347,7 +350,7 @@ copy(from, to)
 		return (1);
 	}
 	if (!(pid = vfork())) {
-		execl(_PATH_RM, "mv", "-rf", from, NULL);
+		execl(_PATH_RM, "mv", "-rf", from, (char *)NULL);
 		warn("%s", _PATH_RM);
 		_exit(1);
 	}
@@ -26,8 +26,11 @@
 # 		Pax may not compile if this not (un)defined properly.

 PROG=   pax
-SRCS=	ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c\
-	gen_subs.c options.c pat_rep.c pax.c sel_subs.c tables.c tar.c\
-	tty_subs.c
+SRCS=	ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \
+	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
+	tables.c tar.c tty_subs.c
+#XXX NOTYET
+#MAN=	pax.1 tar.1 cpio.1
+#LINKS=	${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio

 .include <bsd.prog.mk>
@@ -44,17 +44,20 @@ static const char rcsid[] =
 #endif /* not lint */

 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/mtio.h>
-#include <signal.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <err.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include "pax.h"
+#include "options.h"
 #include "extern.h"

 /*
@@ -78,10 +81,13 @@ static struct stat arsb;		/* stat of archive device at open */
 static int invld_rec;			/* tape has out of spec record size */
 static int wr_trail = 1;		/* trailer was rewritten in append */
 static int can_unlnk = 0;		/* do we unlink null archives?  */
-char *arcname;                  	/* printable name of archive */
+char *arcname;		  	/* printable name of archive */
+const char *gzip_program;		/* name of gzip program */
+static pid_t zpid = -1;			/* pid of child process */

 static int get_phys __P((void));
 extern sigset_t s_mask;
+static void ar_start_gzip __P((int, const char *, int));

 /*
 * ar_open()
@@ -92,7 +98,7 @@ extern sigset_t s_mask;
 *	-1 on failure, 0 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ar_open(char *name)
 #else
@@ -101,7 +107,7 @@ ar_open(name)
 	char *name;
 #endif
 {
-        struct mtget mb;
+	struct mtget mb;

 	if (arfd != -1)
 		(void)close(arfd);
@@ -120,23 +126,27 @@ ar_open(name)
 			arfd = STDIN_FILENO;
 			arcname = STDN;
 		} else if ((arfd = open(name, EXT_MODE, DMOD)) < 0)
-			sys_warn(0, errno, "Failed open to read on %s", name);
+			syswarn(0, errno, "Failed open to read on %s", name);
+		if (arfd != -1 && gzip_program != NULL)
+			ar_start_gzip(arfd, gzip_program, 0);
 		break;
 	case ARCHIVE:
 		if (name == NULL) {
 			arfd = STDOUT_FILENO;
 			arcname = STDO;
 		} else if ((arfd = open(name, AR_MODE, DMOD)) < 0)
-			sys_warn(0, errno, "Failed open to write on %s", name);
+			syswarn(0, errno, "Failed open to write on %s", name);
 		else
 			can_unlnk = 1;
+		if (arfd != -1 && gzip_program != NULL)
+			ar_start_gzip(arfd, gzip_program, 1);
 		break;
 	case APPND:
 		if (name == NULL) {
 			arfd = STDOUT_FILENO;
 			arcname = STDO;
 		} else if ((arfd = open(name, APP_MODE, DMOD)) < 0)
-			sys_warn(0, errno, "Failed open to read/write on %s",
+			syswarn(0, errno, "Failed open to read/write on %s",
 				name);
 		break;
 	case COPY:
@@ -150,18 +160,21 @@ ar_open(name)
 	if (arfd < 0)
 		return(-1);

+	if (chdname != NULL)
+		if (chdir(chdname) != 0)
+			syswarn(1, errno, "Failed chdir to %s", chdname);
 	/*
 	 * set up is based on device type
 	 */
 	if (fstat(arfd, &arsb) < 0) {
-		sys_warn(0, errno, "Failed stat on %s", arcname);
+		syswarn(0, errno, "Failed stat on %s", arcname);
 		(void)close(arfd);
 		arfd = -1;
 		can_unlnk = 0;
 		return(-1);
 	}
 	if (S_ISDIR(arsb.st_mode)) {
-		pax_warn(0, "Cannot write an archive on top of a directory %s",
+		paxwarn(0, "Cannot write an archive on top of a directory %s",
 		    arcname);
 		(void)close(arfd);
 		arfd = -1;
@@ -290,7 +303,7 @@ ar_open(name)
 * ar_close()
 *	closes archive device, increments volume number, and prints i/o summary
 */
-#if __STDC__
+#ifdef __STDC__
 void
 ar_close(void)
 #else
@@ -298,18 +311,12 @@ void
 ar_close()
 #endif
 {
-	FILE *outf;

 	if (arfd < 0) {
 		did_io = io_ok = flcnt = 0;
 		return;
 	}

-	if (act == LIST)
-		outf = stdout;
-	else
-		outf = stderr;
-
 	/*
 	 * Close archive file. This may take a LONG while on tapes (we may be
 	 * forced to wait for the rewind to complete) so tell the user what is
@@ -318,11 +325,11 @@ ar_close()
 	 */
 	if (vflag && (artyp == ISTAPE)) {
 		if (vfpart)
-			(void)putc('\n', outf);
-		(void)fprintf(outf,
+			(void)putc('\n', listf);
+		(void)fprintf(listf,
 			"%s: Waiting for tape drive close to complete...",
 			argv0);
-		(void)fflush(outf);
+		(void)fflush(listf);
 	}

 	/*
@@ -335,12 +342,22 @@ ar_close()
 		can_unlnk = 0;
 	}

+	/*
+	 * for a quick extract/list, pax frequently exits before the child
+	 * process is done
+	 */
+	if ((act == LIST || act == EXTRACT) && nflag && zpid > 0) {
+		int status;
+		kill(zpid, SIGINT);
+		waitpid(zpid, &status, 0);
+	}
+
 	(void)close(arfd);

 	if (vflag && (artyp == ISTAPE)) {
-		(void)fputs("done.\n", outf);
+		(void)fputs("done.\n", listf);
 		vfpart = 0;
-		(void)fflush(outf);
+		(void)fflush(listf);
 	}
 	arfd = -1;

@@ -366,7 +383,7 @@ ar_close()
 	 * Print out a summary of I/O for this archive volume.
 	 */
 	if (vfpart) {
-		(void)putc('\n', outf);
+		(void)putc('\n', listf);
 		vfpart = 0;
 	}

@@ -377,24 +394,27 @@ ar_close()
 	 */
 	if (frmt == NULL) {
 #	ifdef NET2_STAT
-		(void)fprintf(outf, "%s: unknown format, %lu bytes skipped.\n",
+		(void)fprintf(listf, "%s: unknown format, %lu bytes skipped.\n",
 #	else
-		(void)fprintf(outf, "%s: unknown format, %qu bytes skipped.\n",
+		(void)fprintf(listf, "%s: unknown format, %qu bytes skipped.\n",
 #	endif
 		    argv0, rdcnt);
-		(void)fflush(outf);
+		(void)fflush(listf);
 		flcnt = 0;
 		return;
 	}

-	(void)fprintf(outf,
+	if (strcmp(NM_CPIO, argv0) == 0)
+		(void)fprintf(listf, "%qu blocks\n", (rdcnt ? rdcnt : wrcnt) / 5120);
+	else if (strcmp(NM_TAR, argv0) != 0)
+		(void)fprintf(listf,
 #	ifdef NET2_STAT
-	    "%s: %s vol %d, %lu files, %lu bytes read, %lu bytes written.\n",
+		    "%s: %s vol %d, %lu files, %lu bytes read, %lu bytes written.\n",
 #	else
-	    "%s: %s vol %d, %lu files, %qu bytes read, %qu bytes written.\n",
+		    "%s: %s vol %d, %lu files, %qu bytes read, %qu bytes written.\n",
 #	endif
-	    argv0, frmt->name, arvol-1, flcnt, rdcnt, wrcnt);
-	(void)fflush(outf);
+		    argv0, frmt->name, arvol-1, flcnt, rdcnt, wrcnt);
+	(void)fflush(listf);
 	flcnt = 0;
 }

@@ -405,7 +425,7 @@ ar_close()
 *	other side of the pipe from getting a SIGPIPE (pax will stop
 *	reading an archive once a format dependent trailer is detected).
 */
-#if __STDC__
+#ifdef __STDC__
 void
 ar_drain(void)
 #else
@@ -442,7 +462,7 @@ ar_drain()
 *	0 if all ready to write, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ar_set_wr(void)
 #else
@@ -470,7 +490,7 @@ ar_set_wr()
 	 */
 	if (((cpos = lseek(arfd, (off_t)0L, SEEK_CUR)) < 0) ||
 	    (ftruncate(arfd, cpos) < 0)) {
-		sys_warn(1, errno, "Unable to truncate archive file");
+		syswarn(1, errno, "Unable to truncate archive file");
 		return(-1);
 	}
 	return(0);
@@ -485,7 +505,7 @@ ar_set_wr()
 *	0 if we can append, -1 otherwise.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ar_app_ok(void)
 #else
@@ -494,13 +514,13 @@ ar_app_ok()
 #endif
 {
 	if (artyp == ISPIPE) {
-		pax_warn(1, "Cannot append to an archive obtained from a pipe.");
+		paxwarn(1, "Cannot append to an archive obtained from a pipe.");
 		return(-1);
 	}

 	if (!invld_rec)
 		return(0);
-	pax_warn(1,"Cannot append, device record size %d does not support %s spec",
+	paxwarn(1,"Cannot append, device record size %d does not support %s spec",
 		rdblksz, argv0);
 	return(-1);
 }
@@ -514,7 +534,7 @@ ar_app_ok()
 *	Number of bytes in buffer. 0 for end of file, -1 for a read error.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ar_read(register char *buf, register int cnt)
 #else
@@ -587,9 +607,9 @@ ar_read(buf, cnt)
 	 */
 	lstrval = res;
 	if (res < 0)
-		sys_warn(1, errno, "Failed read on archive volume %d", arvol);
+		syswarn(1, errno, "Failed read on archive volume %d", arvol);
 	else
-		pax_warn(0, "End of archive volume %d reached", arvol);
+		paxwarn(0, "End of archive volume %d reached", arvol);
 	return(res);
 }

@@ -604,7 +624,7 @@ ar_read(buf, cnt)
 *	error in the archive occured.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ar_write(register char *buf, register int bsz)
 #else
@@ -668,7 +688,7 @@ ar_write(buf, bsz)
 		if (res >= 0)
 			break;
 		if (errno == EACCES) {
-			pax_warn(0, "Write failed, archive is write protected.");
+			paxwarn(0, "Write failed, archive is write protected.");
 			res = lstrval = 0;
 			return(0);
 		}
@@ -706,18 +726,18 @@ ar_write(buf, bsz)
 	 * must quit right away.
 	 */
 	if (!wr_trail && (res <= 0)) {
-		pax_warn(1,"Unable to append, trailer re-write failed. Quitting.");
+		paxwarn(1,"Unable to append, trailer re-write failed. Quitting.");
 		return(res);
 	}

 	if (res == 0)
-		pax_warn(0, "End of archive volume %d reached", arvol);
+		paxwarn(0, "End of archive volume %d reached", arvol);
 	else if (res < 0)
-		sys_warn(1, errno, "Failed write to archive volume: %d", arvol);
+		syswarn(1, errno, "Failed write to archive volume: %d", arvol);
 	else if (!frmt->blkalgn || ((res % frmt->blkalgn) == 0))
-		pax_warn(0,"WARNING: partial archive write. Archive MAY BE FLAWED");
+		paxwarn(0,"WARNING: partial archive write. Archive MAY BE FLAWED");
 	else
-		pax_warn(1,"WARNING: partial archive write. Archive IS FLAWED");
+		paxwarn(1,"WARNING: partial archive write. Archive IS FLAWED");
 	return(res);
 }

@@ -729,7 +749,7 @@ ar_write(buf, bsz)
 *	0 when ok to try i/o again, -1 otherwise.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ar_rdsync(void)
 #else
@@ -740,7 +760,7 @@ ar_rdsync()
 	long fsbz;
 	off_t cpos;
 	off_t mpos;
-        struct mtop mb;
+	struct mtop mb;

 	/*
 	 * Fail resync attempts at user request (done) or this is going to be
@@ -751,7 +771,7 @@ ar_rdsync()
 		return(-1);

 	if ((act == APPND) || (act == ARCHIVE)) {
-		pax_warn(1, "Cannot allow updates to an archive with flaws.");
+		paxwarn(1, "Cannot allow updates to an archive with flaws.");
 		return(-1);
 	}
 	if (io_ok)
@@ -803,10 +823,10 @@ ar_rdsync()
 		break;
 	}
 	if (lstrval <= 0) {
-		pax_warn(1, "Unable to recover from an archive read failure.");
+		paxwarn(1, "Unable to recover from an archive read failure.");
 		return(-1);
 	}
-	pax_warn(0, "Attempting to recover from an archive read failure.");
+	paxwarn(0, "Attempting to recover from an archive read failure.");
 	return(0);
 }

@@ -820,7 +840,7 @@ ar_rdsync()
 *	partial move (the amount moved is in skipped)
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ar_fow(off_t sksz, off_t *skipped)
 #else
@@ -870,7 +890,7 @@ ar_fow(sksz, skipped)
 		if (lseek(arfd, mpos, SEEK_SET) >= 0)
 			return(0);
 	}
-	sys_warn(1, errno, "Forward positioning operation on archive failed");
+	syswarn(1, errno, "Forward positioning operation on archive failed");
 	lstrval = -1;
 	return(-1);
 }
@@ -886,7 +906,7 @@ ar_fow(sksz, skipped)
 *	0 if moved the requested distance, -1 on complete failure
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ar_rev(off_t sksz)
 #else
@@ -896,7 +916,7 @@ ar_rev(sksz)
 #endif
 {
 	off_t cpos;
-        struct mtop mb;
+	struct mtop mb;
 	register int phyblk;

 	/*
@@ -912,7 +932,7 @@ ar_rev(sksz)
 		/*
 		 * cannot go backwards on these critters
 		 */
-		pax_warn(1, "Reverse positioning on pipes is not supported.");
+		paxwarn(1, "Reverse positioning on pipes is not supported.");
 		lstrval = -1;
 		return(-1);
 	case ISREG:
@@ -930,7 +950,7 @@ ar_rev(sksz)
 		 * First we figure out where we are in the archive.
 		 */
 		if ((cpos = lseek(arfd, (off_t)0L, SEEK_CUR)) < 0) {
-			sys_warn(1, errno,
+			syswarn(1, errno,
 			   "Unable to obtain current archive byte offset");
 			lstrval = -1;
 			return(-1);
@@ -948,14 +968,14 @@ ar_rev(sksz)
 				/*
 				 * this should never happen
 				 */
-				pax_warn(1,"Reverse position on previous volume.");
+				paxwarn(1,"Reverse position on previous volume.");
 				lstrval = -1;
 				return(-1);
 			}
 			cpos = (off_t)0L;
 		}
 		if (lseek(arfd, cpos, SEEK_SET) < 0) {
-			sys_warn(1, errno, "Unable to seek archive backwards");
+			syswarn(1, errno, "Unable to seek archive backwards");
 			lstrval = -1;
 			return(-1);
 		}
@@ -990,7 +1010,7 @@ ar_rev(sksz)
 		 * ok we have to move. Make sure the tape drive can do it.
 		 */
 		if (sksz % phyblk) {
-			pax_warn(1,
+			paxwarn(1,
 			    "Tape drive unable to backspace requested amount");
 			lstrval = -1;
 			return(-1);
@@ -1002,7 +1022,7 @@ ar_rev(sksz)
 		mb.mt_op = MTBSR;
 		mb.mt_count = sksz/phyblk;
 		if (ioctl(arfd, MTIOCTOP, &mb) < 0) {
-			sys_warn(1,errno, "Unable to backspace tape %d blocks.",
+			syswarn(1,errno, "Unable to backspace tape %d blocks.",
 			    mb.mt_count);
 			lstrval = -1;
 			return(-1);
@@ -1024,7 +1044,7 @@ ar_rev(sksz)
 *	physical block size if ok (ok > 0), -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 get_phys(void)
 #else
@@ -1050,7 +1070,7 @@ get_phys()
 		while ((res = read(arfd, scbuf, sizeof(scbuf))) > 0)
 			padsz += res;
 		if (res < 0) {
-			sys_warn(1, errno, "Unable to locate tape filemark.");
+			syswarn(1, errno, "Unable to locate tape filemark.");
 			return(-1);
 		}
 	}
@@ -1062,7 +1082,7 @@ get_phys()
 	mb.mt_op = MTBSF;
 	mb.mt_count = 1;
 	if (ioctl(arfd, MTIOCTOP, &mb) < 0) {
-		sys_warn(1, errno, "Unable to backspace over tape filemark.");
+		syswarn(1, errno, "Unable to backspace over tape filemark.");
 		return(-1);
 	}

@@ -1073,11 +1093,11 @@ get_phys()
 	mb.mt_op = MTBSR;
 	mb.mt_count = 1;
 	if (ioctl(arfd, MTIOCTOP, &mb) < 0) {
-		sys_warn(1, errno, "Unable to backspace over last tape block.");
+		syswarn(1, errno, "Unable to backspace over last tape block.");
 		return(-1);
 	}
 	if ((phyblk = read(arfd, scbuf, sizeof(scbuf))) <= 0) {
-		sys_warn(1, errno, "Cannot determine archive tape blocksize.");
+		syswarn(1, errno, "Cannot determine archive tape blocksize.");
 		return(-1);
 	}

@@ -1088,13 +1108,13 @@ get_phys()
 	while ((res = read(arfd, scbuf, sizeof(scbuf))) > 0)
 		;
 	if (res < 0) {
-		sys_warn(1, errno, "Unable to locate tape filemark.");
+		syswarn(1, errno, "Unable to locate tape filemark.");
 		return(-1);
 	}
 	mb.mt_op = MTBSF;
 	mb.mt_count = 1;
 	if (ioctl(arfd, MTIOCTOP, &mb) < 0) {
-		sys_warn(1, errno, "Unable to backspace over tape filemark.");
+		syswarn(1, errno, "Unable to backspace over tape filemark.");
 		return(-1);
 	}

@@ -1114,7 +1134,7 @@ get_phys()
 	 * never fail).
 	 */
 	if (padsz % phyblk) {
-		pax_warn(1, "Tape drive unable to backspace requested amount");
+		paxwarn(1, "Tape drive unable to backspace requested amount");
 		return(-1);
 	}

@@ -1125,7 +1145,7 @@ get_phys()
 	mb.mt_op = MTBSR;
 	mb.mt_count = padsz/phyblk;
 	if (ioctl(arfd, MTIOCTOP, &mb) < 0) {
-		sys_warn(1,errno,"Unable to backspace tape over %d pad blocks",
+		syswarn(1,errno,"Unable to backspace tape over %d pad blocks",
 		    mb.mt_count);
 		return(-1);
 	}
@@ -1142,7 +1162,7 @@ get_phys()
 *	0 when ready to continue, -1 when all done
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ar_next(void)
 #else
@@ -1160,12 +1180,12 @@ ar_next()
 	 * also be called via a signal handler, so we must prevent a race.
 	 */
 	if (sigprocmask(SIG_BLOCK, &s_mask, &o_mask) < 0)
-		sys_warn(0, errno, "Unable to set signal mask");
+		syswarn(0, errno, "Unable to set signal mask");
 	ar_close();
-	if (sigprocmask(SIG_SETMASK, &o_mask, (sigset_t *)NULL) < 0)
-		sys_warn(0, errno, "Unable to restore signal mask");
+	if (sigprocmask(SIG_SETMASK, &o_mask, NULL) < 0)
+		syswarn(0, errno, "Unable to restore signal mask");

-	if (done || !wr_trail)
+	if (done || !wr_trail || strcmp(NM_TAR, argv0) == 0)
 		return(-1);

 	tty_prnt("\nATTENTION! %s archive volume change required.\n", argv0);
@@ -1256,10 +1276,10 @@ ar_next()
 			tty_prnt("Empty file name, try again\n");
 			continue;
 		}
-                if (!strcmp(buf, "..")) {
-                        tty_prnt("Illegal file name: .. try again\n");
-                        continue;
-                }
+		if (!strcmp(buf, "..")) {
+			tty_prnt("Illegal file name: .. try again\n");
+			continue;
+		}
 		if (strlen(buf) > PAXPATHLEN) {
 			tty_prnt("File name too long, try again\n");
 			continue;
@@ -1276,7 +1296,7 @@ ar_next()
 			if ((arcname = strdup(buf)) == NULL) {
 				done = 1;
 				lstrval = -1;
-				pax_warn(0, "Cannot save archive name.");
+				paxwarn(0, "Cannot save archive name.");
 				return(-1);
 			}
 			freeit = 1;
@@ -1287,3 +1307,47 @@ ar_next()
 	}
 	return(0);
 }
+
+/*
+ * ar_start_gzip()
+ * starts the gzip compression/decompression process as a child, using magic
+ * to keep the fd the same in the calling function (parent).
+ */
+void
+ar_start_gzip(int fd, const char *gzip_program, int wr)
+{
+	int fds[2];
+	char *gzip_flags;
+
+	if (pipe(fds) < 0)
+		err(1, "could not pipe");
+	zpid = fork();
+	if (zpid < 0)
+		err(1, "could not fork");
+
+	/* parent */
+	if (zpid) {
+		if (wr)
+			dup2(fds[1], fd);
+		else
+			dup2(fds[0], fd);
+		close(fds[0]);
+		close(fds[1]);
+	} else {
+		if (wr) {
+			dup2(fds[0], STDIN_FILENO);
+			dup2(fd, STDOUT_FILENO);
+			gzip_flags = "-c";
+		} else {
+			dup2(fds[1], STDOUT_FILENO);
+			dup2(fd, STDIN_FILENO);
+			gzip_flags = "-dc";
+		}
+		close(fds[0]);
+		close(fds[1]);
+		if (execlp(gzip_program, gzip_program, gzip_flags,
+		    (char *)NULL) < 0)
+			err(1, "could not exec");
+		/* NOTREACHED */
+	}
+}
@@ -66,7 +66,7 @@ extern sigset_t s_mask;
 * the user: list, append, read ...
 */

-static char hdbuf[BLKMULT];             /* space for archive header on read */
+static char hdbuf[BLKMULT];		/* space for archive header on read */
 u_long flcnt;				/* number of files processed */

 /*
@@ -75,7 +75,7 @@ u_long flcnt;				/* number of files processed */
 *	(no pattern matches all).
 */

-#if __STDC__
+#ifdef __STDC__
 void
 list(void)
 #else
@@ -103,7 +103,7 @@ list()
 	if (vflag && ((uidtb_start() < 0) || (gidtb_start() < 0)))
 		return;

-	now = time((time_t *)NULL);
+	now = time(NULL);

 	/*
 	 * step through the archive until the format says it is done
@@ -130,7 +130,7 @@ list()
 			if ((res = mod_name(arcn)) < 0)
 				break;
 			if (res == 0)
-				ls_list(arcn, now);
+				ls_list(arcn, now, stdout);
 		}

 		/*
@@ -146,7 +146,7 @@ list()
 	 * the patterns supplied by the user were all matched
 	 */
 	(void)(*frmt->end_rd)();
-	(void)sigprocmask(SIG_BLOCK, &s_mask, (sigset_t *)NULL);
+	(void)sigprocmask(SIG_BLOCK, &s_mask, NULL);
 	ar_close();
 	pat_chk();
 }
@@ -157,7 +157,7 @@ list()
 *	pattern(s) (no patterns extracts all members)
 */

-#if __STDC__
+#ifdef __STDC__
 void
 extract(void)
 #else
@@ -171,6 +171,7 @@ extract()
 	ARCHD archd;
 	struct stat sb;
 	int fd;
+	time_t now;

 	arcn = &archd;
 	/*
@@ -189,6 +190,8 @@ extract()
 	if (iflag && (name_start() < 0))
 		return;

+	now = time(NULL);
+
 	/*
 	 * step through each entry on the archive until the format read routine
 	 * says it is done
@@ -276,10 +279,22 @@ extract()
 		}

 		if (vflag) {
-			(void)fputs(arcn->name, stderr);
-			vfpart = 1;
+			if (vflag > 1)
+				ls_list(arcn, now, listf);
+			else {
+				(void)fputs(arcn->name, listf);
+				vfpart = 1;
+			}
 		}

+		/*
+		 * if required, chdir around.
+		 */
+		if ((arcn->pat != NULL) && (arcn->pat->chdname != NULL))
+			if (chdir(arcn->pat->chdname) != 0)
+				syswarn(1, errno, "Cannot chdir to %s",
+				    arcn->pat->chdname);
+
 		/*
 		 * all ok, extract this member based on type
 		 */
@@ -299,7 +314,7 @@ extract()
 				purg_lnk(arcn);

 			if (vflag && vfpart) {
-				(void)putc('\n', stderr);
+				(void)putc('\n', listf);
 				vfpart = 0;
 			}
 			continue;
@@ -320,11 +335,19 @@ extract()
 		res = (*frmt->rd_data)(arcn, fd, &cnt);
 		file_close(arcn, fd);
 		if (vflag && vfpart) {
-			(void)putc('\n', stderr);
+			(void)putc('\n', listf);
 			vfpart = 0;
 		}
 		if (!res)
 			(void)rd_skip(cnt + arcn->pad);
+
+		/*
+		 * if required, chdir around.
+		 */
+		if ((arcn->pat != NULL) && (arcn->pat->chdname != NULL))
+			if (fchdir(cwdfd) != 0)
+				syswarn(1, errno,
+				    "Can't fchdir to starting directory");
 	}

 	/*
@@ -333,7 +356,7 @@ extract()
 	 * to avoid chance for multiple entry into the cleanup code.
 	 */
 	(void)(*frmt->end_rd)();
-	(void)sigprocmask(SIG_BLOCK, &s_mask, (sigset_t *)NULL);
+	(void)sigprocmask(SIG_BLOCK, &s_mask, NULL);
 	ar_close();
 	proc_dir();
 	pat_chk();
@@ -345,7 +368,7 @@ extract()
 *	previously written archive.
 */

-#if __STDC__
+#ifdef __STDC__
 static void
 wr_archive(register ARCHD *arcn, int is_app)
 #else
@@ -361,6 +384,7 @@ wr_archive(arcn, is_app)
 	off_t cnt;
 	int (*wrf)();
 	int fd = -1;
+	time_t now;

 	/*
 	 * if this format supports hard link storage, start up the database
@@ -388,6 +412,8 @@ wr_archive(arcn, is_app)
 	 */
 	wr_one = is_app;

+	now = time(NULL);
+
 	/*
 	 * while there are files to archive, process them one at at time
 	 */
@@ -426,7 +452,7 @@ wr_archive(arcn, is_app)
 			 * the link table).
 			 */
 			if ((fd = open(arcn->org_name, O_RDONLY, 0)) < 0) {
-				sys_warn(1,errno, "Unable to open %s to read",
+				syswarn(1,errno, "Unable to open %s to read",
 					arcn->org_name);
 				purg_lnk(arcn);
 				continue;
@@ -457,8 +483,12 @@ wr_archive(arcn, is_app)
 		}

 		if (vflag) {
-			(void)fputs(arcn->name, stderr);
-			vfpart = 1;
+			if (vflag > 1)
+				ls_list(arcn, now, listf);
+			else {
+				(void)fputs(arcn->name, listf);
+				vfpart = 1;
+			}
 		}
 		++flcnt;

@@ -477,7 +507,7 @@ wr_archive(arcn, is_app)
 			 * so we are done messing with this file
 			 */
 			if (vflag && vfpart) {
-				(void)putc('\n', stderr);
+				(void)putc('\n', listf);
 				vfpart = 0;
 			}
 			rdfile_close(arcn, &fd);
@@ -495,7 +525,7 @@ wr_archive(arcn, is_app)
 		res = (*frmt->wr_data)(arcn, fd, &cnt);
 		rdfile_close(arcn, &fd);
 		if (vflag && vfpart) {
-			(void)putc('\n', stderr);
+			(void)putc('\n', listf);
 			vfpart = 0;
 		}
 		if (res < 0)
@@ -519,7 +549,7 @@ wr_archive(arcn, is_app)
 		(*frmt->end_wr)();
 		wr_fin();
 	}
-	(void)sigprocmask(SIG_BLOCK, &s_mask, (sigset_t *)NULL);
+	(void)sigprocmask(SIG_BLOCK, &s_mask, NULL);
 	ar_close();
 	if (tflag)
 		proc_dir();
@@ -548,7 +578,7 @@ wr_archive(arcn, is_app)
 *	over write existing files that it creates.
 */

-#if __STDC__
+#ifdef __STDC__
 void
 append(void)
 #else
@@ -573,7 +603,7 @@ append()
 	if (get_arc() < 0)
 		return;
 	if ((orgfrmt != NULL) && (orgfrmt != frmt)) {
-		pax_warn(1, "Cannot mix current archive format %s with %s",
+		paxwarn(1, "Cannot mix current archive format %s with %s",
 		    frmt->name, orgfrmt->name);
 		return;
 	}
@@ -612,7 +642,7 @@ append()
 	 * reading the archive may take a long time. If verbose tell the user
 	 */
 	if (vflag) {
-		(void)fprintf(stderr,
+		(void)fprintf(listf,
 			"%s: Reading archive to position at the end...", argv0);
 		vfpart = 1;
 	}
@@ -674,7 +704,7 @@ append()
 	 * tell the user we are done reading.
 	 */
 	if (vflag && vfpart) {
-		(void)fputs("done.\n", stderr);
+		(void)fputs("done.\n", listf);
 		vfpart = 0;
 	}

@@ -689,7 +719,7 @@ append()
 *	write a new archive
 */

-#if __STDC__
+#ifdef __STDC__
 void
 archive(void)
 #else
@@ -720,7 +750,7 @@ archive()
 *	(except the files are forced to be under the destination directory).
 */

-#if __STDC__
+#ifdef __STDC__
 void
 copy(void)
 #else
@@ -754,12 +784,12 @@ copy()
 	drem = PAXPATHLEN - dlen;

 	if (stat(dirptr, &sb) < 0) {
-		sys_warn(1, errno, "Cannot access destination directory %s",
+		syswarn(1, errno, "Cannot access destination directory %s",
 			dirptr);
 		return;
 	}
 	if (!S_ISDIR(sb.st_mode)) {
-		pax_warn(1, "Destination is not a directory %s", dirptr);
+		paxwarn(1, "Destination is not a directory %s", dirptr);
 		return;
 	}

@@ -813,7 +843,7 @@ copy()
 			else
 				res = 0;
 			if ((arcn->nlen - res) > drem) {
-				pax_warn(1, "Destination pathname too long %s",
+				paxwarn(1, "Destination pathname too long %s",
 					arcn->name);
 				continue;
 			}
@@ -872,7 +902,7 @@ copy()
 		}

 		if (vflag) {
-			(void)fputs(arcn->name, stderr);
+			(void)fputs(arcn->name, listf);
 			vfpart = 1;
 		}
 		++flcnt;
@@ -887,7 +917,7 @@ copy()
 			res = chk_same(arcn);
 		if (res <= 0) {
 			if (vflag && vfpart) {
-				(void)putc('\n', stderr);
+				(void)putc('\n', listf);
 				vfpart = 0;
 			}
 			continue;
@@ -907,7 +937,7 @@ copy()
 			if (res < 0)
 				purg_lnk(arcn);
 			if (vflag && vfpart) {
-				(void)putc('\n', stderr);
+				(void)putc('\n', listf);
 				vfpart = 0;
 			}
 			continue;
@@ -918,7 +948,7 @@ copy()
 		 * first open source file and then create the destination file
 		 */
 		if ((fdsrc = open(arcn->org_name, O_RDONLY, 0)) < 0) {
-			sys_warn(1, errno, "Unable to open %s to read",
+			syswarn(1, errno, "Unable to open %s to read",
 			    arcn->org_name);
 			purg_lnk(arcn);
 			continue;
@@ -937,7 +967,7 @@ copy()
 		rdfile_close(arcn, &fdsrc);

 		if (vflag && vfpart) {
-			(void)putc('\n', stderr);
+			(void)putc('\n', listf);
 			vfpart = 0;
 		}
 	}
@@ -947,7 +977,7 @@ copy()
 	 * patterns were selected block off signals to avoid chance for
 	 * multiple entry into the cleanup code.
 	 */
-	(void)sigprocmask(SIG_BLOCK, &s_mask, (sigset_t *)NULL);
+	(void)sigprocmask(SIG_BLOCK, &s_mask, NULL);
 	ar_close();
 	proc_dir();
 	ftree_chk();
@@ -972,7 +1002,7 @@ copy()
 *	the specs for rd_wrbuf() for more details)
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 next_head(register ARCHD *arcn)
 #else
@@ -988,6 +1018,7 @@ next_head(arcn)
 	register int hsz;
 	register int in_resync = 0; 	/* set when we are in resync mode */
 	int cnt = 0;			/* counter for trailer function */
+	int first = 1;			/* on 1st read, EOF isn't premature. */

 	/*
 	 * set up initial conditions, we want a whole frmt->hsz block as we
@@ -1005,21 +1036,32 @@ next_head(arcn)
 			if ((ret = rd_wrbuf(hdend, res)) == res)
 				break;

+			/*
+			 * If we read 0 bytes (EOF) from an archive when we
+			 * expect to find a header, we have stepped upon
+			 * an archive without the customary block of zeroes
+			 * end marker.  It's just stupid to error out on
+			 * them, so exit gracefully.
+			 */
+			if (first && ret == 0)
+				return(-1);
+			first = 0;
+
 			/*
 			 * some kind of archive read problem, try to resync the
 			 * storage device, better give the user the bad news.
 			 */
 			if ((ret == 0) || (rd_sync() < 0)) {
-				pax_warn(1,"Premature end of file on archive read");
+				paxwarn(1,"Premature end of file on archive read");
 				return(-1);
 			}
 			if (!in_resync) {
 				if (act == APPND) {
-					pax_warn(1,
-				          "Archive I/O error, cannot continue");
+					paxwarn(1,
+					  "Archive I/O error, cannot continue");
 					return(-1);
 				}
-				pax_warn(1,"Archive I/O error. Trying to recover.");
+				paxwarn(1,"Archive I/O error. Trying to recover.");
 				++in_resync;
 			}

@@ -1080,13 +1122,13 @@ next_head(arcn)
 		 */
 		if (!in_resync) {
 			if (act == APPND) {
-				pax_warn(1,"Unable to append, archive header flaw");
+				paxwarn(1,"Unable to append, archive header flaw");
 				return(-1);
 			}
-			pax_warn(1,"Invalid header, starting valid header search.");
+			paxwarn(1,"Invalid header, starting valid header search.");
 			++in_resync;
 		}
-		bcopy(hdbuf+1, hdbuf, shftsz);
+		memmove(hdbuf, hdbuf+1, shftsz);
 		res = 1;
 		hdend = hdbuf + shftsz;
 	}
@@ -1118,7 +1160,7 @@ next_head(arcn)
 *	0 if archive found -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 get_arc(void)
 #else
@@ -1175,7 +1217,7 @@ get_arc()
 			if (!notice) {
 				if (act == APPND)
 					return(-1);
-				pax_warn(1,"Cannot identify format. Searching...");
+				paxwarn(1,"Cannot identify format. Searching...");
 				++notice;
 			}
 		}
@@ -1210,7 +1252,7 @@ get_arc()
 		if (!notice) {
 			if (act == APPND)
 				return(-1);
-			pax_warn(1, "Cannot identify format. Searching...");
+			paxwarn(1, "Cannot identify format. Searching...");
 			++notice;
 		}

@@ -1221,7 +1263,7 @@ get_arc()
 		 * portable manner
 		 */
 		if (--hdsz > 0) {
-			bcopy(hdbuf+1, hdbuf, hdsz);
+			memmove(hdbuf, hdbuf+1, hdsz);
 			res = BLKMULT - hdsz;
 			hdend = hdbuf + hdsz;
 		} else {
@@ -1235,6 +1277,6 @@ get_arc()
 	/*
 	 * we cannot find a header, bow, apologize and quit
 	 */
-	pax_warn(1, "Sorry, unable to determine archive format.");
+	paxwarn(1, "Sorry, unable to determine archive format.");
 	return(-1);
 }
@@ -47,6 +47,7 @@ static const char rcsid[] =
 #include <sys/stat.h>
 #include <errno.h>
 #include <unistd.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "pax.h"
@@ -57,7 +58,7 @@ static const char rcsid[] =
 */

 #define MINFBSZ		512		/* default block size for hole detect */
-#define MAXFLT          10              /* default media read error limit */
+#define MAXFLT		10		/* default media read error limit */

 /*
 * Need to change bufmem to dynamic allocation when the upper
@@ -68,8 +69,8 @@ static char bufmem[MAXBLK+BLKMULT];	/* i/o buffer + pushback id space */
 static char *buf;			/* normal start of i/o buffer */
 static char *bufend;			/* end or last char in i/o buffer */
 static char *bufpt;			/* read/write point in i/o buffer */
-int blksz = MAXBLK;                    	/* block input/output size in bytes */
-int wrblksz;                      	/* user spec output size in bytes */
+int blksz = MAXBLK;			/* block input/output size in bytes */
+int wrblksz;				/* user spec output size in bytes */
 int maxflt = MAXFLT;			/* MAX consecutive media errors */
 int rdblksz;				/* first read blksize (tapes only) */
 off_t wrlimit;				/* # of bytes written per archive vol */
@@ -83,7 +84,7 @@ off_t rdcnt;				/* # of bytes read on current vol */
 *	0 if ok, -1 if the user specified write block size violates pax spec
 */

-#if __STDC__
+#ifdef __STDC__
 int
 wr_start(void)
 #else
@@ -102,15 +103,20 @@ wr_start()
 	if (!wrblksz)
 		wrblksz = frmt->bsz;
 	if (wrblksz > MAXBLK) {
-		pax_warn(1, "Write block size of %d too large, maximum is: %d",
+		paxwarn(1, "Write block size of %d too large, maximum is: %d",
 			wrblksz, MAXBLK);
 		return(-1);
 	}
 	if (wrblksz % BLKMULT) {
-		pax_warn(1, "Write block size of %d is not a %d byte multiple",
+		paxwarn(1, "Write block size of %d is not a %d byte multiple",
 		    wrblksz, BLKMULT);
 		return(-1);
 	}
+	if (wrblksz > MAXBLK_POSIX) {
+		paxwarn(0, "Write block size of %d larger than POSIX max %d, archive may not be portable",
+			wrblksz, MAXBLK_POSIX);
+		return(-1);
+	}

 	/*
 	 * we only allow wrblksz to be used with all archive operations
@@ -131,7 +137,7 @@ wr_start()
 *	0 if ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 rd_start(void)
 #else
@@ -147,12 +153,12 @@ rd_start()
 	buf = &(bufmem[BLKMULT]);
 	if ((act == APPND) && wrblksz) {
 		if (wrblksz > MAXBLK) {
-			pax_warn(1,"Write block size %d too large, maximum is: %d",
+			paxwarn(1,"Write block size %d too large, maximum is: %d",
 				wrblksz, MAXBLK);
 			return(-1);
 		}
 		if (wrblksz % BLKMULT) {
-			pax_warn(1, "Write block size %d is not a %d byte multiple",
+			paxwarn(1, "Write block size %d is not a %d byte multiple",
 		    	wrblksz, BLKMULT);
 			return(-1);
 		}
@@ -174,7 +180,7 @@ rd_start()
 *	set up buffer system for copying within the file system
 */

-#if __STDC__
+#ifdef __STDC__
 void
 cp_start(void)
 #else
@@ -218,7 +224,7 @@ cp_start()
 *	0 for success, -1 for failure
 */

-#if __STDC__
+#ifdef __STDC__
 int
 appnd_start(off_t skcnt)
 #else
@@ -231,7 +237,7 @@ appnd_start(skcnt)
 	off_t cnt;

 	if (exit_val != 0) {
-		pax_warn(0, "Cannot append to an archive that may have flaws.");
+		paxwarn(0, "Cannot append to an archive that may have flaws.");
 		return(-1);
 	}
 	/*
@@ -308,10 +314,10 @@ appnd_start(skcnt)
 	return(0);

    out:
-	pax_warn(1, "Unable to rewrite archive trailer, cannot append.");
+	paxwarn(1, "Unable to rewrite archive trailer, cannot append.");
 	return(-1);
 }
-
+	
 /*
 * rd_sync()
 *	A read error occurred on this archive volume. Resync the buffer and
@@ -323,7 +329,7 @@ appnd_start(skcnt)
 *	0 on success, and -1 on failure
 */

-#if __STDC__
+#ifdef __STDC__
 int
 rd_sync(void)
 #else
@@ -340,7 +346,7 @@ rd_sync()
 	if (maxflt == 0)
 		return(-1);
 	if (act == APPND) {
-		pax_warn(1, "Unable to append when there are archive read errors.");
+		paxwarn(1, "Unable to append when there are archive read errors.");
 		return(-1);
 	}

@@ -374,7 +380,7 @@ rd_sync()
 		 * can extract out of the archive.
 		 */
 		if ((maxflt > 0) && (++errcnt > maxflt))
-			pax_warn(0,"Archive read error limit (%d) reached",maxflt);
+			paxwarn(0,"Archive read error limit (%d) reached",maxflt);
 		else if (ar_rdsync() == 0)
 			continue;
 		if (ar_next() < 0)
@@ -396,7 +402,7 @@ rd_sync()
 *	pback space is increased.
 */

-#if __STDC__
+#ifdef __STDC__
 void
 pback(char *pt, int cnt)
 #else
@@ -407,7 +413,7 @@ pback(pt, cnt)
 #endif
 {
 	bufpt -= cnt;
-	bcopy(pt, bufpt, cnt);
+	memcpy(bufpt, pt, cnt);
 	return;
 }

@@ -419,7 +425,7 @@ pback(pt, cnt)
 *	0 if ok, -1 failure, and 1 when EOF on the archive volume was detected.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 rd_skip(off_t skcnt)
 #else
@@ -494,7 +500,7 @@ rd_skip(skcnt)
 *	BE a requirement....
 */

-#if __STDC__
+#ifdef __STDC__
 void
 wr_fin(void)
 #else
@@ -503,7 +509,7 @@ wr_fin()
 #endif
 {
 	if (bufpt > buf) {
-		bzero(bufpt, bufend - bufpt);
+		memset(bufpt, 0, bufend - bufpt);
 		bufpt = bufend;
 		(void)buf_flush(blksz);
 	}
@@ -520,7 +526,7 @@ wr_fin()
 *	0 if buffer was filled ok, -1 o.w. (buffer flush failure)
 */

-#if __STDC__
+#ifdef __STDC__
 int
 wr_rdbuf(register char *out, register int outcnt)
 #else
@@ -544,7 +550,7 @@ wr_rdbuf(out, outcnt)
 		 * only move what we have space for
 		 */
 		cnt = MIN(cnt, outcnt);
-		bcopy(out, bufpt, cnt);
+		memcpy(bufpt, out, cnt);
 		bufpt += cnt;
 		out += cnt;
 		outcnt -= cnt;
@@ -563,7 +569,7 @@ wr_rdbuf(out, outcnt)
 *	-1 is a read error
 */

-#if __STDC__
+#ifdef __STDC__
 int
 rd_wrbuf(register char *in, register int cpcnt)
 #else
@@ -599,7 +605,7 @@ rd_wrbuf(in, cpcnt)
 		 * state of buffer
 		 */
 		cnt = MIN(cnt, incnt);
-		bcopy(bufpt, in, cnt);
+		memcpy(in, bufpt, cnt);
 		bufpt += cnt;
 		incnt -= cnt;
 		in += cnt;
@@ -618,7 +624,7 @@ rd_wrbuf(in, cpcnt)
 *	0 if ok, -1 if there was a buf_flush failure
 */

-#if __STDC__
+#ifdef __STDC__
 int
 wr_skip(off_t skcnt)
 #else
@@ -637,7 +643,7 @@ wr_skip(skcnt)
 		if ((cnt <= 0) && ((cnt = buf_flush(blksz)) < 0))
 			return(-1);
 		cnt = MIN(cnt, skcnt);
-		bzero(bufpt, cnt);
+		memset(bufpt, 0, cnt);
 		bufpt += cnt;
 		skcnt -= cnt;
 	}
@@ -653,7 +659,7 @@ wr_skip(skcnt)
 *	it is important that we always write EXACTLY the number of bytes that
 *	the format specific write routine told us to. The file can also get
 *	bigger, so reading to the end of file would create an improper archive,
- *	we just detect this case and pax_warn the user. We never create a bad
+ *	we just detect this case and warn the user. We never create a bad
 *	archive if we can avoid it. Of course trying to archive files that are
 *	active is asking for trouble. It we fail, we pass back how much we
 *	could NOT copy and let the caller deal with it.
@@ -662,7 +668,7 @@ wr_skip(skcnt)
 *	0, but "left" is set to be greater than zero.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 wr_rdfile(ARCHD *arcn, int ifd, off_t *left)
 #else
@@ -699,13 +705,13 @@ wr_rdfile(arcn, ifd, left)
 	 * or the file read failed.
 	 */
 	if (res < 0)
-		sys_warn(1, errno, "Read fault on %s", arcn->org_name);
+		syswarn(1, errno, "Read fault on %s", arcn->org_name);
 	else if (size != 0L)
-		pax_warn(1, "File changed size during read %s", arcn->org_name);
+		paxwarn(1, "File changed size during read %s", arcn->org_name);
 	else if (fstat(ifd, &sb) < 0)
-		sys_warn(1, errno, "Failed stat on %s", arcn->org_name);
+		syswarn(1, errno, "Failed stat on %s", arcn->org_name);
 	else if (arcn->sb.st_mtime != sb.st_mtime)
-		pax_warn(1, "File %s was modified during copy to archive",
+		paxwarn(1, "File %s was modified during copy to archive",
 			arcn->org_name);
 	*left = size;
 	return(0);
@@ -731,7 +737,7 @@ wr_rdfile(arcn, ifd, left)
 *	we return a 0 but "left" is set to be the amount unwritten
 */

-#if __STDC__
+#ifdef __STDC__
 int
 rd_wrfile(ARCHD *arcn, int ofd, off_t *left)
 #else
@@ -756,11 +762,11 @@ rd_wrfile(arcn, ofd, left)
 	 * pass the blocksize of the file being written to the write routine,
 	 * if the size is zero, use the default MINFBSZ
 	 */
-        if (fstat(ofd, &sb) == 0) {
+	if (fstat(ofd, &sb) == 0) {
 		if (sb.st_blksize > 0)
 			sz = (int)sb.st_blksize;
-        } else
-                sys_warn(0,errno,"Unable to obtain block size for file %s",fnm);
+	} else
+		syswarn(0,errno,"Unable to obtain block size for file %s",fnm);
 	rem = sz;
 	*left = 0L;

@@ -816,7 +822,7 @@ rd_wrfile(arcn, ofd, left)
 	 * calculated crc to the crc stored in the archive
 	 */
 	if (docrc && (size == 0L) && (arcn->crc != crc))
-		pax_warn(1,"Actual crc does not match expected crc %s",arcn->name);
+		paxwarn(1,"Actual crc does not match expected crc %s",arcn->name);
 	return(0);
 }

@@ -827,7 +833,7 @@ rd_wrfile(arcn, ofd, left)
 *	destination file so we can properly copy files with holes.
 */

-#if __STDC__
+#ifdef __STDC__
 void
 cp_file(ARCHD *arcn, int fd1, int fd2)
 #else
@@ -859,11 +865,11 @@ cp_file(arcn, fd1, fd2)
 	 * pass the blocksize of the file being written to the write routine,
 	 * if the size is zero, use the default MINFBSZ
 	 */
-        if (fstat(fd2, &sb) == 0) {
+	if (fstat(fd2, &sb) == 0) {
 		if (sb.st_blksize > 0)
 			sz = sb.st_blksize;
-        } else
-                sys_warn(0,errno,"Unable to obtain block size for file %s",fnm);
+	} else
+		syswarn(0,errno,"Unable to obtain block size for file %s",fnm);
 	rem = sz;

 	/*
@@ -885,15 +891,15 @@ cp_file(arcn, fd1, fd2)
 	 * check to make sure the copy is valid.
 	 */
 	if (res < 0)
-		sys_warn(1, errno, "Failed write during copy of %s to %s",
+		syswarn(1, errno, "Failed write during copy of %s to %s",
 			arcn->org_name, arcn->name);
 	else if (cpcnt != arcn->sb.st_size)
-		pax_warn(1, "File %s changed size during copy to %s",
+		paxwarn(1, "File %s changed size during copy to %s",
 			arcn->org_name, arcn->name);
 	else if (fstat(fd1, &sb) < 0)
-		sys_warn(1, errno, "Failed stat of %s", arcn->org_name);
+		syswarn(1, errno, "Failed stat of %s", arcn->org_name);
 	else if (arcn->sb.st_mtime != sb.st_mtime)
-		pax_warn(1, "File %s was modified during copy to %s",
+		paxwarn(1, "File %s was modified during copy to %s",
 			arcn->org_name, arcn->name);

 	/*
@@ -916,7 +922,7 @@ cp_file(arcn, fd1, fd2)
 *	0 when finished (user specified termination in ar_next()).
 */

-#if __STDC__
+#ifdef __STDC__
 int
 buf_fill(void)
 #else
@@ -966,7 +972,7 @@ buf_fill()
 *	0 if all is ok, -1 when a write error occurs.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 buf_flush(register int bufcnt)
 #else
@@ -986,7 +992,7 @@ buf_flush(bufcnt)
 	 * at least one record. We always round limit UP to next blocksize.
 	 */
 	if ((wrlimit > 0) && (wrcnt > wrlimit)) {
-		pax_warn(0, "User specified archive volume byte limit reached.");
+		paxwarn(0, "User specified archive volume byte limit reached.");
 		if (ar_next() < 0) {
 			wrcnt = 0;
 			exit_val = 1;
@@ -1029,7 +1035,7 @@ buf_flush(bufcnt)
 				 * check for more than 1 block of push, and if
 				 * so we loop back to write again
 				 */
-				bcopy(bufend, buf, push);
+				memcpy(buf, bufend, push);
 				bufpt = buf + push;
 				if (push >= blksz) {
 					push -= blksz;
@@ -1042,14 +1048,14 @@ buf_flush(bufcnt)
 			/*
 			 * Oh drat we got a partial write!
 			 * if format doesnt care about alignment let it go,
-			 * we pax_warned the user in ar_write().... but this means
+			 * we warned the user in ar_write().... but this means
 			 * the last record on this volume violates pax spec....
 			 */
 			totcnt += cnt;
 			wrcnt += cnt;
 			bufpt = buf + cnt;
 			cnt = bufcnt - cnt;
-			bcopy(bufpt, buf, cnt);
+			memcpy(buf, bufpt, cnt);
 			bufpt = buf + cnt;
 			if (!frmt->blkalgn || ((cnt % frmt->blkalgn) == 0))
 				return(totcnt);
@@ -76,7 +76,7 @@ static GIDC **grptb = NULL;	/* group name to gid cache */
 *	0 if ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 uidtb_start(void)
 #else
@@ -92,7 +92,7 @@ uidtb_start()
 		return(-1);
 	if ((uidtb = (UIDC **)calloc(UID_SZ, sizeof(UIDC *))) == NULL) {
 		++fail;
-		pax_warn(1, "Unable to allocate memory for user id cache table");
+		paxwarn(1, "Unable to allocate memory for user id cache table");
 		return(-1);
 	}
 	return(0);
@@ -105,7 +105,7 @@ uidtb_start()
 *	0 if ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 gidtb_start(void)
 #else
@@ -121,7 +121,7 @@ gidtb_start()
 		return(-1);
 	if ((gidtb = (GIDC **)calloc(GID_SZ, sizeof(GIDC *))) == NULL) {
 		++fail;
-		pax_warn(1, "Unable to allocate memory for group id cache table");
+		paxwarn(1, "Unable to allocate memory for group id cache table");
 		return(-1);
 	}
 	return(0);
@@ -134,7 +134,7 @@ gidtb_start()
 *	0 if ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 usrtb_start(void)
 #else
@@ -150,7 +150,7 @@ usrtb_start()
 		return(-1);
 	if ((usrtb = (UIDC **)calloc(UNM_SZ, sizeof(UIDC *))) == NULL) {
 		++fail;
-		pax_warn(1, "Unable to allocate memory for user name cache table");
+		paxwarn(1, "Unable to allocate memory for user name cache table");
 		return(-1);
 	}
 	return(0);
@@ -163,7 +163,7 @@ usrtb_start()
 *	0 if ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 grptb_start(void)
 #else
@@ -179,7 +179,7 @@ grptb_start()
 		return(-1);
 	if ((grptb = (GIDC **)calloc(GNM_SZ, sizeof(GIDC *))) == NULL) {
 		++fail;
-		pax_warn(1,"Unable to allocate memory for group name cache table");
+		paxwarn(1,"Unable to allocate memory for group name cache table");
 		return(-1);
 	}
 	return(0);
@@ -193,7 +193,7 @@ grptb_start()
 *	Pointer to stored name (or a empty string)
 */

-#if __STDC__
+#ifdef __STDC__
 char *
 name_uid(uid_t uid, int frc)
 #else
@@ -242,9 +242,10 @@ name_uid(uid, frc)
 		ptr->uid = uid;
 		ptr->valid = INVALID;
 #		ifdef NET2_STAT
-		(void)sprintf(ptr->name, "%u", uid);
+		(void)snprintf(ptr->name, sizeof(ptr->name), "%u", uid);
 #		else
-		(void)sprintf(ptr->name, "%lu", (u_long)uid);
+		(void)snprintf(ptr->name, sizeof(ptr->name), "%lu",
+			       (unsigned long)uid);
 #		endif
 		if (frc == 0)
 			return("");
@@ -270,7 +271,7 @@ name_uid(uid, frc)
 *	Pointer to stored name (or a empty string)
 */

-#if __STDC__
+#ifdef __STDC__
 char *
 name_gid(gid_t gid, int frc)
 #else
@@ -319,9 +320,10 @@ name_gid(gid, frc)
 		ptr->gid = gid;
 		ptr->valid = INVALID;
 #		ifdef NET2_STAT
-		(void)sprintf(ptr->name, "%u", gid);
+		(void)snprintf(ptr->name, sizeof(ptr->name), "%u", gid);
 #		else
-		(void)sprintf(ptr->name, "%lu", (u_long)gid);
+		(void)snprintf(ptr->name, sizeof(ptr->name), "%lu",
+			       (unsigned long)gid);
 #		endif
 		if (frc == 0)
 			return("");
@@ -346,7 +348,7 @@ name_gid(gid, frc)
 *	the uid (if any) for a user name, or a -1 if no match can be found
 */

-#if __STDC__
+#ifdef __STDC__
 int
 uid_name(char *name, uid_t *uid)
 #else
@@ -386,7 +388,8 @@ uid_name(name, uid)
 	}

 	if (ptr == NULL)
-		ptr = (UIDC *)malloc(sizeof(UIDC));
+		ptr = usrtb[st_hash(name, namelen, UNM_SZ)] =
+		  (UIDC *)malloc(sizeof(UIDC));

 	/*
 	 * no match, look it up, if no match store it as an invalid entry,
@@ -416,7 +419,7 @@ uid_name(name, uid)
 *	the gid (if any) for a group name, or a -1 if no match can be found
 */

-#if __STDC__
+#ifdef __STDC__
 int
 gid_name(char *name, gid_t *gid)
 #else
@@ -455,7 +458,8 @@ gid_name(name, gid)
 		++gropn;
 	}
 	if (ptr == NULL)
-		ptr = (GIDC *)malloc(sizeof(GIDC));
+		ptr = grptb[st_hash(name, namelen, GID_SZ)] =
+		  (GIDC *)malloc(sizeof(GIDC));

 	/*
 	 * no match, look it up, if no match store it as an invalid entry,
@@ -75,7 +75,7 @@ static int swp_head;		/* binary cpio header byte swap */
 *      0 if ok -1 otherwise (the return values of lnk_start())
 */

-#if __STDC__
+#ifdef __STDC__
 int
 cpio_strd(void)
 #else
@@ -96,7 +96,7 @@ cpio_strd()
 *	0 if a valid trailer, -1 if not a valid trailer,
 */

-#if __STDC__
+#ifdef __STDC__
 int
 cpio_trail(register ARCHD *arcn)
 #else
@@ -120,7 +120,7 @@ cpio_trail(arcn)
 *	0
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 com_rd(register ARCHD *arcn)
 #else
@@ -175,7 +175,7 @@ com_rd(arcn)
 *	result of the write of the trailer from the cpio specific write func
 */

-#if __STDC__
+#ifdef __STDC__
 int
 cpio_endwr(void)
 #else
@@ -188,7 +188,7 @@ cpio_endwr()
 	/*
 	 * create a trailer request and call the proper format write function
 	 */
-	bzero((char *)&last, sizeof(last));
+	memset(&last, 0, sizeof(last));
 	last.nlen = sizeof(TRAILER) - 1;
 	last.type = PAX_REG;
 	last.sb.st_nlink = 1;
@@ -203,7 +203,7 @@ cpio_endwr()
 *	0 if ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 rd_nm(register ARCHD *arcn, int nsz)
 #else
@@ -217,7 +217,7 @@ rd_nm(arcn, nsz)
 	 * do not even try bogus values
 	 */
 	if ((nsz == 0) || (nsz > sizeof(arcn->name))) {
-		pax_warn(1, "Cpio file name length %d is out of range", nsz);
+		paxwarn(1, "Cpio file name length %d is out of range", nsz);
 		return(-1);
 	}

@@ -226,7 +226,7 @@ rd_nm(arcn, nsz)
 	 */
 	if ((rd_wrbuf(arcn->name,nsz) != nsz) || (arcn->name[nsz-1] != '\0') ||
 	    (arcn->name[0] == '\0')) {
-		pax_warn(1, "Cpio file name in header is corrupted");
+		paxwarn(1, "Cpio file name in header is corrupted");
 		return(-1);
 	}
 	return(0);
@@ -240,7 +240,7 @@ rd_nm(arcn, nsz)
 *	0 if ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 rd_ln_nm(register ARCHD *arcn)
 #else
@@ -255,10 +255,10 @@ rd_ln_nm(arcn)
 	if ((arcn->sb.st_size == 0) ||
 	    (arcn->sb.st_size >= sizeof(arcn->ln_name))) {
 #		ifdef NET2_STAT
-		pax_warn(1, "Cpio link name length is invalid: %lu",
+		paxwarn(1, "Cpio link name length is invalid: %lu",
 		    arcn->sb.st_size);
 #		else
-		pax_warn(1, "Cpio link name length is invalid: %qu",
+		paxwarn(1, "Cpio link name length is invalid: %qu",
 		    arcn->sb.st_size);
 #		endif
 		return(-1);
@@ -269,7 +269,7 @@ rd_ln_nm(arcn)
 	 */
 	if (rd_wrbuf(arcn->ln_name, (int)arcn->sb.st_size) !=
 	    (int)arcn->sb.st_size) {
-		pax_warn(1, "Cpio link name read error");
+		paxwarn(1, "Cpio link name read error");
 		return(-1);
 	}
 	arcn->ln_nlen = arcn->sb.st_size;
@@ -279,7 +279,7 @@ rd_ln_nm(arcn)
 	 * watch out for those empty link names
 	 */
 	if (arcn->ln_name[0] == '\0') {
-		pax_warn(1, "Cpio link name is corrupt");
+		paxwarn(1, "Cpio link name is corrupt");
 		return(-1);
 	}
 	return(0);
@@ -297,7 +297,7 @@ rd_ln_nm(arcn)
 *      0 if a valid header, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 cpio_id(char *blk, int size)
 #else
@@ -321,7 +321,7 @@ cpio_id(blk, size)
 *	0 if a valid header, -1 otherwise.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 cpio_rd(register ARCHD *arcn, register char *buf)
 #else
@@ -404,7 +404,7 @@ cpio_rd(arcn, buf)
 *      size of trailer header in this format
 */

-#if __STDC__
+#ifdef __STDC__
 off_t
 cpio_endrd(void)
 #else
@@ -422,7 +422,7 @@ cpio_endrd()
 *	0 if ok, -1 otherwise (what dev_start() returns)
 */

-#if __STDC__
+#ifdef __STDC__
 int
 cpio_stwr(void)
 #else
@@ -442,7 +442,7 @@ cpio_stwr()
 *	data to write after the header, -1 if archive write failed
 */

-#if __STDC__
+#ifdef __STDC__
 int
 cpio_wr(register ARCHD *arcn)
 #else
@@ -481,7 +481,7 @@ cpio_wr(arcn)
 		if (uqd_asc((u_quad_t)arcn->sb.st_size, hd->c_filesize,
 		    sizeof(hd->c_filesize), OCT)) {
 #		endif
-			pax_warn(1,"File is too large for cpio format %s",
+			paxwarn(1,"File is too large for cpio format %s",
 			    arcn->org_name);
 			return(1);
 		}
@@ -509,7 +509,7 @@ cpio_wr(arcn)
 	 */
 	if (ul_asc((u_long)MAGIC, hd->c_magic, sizeof(hd->c_magic), OCT) ||
 	    ul_asc((u_long)arcn->sb.st_dev, hd->c_dev, sizeof(hd->c_dev),
-	        OCT) ||
+		OCT) ||
 	    ul_asc((u_long)arcn->sb.st_ino, hd->c_ino, sizeof(hd->c_ino),
 		OCT) ||
 	    ul_asc((u_long)arcn->sb.st_mode, hd->c_mode, sizeof(hd->c_mode),
@@ -532,7 +532,7 @@ cpio_wr(arcn)
 	 */
 	if ((wr_rdbuf(hdblk, (int)sizeof(HD_CPIO)) < 0) ||
 	    (wr_rdbuf(arcn->name, nsz) < 0)) {
-		pax_warn(1, "Unable to write cpio header for %s", arcn->org_name);
+		paxwarn(1, "Unable to write cpio header for %s", arcn->org_name);
 		return(-1);
 	}

@@ -551,7 +551,7 @@ cpio_wr(arcn)
 	 * next file as we are done.
 	 */
 	if (wr_rdbuf(arcn->ln_name, arcn->ln_nlen) < 0) {
-		pax_warn(1,"Unable to write cpio link name for %s",arcn->org_name);
+		paxwarn(1,"Unable to write cpio link name for %s",arcn->org_name);
 		return(-1);
 	}
 	return(1);
@@ -560,7 +560,7 @@ cpio_wr(arcn)
 	/*
 	 * header field is out of range
 	 */
-	pax_warn(1, "Cpio header field is too small to store file %s",
+	paxwarn(1, "Cpio header field is too small to store file %s",
 	    arcn->org_name);
 	return(1);
 }
@@ -578,7 +578,7 @@ cpio_wr(arcn)
 *      0 if a valid header, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 vcpio_id(char *blk, int size)
 #else
@@ -602,7 +602,7 @@ vcpio_id(blk, size)
 *      0 if a valid header, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 crc_id(char *blk, int size)
 #else
@@ -625,7 +625,7 @@ crc_id(blk, size)
 *      0 if ok -1 otherwise (the return values of lnk_start())
 */

-#if __STDC__
+#ifdef __STDC__
 int
 crc_strd(void)
 #else
@@ -645,7 +645,7 @@ crc_strd()
 *	0 if a valid header, -1 otherwise.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 vcpio_rd(register ARCHD *arcn, register char *buf)
 #else
@@ -751,7 +751,7 @@ vcpio_rd(arcn, buf)
 *      size of trailer header in this format
 */

-#if __STDC__
+#ifdef __STDC__
 off_t
 vcpio_endrd(void)
 #else
@@ -770,7 +770,7 @@ vcpio_endrd()
 *	0 if ok, -1 otherwise (what dev_start() returns)
 */

-#if __STDC__
+#ifdef __STDC__
 int
 crc_stwr(void)
 #else
@@ -791,7 +791,7 @@ crc_stwr()
 *	NO data to write after the header, -1 if archive write failed
 */

-#if __STDC__
+#ifdef __STDC__
 int
 vcpio_wr(register ARCHD *arcn)
 #else
@@ -848,7 +848,7 @@ vcpio_wr(arcn)
 		if (uqd_asc((u_quad_t)arcn->sb.st_size, hd->c_filesize,
 		    sizeof(hd->c_filesize), HEX)) {
 #		endif
-			pax_warn(1,"File is too large for sv4cpio format %s",
+			paxwarn(1,"File is too large for sv4cpio format %s",
 			    arcn->org_name);
 			return(1);
 		}
@@ -906,7 +906,7 @@ vcpio_wr(arcn)
 	if ((wr_rdbuf(hdblk, (int)sizeof(HD_VCPIO)) < 0) ||
 	    (wr_rdbuf(arcn->name, (int)nsz) < 0)  ||
 	    (wr_skip((off_t)(VCPIO_PAD(sizeof(HD_VCPIO) + nsz))) < 0)) {
-		pax_warn(1,"Could not write sv4cpio header for %s",arcn->org_name);
+		paxwarn(1,"Could not write sv4cpio header for %s",arcn->org_name);
 		return(-1);
 	}

@@ -928,7 +928,7 @@ vcpio_wr(arcn)
 	 */
 	if ((wr_rdbuf(arcn->ln_name, arcn->ln_nlen) < 0) ||
 	    (wr_skip((off_t)(VCPIO_PAD(arcn->ln_nlen))) < 0)) {
-		pax_warn(1,"Could not write sv4cpio link name for %s",
+		paxwarn(1,"Could not write sv4cpio link name for %s",
 		    arcn->org_name);
 		return(-1);
 	}
@@ -938,7 +938,7 @@ vcpio_wr(arcn)
 	/*
 	 * header field is out of range
 	 */
-	pax_warn(1,"Sv4cpio header field is too small for file %s",arcn->org_name);
+	paxwarn(1,"Sv4cpio header field is too small for file %s",arcn->org_name);
 	return(1);
 }

@@ -954,7 +954,7 @@ vcpio_wr(arcn)
 *      0 if a valid header, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 bcpio_id(char *blk, int size)
 #else
@@ -989,7 +989,7 @@ bcpio_id(blk, size)
 *	0 if a valid header, -1 otherwise.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 bcpio_rd(register ARCHD *arcn, register char *buf)
 #else
@@ -1093,7 +1093,7 @@ bcpio_rd(arcn, buf)
 *      size of trailer header in this format
 */

-#if __STDC__
+#ifdef __STDC__
 off_t
 bcpio_endrd(void)
 #else
@@ -1116,7 +1116,7 @@ bcpio_endrd()
 *	data to write after the header, -1 if archive write failed
 */

-#if __STDC__
+#ifdef __STDC__
 int
 bcpio_wr(register ARCHD *arcn)
 #else
@@ -1159,7 +1159,7 @@ bcpio_wr(arcn)
 		t_offt = (off_t)(SHRT_EXT(hd->h_filesize_1));
 		t_offt = (t_offt<<16) | ((off_t)(SHRT_EXT(hd->h_filesize_2)));
 		if (arcn->sb.st_size != t_offt) {
-			pax_warn(1,"File is too large for bcpio format %s",
+			paxwarn(1,"File is too large for bcpio format %s",
 			    arcn->org_name);
 			return(1);
 		}
@@ -1244,7 +1244,7 @@ bcpio_wr(arcn)
 	if ((wr_rdbuf(hdblk, (int)sizeof(HD_BCPIO)) < 0) ||
 	    (wr_rdbuf(arcn->name, nsz) < 0) ||
 	    (wr_skip((off_t)(BCPIO_PAD(sizeof(HD_BCPIO) + nsz))) < 0)) {
-		pax_warn(1, "Could not write bcpio header for %s", arcn->org_name);
+		paxwarn(1, "Could not write bcpio header for %s", arcn->org_name);
 		return(-1);
 	}

@@ -1266,7 +1266,7 @@ bcpio_wr(arcn)
 	 */
 	if ((wr_rdbuf(arcn->ln_name, arcn->ln_nlen) < 0) ||
 	    (wr_skip((off_t)(BCPIO_PAD(arcn->ln_nlen))) < 0)) {
-		pax_warn(1,"Could not write bcpio link name for %s",arcn->org_name);
+		paxwarn(1,"Could not write bcpio link name for %s",arcn->org_name);
 		return(-1);
 	}
 	return(1);
@@ -1275,6 +1275,6 @@ bcpio_wr(arcn)
 	/*
 	 * header field is out of range
 	 */
-	pax_warn(1,"Bcpio header field is too small for file %s", arcn->org_name);
+	paxwarn(1,"Bcpio header field is too small for file %s", arcn->org_name);
 	return(1);
 }
@@ -48,6 +48,7 @@
 * ar_io.c
 */
 extern char *arcname;
+extern const char *gzip_program;
 int ar_open __P((char *));
 void ar_close __P((void));
 void ar_drain __P((void));
@@ -145,6 +146,7 @@ int unlnk_exist __P((register char *, register int));
 int chk_path __P((register char *, uid_t, gid_t));
 void set_ftime __P((char *fnm, time_t mtime, time_t atime, int frc));
 int set_ids __P((char *, uid_t, gid_t));
+int set_lids __P((char *, uid_t, gid_t));
 void set_pmode __P((char *, mode_t));
 int file_write __P((int, char *, register int, int *, int *, int, char *));
 void file_flush __P((int, char *, int));
@@ -155,7 +157,7 @@ int set_crc __P((register ARCHD *, register int));
 * ftree.c
 */
 int ftree_start __P((void));
-int ftree_add __P((register char *));
+int ftree_add __P((register char *, int));
 void ftree_sel __P((register ARCHD *));
 void ftree_chk __P((void));
 int next_file __P((register ARCHD *));
@@ -163,9 +165,8 @@ int next_file __P((register ARCHD *));
 /*
 * gen_subs.c
 */
-void ls_list __P((register ARCHD *, time_t));
+void ls_list __P((register ARCHD *, time_t, FILE *));
 void ls_tty __P((register ARCHD *));
-void zf_strncpy __P((register char *, register char *, int));
 int l_strncpy __P((register char *, register char *, int));
 u_long asc_ul __P((register char *, int, register int));
 int ul_asc __P((u_long, register char *, register int, register int));
@@ -174,6 +175,11 @@ u_quad_t asc_uqd __P((register char *, int, register int));
 int uqd_asc __P((u_quad_t, register char *, register int, register int));
 #endif

+/*
+ * getoldopt.c
+ */
+int getoldopt __P((int, char **, char *));
+
 /*
 * options.c
 */
@@ -183,12 +189,13 @@ void options __P((register int, register char **));
 OPLIST * opt_next __P((void));
 int opt_add __P((register char *));
 int bad_opt __P((void));
+char *chdname;

 /*
 * pat_rep.c
 */
 int rep_add __P((register char *));
-int pat_add __P((char *));
+int pat_add __P((char *, char *));
 void pat_chk __P((void));
 int pat_sel __P((register ARCHD *));
 int pat_match __P((register ARCHD *));
@@ -201,6 +208,7 @@ int set_dest __P((register ARCHD *, char *, int));
 extern int act;
 extern FSUB *frmt;
 extern int cflag;
+extern int cwdfd;
 extern int dflag;
 extern int iflag;
 extern int kflag;
@@ -218,12 +226,18 @@ extern int Zflag;
 extern int vfpart;
 extern int patime;
 extern int pmtime;
+extern int nodirs;
 extern int pmode;
 extern int pids;
+extern int rmleadslash;
 extern int exit_val;
 extern int docrc;
 extern char *dirptr;
 extern char *argv0;
+extern FILE *listf;
+extern char *tempfile;
+extern char *tempbase;
+
 int main __P((int, char **));
 void sig_cleanup __P((int));

@@ -246,7 +260,7 @@ int ftime_start __P((void));
 int chk_ftime __P((register ARCHD *));
 int name_start __P((void));
 int add_name __P((register char *, int, char *));
-void sub_name __P((register char *, int *));
+void sub_name __P((register char *, int *, size_t));
 int dev_start __P((void));
 int add_dev __P((register ARCHD *));
 int map_dev __P((register ARCHD *, u_long, u_long));
@@ -279,7 +293,7 @@ int ustar_wr __P((register ARCHD *));
 * tty_subs.c
 */
 int tty_init __P((void));
-void tty_prnt __P((char *, ...));
+void tty_prnt __P((const char *, ...)) __printflike(1, 2);
 int tty_read __P((char *, int));
-void pax_warn __P((int, char *, ...));
-void sys_warn __P((int, int, char *, ...));
+void paxwarn __P((int, const char *, ...)) __printflike(2, 3);
+void syswarn __P((int, int, const char *, ...)) __printflike(3, 4);
@@ -54,6 +54,7 @@ static const char rcsid[] =
 #include <sys/uio.h>
 #include <stdlib.h>
 #include "pax.h"
+#include "options.h"
 #include "extern.h"

 static int
@@ -75,7 +76,7 @@ mk_link __P((register char *,register struct stat *,register char *, int));
 *	file descriptor or -1 for failure
 */

-#if __STDC__
+#ifdef __STDC__
 int
 file_creat(register ARCHD *arcn)
 #else
@@ -122,8 +123,8 @@ file_creat(arcn)
 		    file_mode)) >= 0)
 			break;
 		oerrno = errno;
-		if (chk_path(arcn->name,arcn->sb.st_uid,arcn->sb.st_gid) < 0) {
-			sys_warn(1, oerrno, "Unable to create %s", arcn->name);
+		if (nodirs || chk_path(arcn->name,arcn->sb.st_uid,arcn->sb.st_gid) < 0) {
+			syswarn(1, oerrno, "Unable to create %s", arcn->name);
 			return(-1);
 		}
 	}
@@ -138,7 +139,7 @@ file_creat(arcn)
 *	0 for success, -1 for failure
 */

-#if __STDC__
+#ifdef __STDC__
 void
 file_close(register ARCHD *arcn, int fd)
 #else
@@ -153,7 +154,7 @@ file_close(arcn, fd)
 	if (fd < 0)
 		return;
 	if (close(fd) < 0)
-		sys_warn(0, errno, "Unable to close file descriptor on %s",
+		syswarn(0, errno, "Unable to close file descriptor on %s",
 		    arcn->name);

 	/*
@@ -185,7 +186,7 @@ file_close(arcn, fd)
 *	0 if ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 lnk_creat(register ARCHD *arcn)
 #else
@@ -201,13 +202,13 @@ lnk_creat(arcn)
 	 * is not a directory, so we lstat and check
 	 */
 	if (lstat(arcn->ln_name, &sb) < 0) {
-		sys_warn(1,errno,"Unable to link to %s from %s", arcn->ln_name,
+		syswarn(1,errno,"Unable to link to %s from %s", arcn->ln_name,
 		    arcn->name);
 		return(-1);
 	}

 	if (S_ISDIR(sb.st_mode)) {
-		pax_warn(1, "A hard link to the directory %s is not allowed",
+		paxwarn(1, "A hard link to the directory %s is not allowed",
 		    arcn->ln_name);
 		return(-1);
 	}
@@ -218,14 +219,14 @@ lnk_creat(arcn)
 /*
 * cross_lnk()
 *	Create a hard link to arcn->org_name from arcn->name. Only used in copy
- *	with the -l flag. No pax_warning or error if this does not succeed (we will
+ *	with the -l flag. No warning or error if this does not succeed (we will
 *	then just create the file)
 * Return:
 *	1 if copy() should try to create this file node
 *	0 if cross_lnk() ok, -1 for fatal flaw (like linking to self).
 */

-#if __STDC__
+#ifdef __STDC__
 int
 cross_lnk(register ARCHD *arcn)
 #else
@@ -255,7 +256,7 @@ cross_lnk(arcn)
 *	0 skip it file exists (-k) or may be the same as source file
 */

-#if __STDC__
+#ifdef __STDC__
 int
 chk_same(register ARCHD *arcn)
 #else
@@ -279,7 +280,7 @@ chk_same(arcn)
 	 * better make sure the user does not have src == dest by mistake
 	 */
 	if ((arcn->sb.st_dev == sb.st_dev) && (arcn->sb.st_ino == sb.st_ino)) {
-		pax_warn(1, "Unable to copy %s, file would overwrite itself",
+		paxwarn(1, "Unable to copy %s, file would overwrite itself",
 		    arcn->name);
 		return(0);
 	}
@@ -298,7 +299,7 @@ chk_same(arcn)
 *	allowed option). -1 an error occurred.
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 mk_link(register char *to, register struct stat *to_sb, register char *from,
 	int ign)
@@ -326,7 +327,7 @@ mk_link(to, to_sb, from, ign)
 		 * make sure it is not the same file, protect the user
 		 */
 		if ((to_sb->st_dev==sb.st_dev)&&(to_sb->st_ino == sb.st_ino)) {
-			pax_warn(1, "Unable to link file %s to itself", to);
+			paxwarn(1, "Unable to link file %s to itself", to);
 			return(-1);;
 		}

@@ -335,12 +336,12 @@ mk_link(to, to_sb, from, ign)
 		 */
 		if (S_ISDIR(sb.st_mode)) {
 			if (rmdir(from) < 0) {
-				sys_warn(1, errno, "Unable to remove %s", from);
+				syswarn(1, errno, "Unable to remove %s", from);
 				return(-1);
 			}
 		} else if (unlink(from) < 0) {
 			if (!ign) {
-				sys_warn(1, errno, "Unable to remove %s", from);
+				syswarn(1, errno, "Unable to remove %s", from);
 				return(-1);
 			}
 			return(1);
@@ -356,10 +357,10 @@ mk_link(to, to_sb, from, ign)
 		if (link(to, from) == 0)
 			break;
 		oerrno = errno;
-		if (chk_path(from, to_sb->st_uid, to_sb->st_gid) == 0)
+		if (!nodirs && chk_path(from, to_sb->st_uid, to_sb->st_gid) == 0)
 			continue;
 		if (!ign) {
-			sys_warn(1, oerrno, "Could not link to %s from %s", to,
+			syswarn(1, oerrno, "Could not link to %s from %s", to,
 			    from);
 			return(-1);
 		}
@@ -380,7 +381,7 @@ mk_link(to, to_sb, from, ign)
 *	0 if ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 node_creat(register ARCHD *arcn)
 #else
@@ -426,13 +427,12 @@ node_creat(arcn)
 			/*
 			 * Skip sockets, operation has no meaning under BSD
 			 */
-			pax_warn(0,
+			paxwarn(0,
 			    "%s skipped. Sockets cannot be copied or extracted",
 			    arcn->name);
 			return(-1);
 		case PAX_SLK:
-			if ((res = symlink(arcn->ln_name, arcn->name)) == 0)
-				return(0);
+			res = symlink(arcn->ln_name, arcn->name);
 			break;
 		case PAX_CTG:
 		case PAX_HLK:
@@ -442,7 +442,7 @@ node_creat(arcn)
 			/*
 			 * we should never get here
 			 */
-			pax_warn(0, "%s has an unknown file type, skipping",
+			paxwarn(0, "%s has an unknown file type, skipping",
 				arcn->name);
 			return(-1);
 		}
@@ -465,8 +465,8 @@ node_creat(arcn)
 		if (++pass <= 1)
 			continue;

-		if (chk_path(arcn->name,arcn->sb.st_uid,arcn->sb.st_gid) < 0) {
-			sys_warn(1, oerrno, "Could not create: %s", arcn->name);
+		if (nodirs || chk_path(arcn->name,arcn->sb.st_uid,arcn->sb.st_gid) < 0) {
+			syswarn(1, oerrno, "Could not create: %s", arcn->name);
 			return(-1);
 		}
 	}
@@ -475,10 +475,18 @@ node_creat(arcn)
 	 * we were able to create the node. set uid/gid, modes and times
 	 */
 	if (pids)
-		res = set_ids(arcn->name, arcn->sb.st_uid, arcn->sb.st_gid);
+		res = ((arcn->type == PAX_SLK) ?
+		    set_lids(arcn->name, arcn->sb.st_uid, arcn->sb.st_gid) :
+		    set_ids(arcn->name, arcn->sb.st_uid, arcn->sb.st_gid));
 	else
 		res = 0;

+	/*
+	 * symlinks are done now.
+	 */
+	if (arcn->type == PAX_SLK)
+		return(0);
+
 	/*
 	 * IMPORTANT SECURITY NOTE:
 	 * if not preserving mode or we cannot set uid/gid, then PROHIBIT any
@@ -489,7 +497,7 @@ node_creat(arcn)
 	if (pmode)
 		set_pmode(arcn->name, arcn->sb.st_mode);

-	if (arcn->type == PAX_DIR) {
+	if (arcn->type == PAX_DIR && strcmp(NM_CPIO, argv0) != 0) {
 		/*
 		 * Dirs must be processed again at end of extract to set times
 		 * and modes to agree with those stored in the archive. However
@@ -501,7 +509,7 @@ node_creat(arcn)
 		 */
 		if (access(arcn->name, R_OK | W_OK | X_OK) < 0) {
 			if (lstat(arcn->name, &sb) < 0) {
-				sys_warn(0, errno,"Could not access %s (stat)",
+				syswarn(0, errno,"Could not access %s (stat)",
 				    arcn->name);
 				set_pmode(arcn->name,file_mode | S_IRWXU);
 			} else {
@@ -543,7 +551,7 @@ node_creat(arcn)
 *	1 we found a directory and we were going to create a directory.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 unlnk_exist(register char *name, register int type)
 #else
@@ -571,7 +579,7 @@ unlnk_exist(name, type)
 		if (rmdir(name) < 0) {
 			if (type == PAX_DIR)
 				return(1);
-			sys_warn(1,errno,"Unable to remove directory %s", name);
+			syswarn(1,errno,"Unable to remove directory %s", name);
 			return(-1);
 		}
 		return(0);
@@ -581,7 +589,7 @@ unlnk_exist(name, type)
 	 * try to get rid of all non-directory type nodes
 	 */
 	if (unlink(name) < 0) {
-		sys_warn(1, errno, "Could not unlink %s", name);
+		syswarn(1, errno, "Could not unlink %s", name);
 		return(-1);
 	}
 	return(0);
@@ -601,7 +609,7 @@ unlnk_exist(name, type)
 *	0 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 chk_path( register char *name, uid_t st_uid, gid_t st_gid)
 #else
@@ -684,7 +692,7 @@ chk_path(name, st_uid, st_gid)
 /*
 * set_ftime()
 *	Set the access time and modification time for a named file. If frc is
- *	non-zero we force these times to be set even if the the user did not
+ *	non-zero we force these times to be set even if the user did not
 *	request access and/or modification time preservation (this is also
 *	used by -t to reset access times).
 *	When ign is zero, only those times the user has asked for are set, the
@@ -693,7 +701,7 @@ chk_path(name, st_uid, st_gid)
 *	not set request.
 */

-#if __STDC__
+#ifdef __STDC__
 void
 set_ftime(char *fnm, time_t mtime, time_t atime, int frc)
 #else
@@ -721,14 +729,14 @@ set_ftime(fnm, mtime, atime, frc)
 			if (!pmtime)
 				tv[1].tv_sec = (long)sb.st_mtime;
 		} else
-			sys_warn(0,errno,"Unable to obtain file stats %s", fnm);
+			syswarn(0,errno,"Unable to obtain file stats %s", fnm);
 	}

 	/*
 	 * set the times
 	 */
 	if (utimes(fnm, tv) < 0)
-		sys_warn(1, errno, "Access/modification time set failed on: %s",
+		syswarn(1, errno, "Access/modification time set failed on: %s",
 		    fnm);
 	return;
 }
@@ -740,7 +748,7 @@ set_ftime(fnm, mtime, atime, frc)
 *	0 when set, -1 on failure
 */

-#if __STDC__
+#ifdef __STDC__
 int
 set_ids(char *fnm, uid_t uid, gid_t gid)
 #else
@@ -752,7 +760,46 @@ set_ids(fnm, uid, gid)
 #endif
 {
 	if (chown(fnm, uid, gid) < 0) {
-		sys_warn(1, errno, "Unable to set file uid/gid of %s", fnm);
+		/*
+		 * ignore EPERM unless in verbose mode or being run by root.
+		 * if running as pax, POSIX requires a warning.
+		 */
+		if (strcmp(NM_PAX, argv0) == 0 || errno != EPERM || vflag ||
+		    geteuid() == 0)
+			syswarn(1, errno, "Unable to set file uid/gid of %s",
+			    fnm);
+		return(-1);
+	}
+	return(0);
+}
+
+/*
+ * set_lids()
+ *	set the uid and gid of a file system node
+ * Return:
+ *	0 when set, -1 on failure
+ */
+
+#ifdef __STDC__
+int
+set_lids(char *fnm, uid_t uid, gid_t gid)
+#else
+int
+set_lids(fnm, uid, gid)
+	char *fnm;
+	uid_t uid;
+	gid_t gid;
+#endif
+{
+	if (lchown(fnm, uid, gid) < 0) {
+		/*
+		 * ignore EPERM unless in verbose mode or being run by root.
+		 * if running as pax, POSIX requires a warning.
+		 */
+		if (strcmp(NM_PAX, argv0) == 0 || errno != EPERM || vflag ||
+		    geteuid() == 0)
+			syswarn(1, errno, "Unable to set file uid/gid of %s",
+			    fnm);
 		return(-1);
 	}
 	return(0);
@@ -763,7 +810,7 @@ set_ids(fnm, uid, gid)
 *	Set file access mode
 */

-#if __STDC__
+#ifdef __STDC__
 void
 set_pmode(char *fnm, mode_t mode)
 #else
@@ -775,7 +822,7 @@ set_pmode(fnm, mode)
 {
 	mode &= ABITS;
 	if (chmod(fnm, mode) < 0)
-		sys_warn(1, errno, "Could not set permissions on %s", fnm);
+		syswarn(1, errno, "Could not set permissions on %s", fnm);
 	return;
 }

@@ -827,7 +874,7 @@ set_pmode(fnm, mode)
 *	number of bytes written, -1 on write (or lseek) error.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 file_write(int fd, char *str, register int cnt, int *rem, int *isempt, int sz,
 	char *name)
@@ -888,7 +935,7 @@ file_write(fd, str, cnt, rem, isempt, sz, name)
 				 * skip, buf is empty so far
 				 */
 				if (lseek(fd, (off_t)wcnt, SEEK_CUR) < 0) {
-					sys_warn(1,errno,"File seek on %s",
+					syswarn(1,errno,"File seek on %s",
 					    name);
 					return(-1);
 				}
@@ -905,7 +952,7 @@ file_write(fd, str, cnt, rem, isempt, sz, name)
 		 * have non-zero data in this file system block, have to write
 		 */
 		if (write(fd, st, wcnt) != wcnt) {
-			sys_warn(1, errno, "Failed write to file %s", name);
+			syswarn(1, errno, "Failed write to file %s", name);
 			return(-1);
 		}
 		st += wcnt;
@@ -920,7 +967,7 @@ file_write(fd, str, cnt, rem, isempt, sz, name)
 *	write the last BYTE with a zero (back up one byte and write a zero).
 */

-#if __STDC__
+#ifdef __STDC__
 void
 file_flush(int fd, char *fname, int isempt)
 #else
@@ -944,12 +991,12 @@ file_flush(fd, fname, isempt)
 	 * move back one byte and write a zero
 	 */
 	if (lseek(fd, (off_t)-1, SEEK_CUR) < 0) {
-		sys_warn(1, errno, "Failed seek on file %s", fname);
+		syswarn(1, errno, "Failed seek on file %s", fname);
 		return;
 	}

 	if (write(fd, blnk, 1) < 0)
-		sys_warn(1, errno, "Failed write to file %s", fname);
+		syswarn(1, errno, "Failed write to file %s", fname);
 	return;
 }

@@ -959,7 +1006,7 @@ file_flush(fd, fname, isempt)
 *	reset access time (tflag) do so (the times are stored in arcn).
 */

-#if __STDC__
+#ifdef __STDC__
 void
 rdfile_close(register ARCHD *arcn, register int *fd)
 #else
@@ -996,7 +1043,7 @@ rdfile_close(arcn, fd)
 *	0 if was able to calculate the crc, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 set_crc(register ARCHD *arcn, register int fd)
 #else
@@ -1042,13 +1089,13 @@ set_crc(arcn, fd)
 	 * they can create inconsistant archive copies.
 	 */
 	if (cpcnt != arcn->sb.st_size)
-		pax_warn(1, "File changed size %s", arcn->org_name);
+		paxwarn(1, "File changed size %s", arcn->org_name);
 	else if (fstat(fd, &sb) < 0)
-		sys_warn(1, errno, "Failed stat on %s", arcn->org_name);
+		syswarn(1, errno, "Failed stat on %s", arcn->org_name);
 	else if (arcn->sb.st_mtime != sb.st_mtime)
-		pax_warn(1, "File %s was modified during read", arcn->org_name);
+		paxwarn(1, "File %s was modified during read", arcn->org_name);
 	else if (lseek(fd, (off_t)0L, SEEK_SET) < 0)
-		sys_warn(1, errno, "File rewind failed on: %s", arcn->org_name);
+		syswarn(1, errno, "File rewind failed on: %s", arcn->org_name);
 	else {
 		arcn->crc = crc;
 		return(0);
@@ -91,7 +91,7 @@ static int ftree_arg __P((void));
 *	0 if there is at least one valid file arg to process, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ftree_start(void)
 #else
@@ -123,7 +123,7 @@ ftree_start()
 		ftsopts |= FTS_PHYSICAL;
 	if (Hflag)
 #	ifdef NET2_FTS
-		pax_warn(0, "The -H flag is not supported on this version");
+		paxwarn(0, "The -H flag is not supported on this version");
 #	else
 		ftsopts |= FTS_COMFOLLOW;
 #	endif
@@ -131,7 +131,7 @@ ftree_start()
 		ftsopts |= FTS_XDEV;

 	if ((fthead == NULL) && ((farray[0] = malloc(PAXPATHLEN+2)) == NULL)) {
-		pax_warn(1, "Unable to allocate memory for file name buffer");
+		paxwarn(1, "Unable to allocate memory for file name buffer");
 		return(-1);
 	}

@@ -150,13 +150,14 @@ ftree_start()
 *	0 if added to the linked list, -1 if failed
 */

-#if __STDC__
+#ifdef __STDC__
 int
-ftree_add(register char *str)
+ftree_add(register char *str, int chflg)
 #else
 int
-ftree_add(str)
+ftree_add(str, chflg)
 	register char *str;
+	int chflg;
 #endif
 {
 	register FTREE *ft;
@@ -166,7 +167,7 @@ ftree_add(str)
 	 * simple check for bad args
 	 */
 	if ((str == NULL) || (*str == '\0')) {
-		pax_warn(0, "Invalid file name arguement");
+		paxwarn(0, "Invalid file name argument");
 		return(-1);
 	}

@@ -176,7 +177,7 @@ ftree_add(str)
 	 * trailing / the user may pass us. (watch out for / by itself).
 	 */
 	if ((ft = (FTREE *)malloc(sizeof(FTREE))) == NULL) {
-		pax_warn(0, "Unable to allocate memory for filename");
+		paxwarn(0, "Unable to allocate memory for filename");
 		return(-1);
 	}

@@ -184,6 +185,7 @@ ftree_add(str)
 		str[len] = '\0';
 	ft->fname = str;
 	ft->refcnt = 0;
+	ft->chflg = chflg;
 	ft->fow = NULL;
 	if (fthead == NULL) {
 		fttail = fthead = ft;
@@ -200,7 +202,7 @@ ftree_add(str)
 *	-n and -d processing.
 */

-#if __STDC__
+#ifdef __STDC__
 void
 ftree_sel(register ARCHD *arcn)
 #else
@@ -239,7 +241,7 @@ ftree_sel(arcn)
 *	have a selected member (reference count still 0)
 */

-#if __STDC__
+#ifdef __STDC__
 void
 ftree_chk(void)
 #else
@@ -261,10 +263,10 @@ ftree_chk()
 	 * that never had a match
 	 */
 	for (ft = fthead; ft != NULL; ft = ft->fow) {
-		if (ft->refcnt > 0)
+		if ((ft->refcnt > 0) || ft->chflg)
 			continue;
 		if (wban == 0) {
-			pax_warn(1,"WARNING! These file names were not selected:");
+			paxwarn(1,"WARNING! These file names were not selected:");
 			++wban;
 		}
 		(void)fprintf(stderr, "%s\n", ft->fname);
@@ -281,7 +283,7 @@ ftree_chk()
 *	stdin).
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 ftree_arg(void)
 #else
@@ -315,13 +317,27 @@ ftree_arg()
 				*pt = '\0';
 		} else {
 			/*
-			 * the user supplied the file args as arguements to pax
+			 * the user supplied the file args as arguments to pax
 			 */
 			if (ftcur == NULL)
 				ftcur = fthead;
 			else if ((ftcur = ftcur->fow) == NULL)
 				return(-1);
-			farray[0] = ftcur->fname;
+			if (ftcur->chflg) {
+				/* First fchdir() back... */
+				if (fchdir(cwdfd) < 0) {
+					syswarn(1, errno,
+					  "Can't fchdir to starting directory");
+					return(-1);
+				}
+				if (chdir(ftcur->fname) < 0) {
+					syswarn(1, errno, "Can't chdir to %s",
+					    ftcur->fname);
+					return(-1);
+				}
+				continue;
+			} else
+				farray[0] = ftcur->fname;
 		}

 		/*
@@ -346,7 +362,7 @@ ftree_arg()
 *	0 when contents of arcn have been set with the next file, -1 when done.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 next_file(register ARCHD *arcn)
 #else
@@ -424,30 +440,30 @@ next_file(arcn)
 			/*
 			 * fts claims a file system cycle
 			 */
-			pax_warn(1,"File system cycle found at %s",ftent->fts_path);
+			paxwarn(1,"File system cycle found at %s",ftent->fts_path);
 			continue;
 		case FTS_DNR:
 #			ifdef NET2_FTS
-			sys_warn(1, errno,
+			syswarn(1, errno,
 #			else
-			sys_warn(1, ftent->fts_errno,
+			syswarn(1, ftent->fts_errno,
 #			endif
 			    "Unable to read directory %s", ftent->fts_path);
 			continue;
 		case FTS_ERR:
 #			ifdef NET2_FTS
-			sys_warn(1, errno,
+			syswarn(1, errno,
 #			else
-			sys_warn(1, ftent->fts_errno,
+			syswarn(1, ftent->fts_errno,
 #			endif
 			    "File system traversal error");
 			continue;
 		case FTS_NS:
 		case FTS_NSOK:
 #			ifdef NET2_FTS
-			sys_warn(1, errno,
+			syswarn(1, errno,
 #			else
-			sys_warn(1, ftent->fts_errno,
+			syswarn(1, ftent->fts_errno,
 #			endif
 			    "Unable to access %s", ftent->fts_path);
 			continue;
@@ -509,7 +525,7 @@ next_file(arcn)
 			 */
 			if ((cnt = readlink(ftent->fts_path, arcn->ln_name,
 			    PAXPATHLEN - 1)) < 0) {
-				sys_warn(1, errno, "Unable to read symlink %s",
+				syswarn(1, errno, "Unable to read symlink %s",
 				    ftent->fts_path);
 				continue;
 			}
@@ -538,7 +554,7 @@ next_file(arcn)
 	/*
 	 * copy file name, set file name length
 	 */
-	arcn->nlen = l_strncpy(arcn->name, ftent->fts_path, PAXPATHLEN+1);
+	arcn->nlen = l_strncpy(arcn->name, ftent->fts_path, sizeof(arcn->name) - 1);
 	arcn->name[arcn->nlen] = '\0';
 	arcn->org_name = ftent->fts_path;
 	return(0);
@@ -47,5 +47,6 @@
 typedef struct ftree {
 	char		*fname;		/* file tree name */
 	int		refcnt;		/* has tree had a selected file? */
+	int		chflg;		/* change directory flag */
 	struct ftree	*fow;		/* pointer to next entry on list */
 } FTREE;
@@ -76,14 +76,15 @@ static const char rcsid[] =
 *	list the members of an archive in ls format
 */

-#if __STDC__
+#ifdef __STDC__
 void
-ls_list(register ARCHD *arcn, time_t now)
+ls_list(register ARCHD *arcn, time_t now, FILE *fp)
 #else
 void
-ls_list(arcn, now)
+ls_list(arcn, now, fp)
 	register ARCHD *arcn;
 	time_t now;
+	FILE *fp;
 #endif
 {
 	register struct stat *sbp;
@@ -95,8 +96,8 @@ ls_list(arcn, now)
 	 * if not verbose, just print the file name
 	 */
 	if (!vflag) {
-		(void)printf("%s\n", arcn->name);
-		(void)fflush(stdout);
+		(void)fprintf(fp, "%s\n", arcn->name);
+		(void)fflush(fp);
 		return;
 	}

@@ -119,8 +120,8 @@ ls_list(arcn, now)
 	 */
 	if (strftime(f_date,DATELEN,timefrmt,localtime(&(sbp->st_mtime))) == 0)
 		f_date[0] = '\0';
-	(void)printf("%s%2u %-*s %-*s ", f_mode, sbp->st_nlink, UT_NAMESIZE,
-		name_uid(sbp->st_uid, 1), UT_GRPSIZE,
+	(void)fprintf(fp, "%s%2u %-*s %-*s ", f_mode, sbp->st_nlink,
+		UT_NAMESIZE, name_uid(sbp->st_uid, 1), UT_GRPSIZE,
 		name_gid(sbp->st_gid, 1));

 	/*
@@ -128,31 +129,31 @@ ls_list(arcn, now)
 	 */
 	if ((arcn->type == PAX_CHR) || (arcn->type == PAX_BLK))
 #		ifdef NET2_STAT
-		(void)printf("%4u,%4u ", MAJOR(sbp->st_rdev),
+		(void)fprintf(fp, "%4u,%4u ", MAJOR(sbp->st_rdev),
 		    MINOR(sbp->st_rdev));
 #		else
-		(void)printf("%4lu,%4lu ", (unsigned long)MAJOR(sbp->st_rdev),
+		(void)fprintf(fp, "%4lu,%4lu ", (unsigned long)MAJOR(sbp->st_rdev),
 		    (unsigned long)MINOR(sbp->st_rdev));
 #		endif
 	else {
 #		ifdef NET2_STAT
-		(void)printf("%9lu ", sbp->st_size);
+		(void)fprintf(fp, "%9lu ", sbp->st_size);
 #		else
-		(void)printf("%9qu ", sbp->st_size);
+		(void)fprintf(fp, "%9qu ", sbp->st_size);
 #		endif
 	}

 	/*
 	 * print name and link info for hard and soft links
 	 */
-	(void)printf("%s %s", f_date, arcn->name);
+	(void)fprintf(fp, "%s %s", f_date, arcn->name);
 	if ((arcn->type == PAX_HLK) || (arcn->type == PAX_HRG))
-		(void)printf(" == %s\n", arcn->ln_name);
+		(void)fprintf(fp, " == %s\n", arcn->ln_name);
 	else if (arcn->type == PAX_SLK)
-		(void)printf(" => %s\n", arcn->ln_name);
+		(void)fprintf(fp, " => %s\n", arcn->ln_name);
 	else
-		(void)putchar('\n');
-	(void)fflush(stdout);
+		(void)putc('\n', fp);
+	(void)fflush(fp);
 	return;
 }

@@ -161,7 +162,7 @@ ls_list(arcn, now)
 * 	print a short summary of file to tty.
 */

-#if __STDC__
+#ifdef __STDC__
 void
 ls_tty(register ARCHD *arcn)
 #else
@@ -190,44 +191,16 @@ ls_tty(arcn)
 	return;
 }

-/*
- * zf_strncpy()
- *	copy src to dest up to len chars (stopping at first '\0'), when src is
- *	shorter than len, pads to len with '\0'. big performance win (and
- *	a lot easier to code) over strncpy(), then a strlen() then a
- *	bzero(). (or doing the bzero() first).
- */
-
-#if __STDC__
-void
-zf_strncpy(register char *dest, register char *src, int len)
-#else
-void
-zf_strncpy(dest, src, len)
-	register char *dest;
-	register char *src;
-	int len;
-#endif
-{
-	register char *stop;
-
-	stop = dest + len;
-	while ((dest < stop) && (*src != '\0'))
-		*dest++ = *src++;
-	while (dest < stop)
-		*dest++ = '\0';
-	return;
-}
-
 /*
 * l_strncpy()
- *	copy src to dest up to len chars (stopping at first '\0')
+ *	copy src to dest up to len chars (stopping at first '\0').
+ *	when src is shorter than len, pads to len with '\0'. 
 * Return:
 *	number of chars copied. (Note this is a real performance win over
- *	doing a strncpy() then a strlen()
+ *	doing a strncpy(), a strlen(), and then a possible memset())
 */

-#if __STDC__
+#ifdef __STDC__
 int
 l_strncpy(register char *dest, register char *src, int len)
 #else
@@ -245,9 +218,10 @@ l_strncpy(dest, src, len)
 	start = dest;
 	while ((dest < stop) && (*src != '\0'))
 		*dest++ = *src++;
-	if (dest < stop)
-		*dest = '\0';
-	return(dest - start);
+	len = dest - start;
+	while (dest < stop)
+		*dest++ = '\0';
+	return(len);
 }

 /*
@@ -260,7 +234,7 @@ l_strncpy(dest, src, len)
 *	unsigned long value
 */

-#if __STDC__
+#ifdef __STDC__
 u_long
 asc_ul(register char *str, int len, register int base)
 #else
@@ -311,7 +285,7 @@ asc_ul(str, len, base)
 *	NOTE: the string created is NOT TERMINATED.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ul_asc(u_long val, register char *str, register int len, register int base)
 #else
@@ -374,7 +348,7 @@ ul_asc(val, str, len, base)
 *	u_quad_t value
 */

-#if __STDC__
+#ifdef __STDC__
 u_quad_t
 asc_uqd(register char *str, int len, register int base)
 #else
@@ -425,7 +399,7 @@ asc_uqd(str, len, base)
 *	NOTE: the string created is NOT TERMINATED.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 uqd_asc(u_quad_t val, register char *str, register int len, register int base)
 #else
@@ -0,0 +1,71 @@
+/*	$OpenBSD: getoldopt.c,v 1.4 2000/01/22 20:24:51 deraadt Exp $	*/
+/*	$NetBSD: getoldopt.c,v 1.3 1995/03/21 09:07:28 cgd Exp $	*/
+
+/*
+ * Plug-compatible replacement for getopt() for parsing tar-like
+ * arguments.  If the first argument begins with "-", it uses getopt;
+ * otherwise, it uses the old rules used by tar, dump, and ps.
+ *
+ * Written 25 August 1985 by John Gilmore (ihnp4!hoptoad!gnu) and placed
+ * in the Pubic Domain for your edification and enjoyment.
+ */
+
+#ifndef lint
+static const char rcsid[] = "$FreeBSD$";
+#endif /* not lint */
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+int
+getoldopt(argc, argv, optstring)
+	int	argc;
+	char	**argv;
+	char	*optstring;
+{
+	static char	*key;		/* Points to next keyletter */
+	static char	use_getopt;	/* !=0 if argv[1][0] was '-' */
+	char		c;
+	char		*place;
+
+	optarg = NULL;
+
+	if (key == NULL) {		/* First time */
+		if (argc < 2) return EOF;
+		key = argv[1];
+		if (*key == '-')
+			use_getopt++;
+		else
+			optind = 2;
+	}
+
+	if (use_getopt)
+		return getopt(argc, argv, optstring);
+
+	c = *key++;
+	if (c == '\0') {
+		key--;
+		return EOF;
+	}
+	place = strchr(optstring, c);
+
+	if (place == NULL || c == ':') {
+		fprintf(stderr, "%s: unknown option %c\n", argv[0], c);
+		return('?');
+	}
+
+	place++;
+	if (*place == ':') {
+		if (optind < argc) {
+			optarg = argv[optind];
+			optind++;
+		} else {
+			fprintf(stderr, "%s: %c argument missing\n",
+				argv[0], c);
+			return('?');
+		}
+	}
+
+	return(c);
+}
@@ -49,6 +49,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <errno.h>
 #ifdef NET2_REGEX
 #include <regexp.h>
 #else
@@ -98,7 +99,7 @@ static int resub __P((regex_t *, regmatch_t *, char *, char *, char *));
 *	the list of replacement patterns; -1 otherwise.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 rep_add(register char *str)
 #else
@@ -119,7 +120,7 @@ rep_add(str)
 	 * throw out the bad parameters
 	 */
 	if ((str == NULL) || (*str == '\0')) {
-		pax_warn(1, "Empty replacement string");
+		paxwarn(1, "Empty replacement string");
 		return(-1);
 	}

@@ -128,7 +129,7 @@ rep_add(str)
 	 * this expression
 	 */
 	if ((pt1 = strchr(str+1, *str)) == NULL) {
-		pax_warn(1, "Invalid replacement string %s", str);
+		paxwarn(1, "Invalid replacement string %s", str);
 		return(-1);
 	}

@@ -137,7 +138,7 @@ rep_add(str)
 	 * and split out the regular expression and try to compile it
 	 */
 	if ((rep = (REPLACE *)malloc(sizeof(REPLACE))) == NULL) {
-		pax_warn(1, "Unable to allocate memory for replacement string");
+		paxwarn(1, "Unable to allocate memory for replacement string");
 		return(-1);
 	}

@@ -147,7 +148,7 @@ rep_add(str)
 #	else
 	if ((res = regcomp(&(rep->rcmp), str+1, 0)) != 0) {
 		regerror(res, &(rep->rcmp), rebuf, sizeof(rebuf));
-		pax_warn(1, "%s while compiling regular expression %s", rebuf, str);
+		paxwarn(1, "%s while compiling regular expression %s", rebuf, str);
 #	endif
 		(void)free((char *)rep);
 		return(-1);
@@ -166,7 +167,7 @@ rep_add(str)
 		regfree(&(rep->rcmp));
 #		endif
 		(void)free((char *)rep);
-		pax_warn(1, "Invalid replacement string %s", str);
+		paxwarn(1, "Invalid replacement string %s", str);
 		return(-1);
 	}

@@ -196,7 +197,7 @@ rep_add(str)
 #			endif
 			(void)free((char *)rep);
 			*pt1 = *str;
-			pax_warn(1, "Invalid replacement string option %s", str);
+			paxwarn(1, "Invalid replacement string option %s", str);
 			return(-1);
 		}
 		++pt2;
@@ -226,13 +227,14 @@ rep_add(str)
 *	0 if the pattern was added to the list, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
-pat_add(char *str)
+pat_add(char *str, char *chdname)
 #else
 int
-pat_add(str)
+pat_add(str, chdname)
 	char *str;
+	char *chdname;
 #endif
 {
 	register PATTERN *pt;
@@ -241,7 +243,7 @@ pat_add(str)
 	 * throw out the junk
 	 */
 	if ((str == NULL) || (*str == '\0')) {
-		pax_warn(1, "Empty pattern string");
+		paxwarn(1, "Empty pattern string");
 		return(-1);
 	}

@@ -251,7 +253,7 @@ pat_add(str)
 	 * node to the end of the pattern list
 	 */
 	if ((pt = (PATTERN *)malloc(sizeof(PATTERN))) == NULL) {
-		pax_warn(1, "Unable to allocate memory for pattern string");
+		paxwarn(1, "Unable to allocate memory for pattern string");
 		return(-1);
 	}

@@ -260,6 +262,8 @@ pat_add(str)
 	pt->plen = strlen(str);
 	pt->fow = NULL;
 	pt->flgs = 0;
+	pt->chdname = chdname;
+
 	if (pathead == NULL) {
 		pattail = pathead = pt;
 		return(0);
@@ -275,7 +279,7 @@ pat_add(str)
 *	a selected archive member.
 */

-#if __STDC__
+#ifdef __STDC__
 void
 pat_chk(void)
 #else
@@ -294,7 +298,7 @@ pat_chk()
 		if (pt->flgs & MTCH)
 			continue;
 		if (!wban) {
-			pax_warn(1, "WARNING! These patterns were not matched:");
+			paxwarn(1, "WARNING! These patterns were not matched:");
 			++wban;
 		}
 		(void)fprintf(stderr, "%s\n", pt->pstr);
@@ -317,7 +321,7 @@ pat_chk()
 *	match, -1 otherwise.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 pat_sel(register ARCHD *arcn)
 #else
@@ -373,7 +377,7 @@ pat_sel(arcn)
 			*pt->pend = '\0';

 		if ((pt->pstr = strdup(arcn->name)) == NULL) {
-			pax_warn(1, "Pattern select out of memory");
+			paxwarn(1, "Pattern select out of memory");
 			if (pt->pend != NULL)
 				*pt->pend = '/';
 			pt->pend = NULL;
@@ -421,7 +425,7 @@ pat_sel(arcn)
 		/*
 		 * should never happen....
 		 */
-		pax_warn(1, "Pattern list inconsistant");
+		paxwarn(1, "Pattern list inconsistant");
 		return(-1);
 	}
 	*ppt = pt->fow;
@@ -442,7 +446,7 @@ pat_sel(arcn)
 *	looking for more members)
 */

-#if __STDC__
+#ifdef __STDC__
 int
 pat_match(register ARCHD *arcn)
 #else
@@ -520,7 +524,7 @@ pat_match(arcn)
 *	Note: *pend may be changed to show where the prefix ends.
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 fn_match(register char *pattern, register char *string, char **pend)
 #else
@@ -616,7 +620,7 @@ range_match(pattern, test)
 	int negate;
 	int ok = 0;

-	if ((negate = (*pattern == '!')))
+	if ((negate = (*pattern == '!')) != 0)
 		++pattern;

 	while ((c = *pattern++) != ']') {
@@ -651,7 +655,7 @@ range_match(pattern, test)
 *	0 continue to  process file, 1 skip this file, -1 pax is finished
 */

-#if __STDC__
+#ifdef __STDC__
 int
 mod_name(register ARCHD *arcn)
 #else
@@ -662,6 +666,38 @@ mod_name(arcn)
 {
 	register int res = 0;

+	/*
+	 * Strip off leading '/' if appropriate.
+	 * Currently, this option is only set for the tar format.
+	 */
+	if (rmleadslash && arcn->name[0] == '/') {
+		if (arcn->name[1] == '\0') {
+			arcn->name[0] = '.';
+		} else {
+			(void)memmove(arcn->name, &arcn->name[1],
+			    strlen(arcn->name));
+			arcn->nlen--;
+		}
+		if (rmleadslash < 2) {
+			rmleadslash = 2;
+			paxwarn(0, "Removing leading / from absolute path names in the archive");
+		}
+	}
+	if (rmleadslash && arcn->ln_name[0] == '/' &&
+	    (arcn->type == PAX_HLK || arcn->type == PAX_HRG)) {
+		if (arcn->ln_name[1] == '\0') {
+			arcn->ln_name[0] = '.';
+		} else {
+			(void)memmove(arcn->ln_name, &arcn->ln_name[1],
+			    strlen(arcn->ln_name));
+			arcn->ln_nlen--;
+		}
+		if (rmleadslash < 2) {
+			rmleadslash = 2;
+			paxwarn(0, "Removing leading / from absolute path names in the archive");
+		}
+	}
+
 	/*
 	 * IMPORTANT: We have a problem. what do we do with symlinks?
 	 * Modifying a hard link name makes sense, as we know the file it
@@ -703,7 +739,7 @@ mod_name(arcn)
 			return(res);
 		if ((arcn->type == PAX_SLK) || (arcn->type == PAX_HLK) ||
 		    (arcn->type == PAX_HRG))
-			sub_name(arcn->ln_name, &(arcn->ln_nlen));
+			sub_name(arcn->ln_name, &(arcn->ln_nlen), sizeof(arcn->ln_name));
 	}
 	return(res);
 }
@@ -718,7 +754,7 @@ mod_name(arcn)
 *	0 process this file, 1 skip this file, -1 we need to exit pax
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 tty_rename(register ARCHD *arcn)
 #else
@@ -775,8 +811,8 @@ tty_rename(arcn)
 	 */
 	tty_prnt("Processing continues, name changed to: %s\n", tmpname);
 	res = add_name(arcn->name, arcn->nlen, tmpname);
-	arcn->nlen = l_strncpy(arcn->name, tmpname, PAXPATHLEN+1);
-	arcn->name[PAXPATHLEN] = '\0';
+	arcn->nlen = l_strncpy(arcn->name, tmpname, sizeof(arcn->name) - 1);
+	arcn->name[arcn->nlen] = '\0';
 	if (res < 0)
 		return(-1);
 	return(0);
@@ -790,7 +826,7 @@ tty_rename(arcn)
 *	0 if ok, -1 if failure (name too long)
 */

-#if __STDC__
+#ifdef __STDC__
 int
 set_dest(register ARCHD *arcn, char *dest_dir, int dir_len)
 #else
@@ -825,7 +861,7 @@ set_dest(arcn, dest_dir, dir_len)
 *	0 if ok, -1 if the final name is too long
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 fix_path( char *or_name, int *or_len, char *dir_name, int dir_len)
 #else
@@ -856,7 +892,7 @@ fix_path(or_name, or_len, dir_name, dir_len)
 		--dest;
 	}
 	if ((len = dest - or_name) > PAXPATHLEN) {
-		pax_warn(1, "File name %s/%s, too long", dir_name, start);
+		paxwarn(1, "File name %s/%s, too long", dir_name, start);
 		return(-1);
 	}
 	*or_len = len;
@@ -897,7 +933,7 @@ fix_path(or_name, or_len, dir_name, dir_len)
 *	ended up empty)
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 rep_name(char *name, int *nlen, int prnt)
 #else
@@ -983,7 +1019,7 @@ rep_name(name, nlen, prnt)
 			    < 0) {
 #			endif
 				if (prnt)
-					pax_warn(1, "Replacement name error %s",
+					paxwarn(1, "Replacement name error %s",
 					    name);
 				return(1);
 			}
@@ -1034,7 +1070,7 @@ rep_name(name, nlen, prnt)
 		*outpt = '\0';
 		if ((outpt == endpt) && (*inpt != '\0')) {
 			if (prnt)
-				pax_warn(1,"Replacement name too long %s >> %s",
+				paxwarn(1,"Replacement name too long %s >> %s",
 				    name, nname);
 			return(1);
 		}
@@ -1071,7 +1107,7 @@ rep_name(name, nlen, prnt)
 *	-1 if error, or the number of characters added to the destination.
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 resub(regexp *prog, char *src, char *dest, register char *destend)
 #else
@@ -1129,7 +1165,7 @@ resub(prog, src, dest, destend)
 *	-1 if error, or the number of characters added to the destination.
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 resub(regex_t *rp, register regmatch_t *pm, char *src, char *dest,
 	register char *destend)
@@ -38,13 +38,13 @@
 .\"
 .Dd April 18, 1994
 .Dt PAX 1
-.Os BSD 4.4
+.Os
 .Sh NAME
 .Nm pax
 .Nd read and write file archives and copy directory hierarchies
 .Sh SYNOPSIS
 .Nm
-.Op Fl cdnv
+.Op Fl cdnvz
 .Bk -words
 .Op Fl f Ar archive
 .Ek
@@ -71,7 +71,7 @@
 .Op Ar pattern ...\&
 .Nm
 .Fl r
-.Op Fl cdiknuvDYZ
+.Op Fl cdiknuvzDYZ
 .Bk -words
 .Op Fl f Ar archive
 .Ek
@@ -107,7 +107,7 @@
 .Op Ar pattern ...\&
 .Nm
 .Fl w
-.Op Fl dituvHLPX
+.Op Fl dituvzHLPX
 .Bk -words
 .Op Fl b Ar blocksize
 .Ek
@@ -182,7 +182,7 @@
 .Nm Pax
 will read, write, and list the members of an archive file,
 and will copy directory hierarchies.
-.Nm Pax 
+.Nm Pax
 operation is independent of the specific archive format,
 and supports a wide variety of different archive formats.
 A list of supported archive formats can be found under the description of the
@@ -216,7 +216,7 @@ and is written using single line buffering.
 .Nm Pax
 extracts the members of the archive file read from the
 .Dv standard input ,
-with pathnames matching the specified 
+with pathnames matching the specified
 .Ar patterns .
 The archive format and blocking is automatically determined on input.
 When an extracted file is a directory, the entire file hierarchy
@@ -229,16 +229,16 @@ option.
 .It Fl w
 .Em Write .
 .Nm Pax
-writes an archive containing the 
+writes an archive containing the
 .Ar file
 operands to
 .Dv standard output
 using the specified archive format.
-When no 
+When no
 .Ar file
-operands are specified, a list of files to copy with one per line is read from 
+operands are specified, a list of files to copy with one per line is read from
 .Dv standard input .
-When a 
+When a
 .Ar file
 operand is also a directory, the entire file hierarchy rooted
 at that directory will be included.
@@ -249,7 +249,7 @@ copies the
 .Ar file
 operands to the destination
 .Ar directory .
-When no 
+When no
 .Ar file
 operands are specified, a list of files to copy with one per line is read from
 the
@@ -290,7 +290,6 @@ to locate and process the largest number of archive members possible (see the
 .Fl E
 option for more details on error handling).
 .Sh OPERANDS
-.Pp
 The
 .Ar directory
 operand specifies a destination directory pathname.
@@ -307,10 +306,10 @@ operand is used to select one or more pathnames of archive members.
 Archive members are selected using the pattern matching notation described
 by
 .Xr fnmatch 3 .
-When the 
+When the
 .Ar pattern
 operand is not supplied, all members of the archive will be selected.
-When a 
+When a
 .Ar pattern
 matches a directory, the entire file hierarchy rooted at that directory will
 be selected.
@@ -337,7 +336,6 @@ operand pathnames in a diagnostic message to
 .Dv standard error
 and then exit with a non-zero exit status.
 .Sh OPTIONS
-.Pp
 The following options are supported:
 .Bl -tag -width 4n
 .It Fl r
@@ -349,11 +347,11 @@ If any intermediate directories are needed in order to extract an archive
 member, these directories will be created as if
 .Xr mkdir 2
 was called with the bitwise inclusive
-.Dv OR 
+.Dv OR
 of
 .Dv S_IRWXU , S_IRWXG ,
 and
-.Dv S_IRWXO 
+.Dv S_IRWXO
 as the mode argument.
 When the selected archive format supports the specification of linked
 files and these files cannot be linked while the archive is being extracted,
@@ -380,7 +378,7 @@ If an archive format is not specified with a
 .Fl x
 option, the format currently being used in the archive will be selected.
 Any attempt to append to an archive in a format different from the
-format already used in the archive will cause 
+format already used in the archive will cause
 .Nm
 to exit immediately
 with a non-zero exit status.
@@ -403,7 +401,10 @@ block the output at a positive decimal integer number of
 bytes per write to the archive file.
 The
 .Ar blocksize
-must be a multiple of 512 bytes with a maximum of 32256 bytes.
+must be a multiple of 512 bytes with a maximum of 64512 bytes.
+Archives larger than 32256 bytes violate the
+.Tn POSIX
+standard and will not be portable to all systems.
 A
 .Ar blocksize
 can end with
@@ -418,7 +419,7 @@ can be separated by
 to indicate a product.
 A specific archive device may impose additional restrictions on the size
 of blocking it will support.
-When blocking is not specified, the default 
+When blocking is not specified, the default
 .Ar blocksize
 is dependent on the specific archive format being used (see the
 .Fl x
@@ -472,7 +473,7 @@ If this line consists of a single period, the
 file or archive member is processed with no modification to its name.
 Otherwise, its name is replaced with the contents of the line.
 .Nm Pax
-will immediately exit with a non-zero exit status if 
+will immediately exit with a non-zero exit status if
 .Dv <EOF>
 is encountered when reading a response or if
 .Pa /dev/tty
@@ -484,9 +485,8 @@ Link files.
 (The letter ell).
 In the
 .Em copy
-mode (
-.Fl r
-.Fl w ) ,
+mode
+.Pq Fl r w ,
 hard links are made between the source and destination file hierarchies
 whenever possible.
 .It Fl n
@@ -497,7 +497,7 @@ No more than one archive member is matched for each
 .Ar pattern .
 When members of type directory are matched, the file hierarchy rooted at that
 directory is also matched (unless
-.Fl d 
+.Fl d
 is also specified).
 .It Fl o Ar options
 Information to modify the algorithm for extracting or writing archive files
@@ -519,7 +519,7 @@ and
 .Cm p .
 Multiple characteristics can be concatenated within the same string
 and multiple
-.Fl p 
+.Fl p
 options can be specified.
 The meaning of the specification characters are as follows:
 .Bl -tag -width 2n
@@ -534,10 +534,10 @@ This is intended to be used by
 .Em root ,
 someone with all the appropriate privileges, in order to preserve all
 aspects of the files as they are recorded in the archive.
-The 
+The
 .Cm e
 flag is the sum of the
-.Cm o 
+.Cm o
 and
 .Cm p
 flags.
@@ -550,7 +550,7 @@ Preserve the user ID and group ID.
 .Sq Preserve
 the file mode bits.
 This intended to be used by a
-.Em user 
+.Em user
 with regular privileges who wants to preserve all aspects of the file other
 than the ownership.
 The file times are preserved by default, but two other flags are offered to
@@ -564,7 +564,7 @@ extracted file, subject to the permissions of the invoking
 process.
 Otherwise the attribute of the extracted file is determined as
 part of the normal file creation action.
-If neither the 
+If neither the
 .Cm e
 nor the
 .Cm o
@@ -572,7 +572,7 @@ specification character is specified, or the user ID and group ID are not
 preserved for any reason,
 .Nm
 will not set the
-.Dv S_ISUID 
+.Dv S_ISUID
 .Em ( setuid )
 and
 .Dv S_ISGID
@@ -670,13 +670,13 @@ the output has the format:
 .Dl <ls -l listing> == <link name>
 For pathnames representing a symbolic link, the output has the format:
 .Dl <ls -l listing> => <link name>
-Where <ls -l listing> is the output format specified by the 
+Where <ls -l listing> is the output format specified by the
 .Xr ls 1
 utility when used with the
 .Fl l
 option.
-Otherwise for all the other operational modes (
-.Em read , write ,
+Otherwise for all the other operational modes
+.Em ( read , write ,
 and
 .Em copy ) ,
 pathnames are written and flushed to
@@ -727,7 +727,10 @@ by this format) which may be truncated by this format is detected by
 .Nm
 and is repaired.
 .It Ar tar
-The old BSD tar format as found in BSD4.3.
+The old
+.Bx
+tar format as found in
+.Bx 4.3 .
 The default blocksize for this format is 10240 bytes.
 Pathnames stored by this format must be 100 characters or less in length.
 Only
@@ -756,6 +759,12 @@ as the result of any specific archive format restrictions.
 The individual archive formats may impose additional restrictions on use.
 Typical archive format restrictions include (but are not limited to):
 file pathname length, file size, link pathname length and the type of the file.
+.It Fl z
+Use
+.Xr gzip 1
+to compress (decompress) the archive while writing (reading).
+Incompatible with
+.Fl a .
 .It Fl B Ar bytes
 Limit the number of bytes written to a single archive volume to
 .Ar bytes .
@@ -776,7 +785,7 @@ to indicate a product.
 .Em Warning :
 Only use this option when writing an archive to a device which supports
 an end of file read condition based on last (or largest) write offset
-(such as a regular file or a tape drive). 
+(such as a regular file or a tape drive).
 The use of this option with a floppy or hard disk is not recommended.
 .It Fl D
 This option is the same as the
@@ -807,7 +816,7 @@ of
 will cause
 .Nm
 to attempt to recover from read errors forever.
-The default 
+The default
 .Ar limit
 is a small positive number of retries.
 .Pp
@@ -825,7 +834,7 @@ name, or when starting with a
 a numeric gid.
 A '\\' can be used to escape the
 .Cm # .
-Multiple 
+Multiple
 .Fl G
 options may be supplied and checking stops with the first match.
 .It Fl H
@@ -838,12 +847,12 @@ Do not follow symbolic links, perform a physical file system traversal.
 This is the default mode.
 .It Fl T Ar [from_date][,to_date][/[c][m]]
 Allow files to be selected based on a file modification or inode change
-time falling within a specified time range of 
+time falling within a specified time range of
 .Ar from_date
 to
 .Ar to_date
 (the dates are inclusive).
-If only a 
+If only a
 .Ar from_date
 is supplied, all files with a modification or inode change time
 equal to or younger are selected.
@@ -851,7 +860,7 @@ If only a
 .Ar to_date
 is supplied, all files with a modification or inode change time
 equal to or older will be selected.
-When the 
+When the
 .Ar from_date
 is equal to the
 .Ar to_date ,
@@ -860,7 +869,7 @@ time will be selected.
 .Pp
 When
 .Nm
-is in the 
+is in the
 .Em write
 or
 .Em copy
@@ -877,7 +886,7 @@ The
 .Ar c
 specifies the comparison of inode change time (the time when the file
 inode was last changed; e.g. a change of owner, group, mode, etc).
-When 
+When
 .Ar c
 and
 .Ar m
@@ -918,14 +927,14 @@ The minute field
 is required, while the other fields are optional and must be added in the
 following order:
 .Dl Cm hh , dd , mm , yy .
-The 
+The
 .Cm ss
 field may be added independently of the other fields.
 Time ranges are relative to the current time, so
 .Dl Fl T Ar 1234/cm
 would select all files with a modification or inode change time
 of 12:34 PM today or later.
-Multiple 
+Multiple
 .Fl T
 time range can be supplied and checking stops with the first match.
 .It Fl U Ar user
@@ -936,14 +945,14 @@ name, or when starting with a
 a numeric uid.
 A '\\' can be used to escape the
 .Cm # .
-Multiple 
+Multiple
 .Fl U
 options may be supplied and checking stops with the first match.
 .It Fl X
 When traversing the file hierarchy specified by a pathname,
 do not descend into directories that have a different device ID.
 See the
-.Li st_dev 
+.Li st_dev
 field as described in
 .Xr stat 2
 for more information about device ID's.
@@ -959,8 +968,8 @@ option, except that the modification time is checked using the
 pathname created after all the file name modifications have completed.
 .El
 .Pp
-The options that operate on the names of files or archive members (
-.Fl c ,
+The options that operate on the names of files or archive members
+.Fl ( c ,
 .Fl i ,
 .Fl n ,
 .Fl s ,
@@ -998,7 +1007,7 @@ Then the
 and
 .Fl Z
 options will be applied based on the final pathname.
-Finally the 
+Finally the
 .Fl v
 option will write the names resulting from these modifications.
 .Pp
@@ -1014,13 +1023,13 @@ based only on the user specified pathnames as modified by the
 .Fl D ,
 .Fl G ,
 .Fl T ,
-and 
+and
 .Fl U
 options (the
 .Fl D
 option only applies during a copy operation).
 Then any
-.Fl s 
+.Fl s
 and
 .Fl i
 options will modify in that order, the names of these selected files.
@@ -1065,7 +1074,7 @@ directory hierarchy to
 .Pp
 The command:
 .Dl pax -r -s ',^//*usr//*,,' -f a.pax
-reads the archive 
+reads the archive
 .Pa a.pax ,
 with all files rooted in ``/usr'' into the archive extracted relative to the
 current directory.
@@ -1100,6 +1109,7 @@ utility is a superset of the
 .St -p1003.2
 standard.
 The options
+.Fl z ,
 .Fl B ,
 .Fl D ,
 .Fl E ,
@@ -1123,6 +1133,14 @@ and
 operations are extensions to the
 .Tn POSIX
 standard.
+.Sh SEE ALSO
+.Xr cpio 1 ,
+.Xr tar 1
+.Sh HISTORY
+The
+.Nm
+utility appeared in
+.Bx 4.4 .
 .Sh AUTHORS
 .An Keith Muller
 at the University of California, San Diego
@@ -1132,7 +1150,7 @@ will exit with one of the following values:
 .Bl -tag -width 2n
 .It 0
 All files were processed successfully.
-.It 1 
+.It 1
 An error occurred.
 .El
 .Pp
@@ -53,11 +53,15 @@ static const char rcsid[] =
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/resource.h>
+#include <err.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <locale.h>
+#include <paths.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include "pax.h"
 #include "extern.h"
@@ -73,6 +77,7 @@ static int gen_init __P((void));
 int	act = DEFOP;		/* read/write/append/copy */
 FSUB	*frmt = NULL;		/* archive format type */
 int	cflag;			/* match all EXCEPT pattern/file */
+int	cwdfd;			/* starting cwd */
 int	dflag;			/* directory member match only  */
 int	iflag;			/* interactive file/archive rename */
 int	kflag;			/* do not overwrite existing files */
@@ -90,13 +95,18 @@ int	Zflag;			/* same as uflg except after name mode */
 int	vfpart;			/* is partial verbose output in progress */
 int	patime = 1;		/* preserve file access time */
 int	pmtime = 1;		/* preserve file modification times */
+int	nodirs;			/* do not create directories as needed */
 int	pmode;			/* preserve file mode bits */
 int	pids;			/* preserve file uid/gid */
+int	rmleadslash = 0;	/* remove leading '/' from pathnames */
 int	exit_val;		/* exit value */
 int	docrc;			/* check/create file crc */
 char	*dirptr;		/* destination dir in a copy */
 char	*argv0;			/* root of argv[0] */
 sigset_t s_mask;		/* signal mask for cleanup critical sect */
+FILE	*listf = stderr;	/* file pointer to print file list to */
+char	*tempfile;		/* tempfile to use for mkstemp(3) */
+char	*tempbase;		/* basename of tempfile to use for mkstemp(3) */

 /*
 *	PAX - Portable Archive Interchange
@@ -218,7 +228,7 @@ sigset_t s_mask;		/* signal mask for cleanup critical sect */
 * Return: 0 if ok, 1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 main(int argc, char **argv)
 #else
@@ -228,12 +238,42 @@ main(argc, argv)
 	char **argv;
 #endif
 {
+	char *tmpdir;
+	size_t tdlen;
+
 	(void) setlocale(LC_ALL, "");
+	/*
+	 * Keep a reference to cwd, so we can always come back home.
+	 */
+	cwdfd = open(".", O_RDONLY);
+	if (cwdfd < 0) {
+		syswarn(0, errno, "Can't open current working directory.");
+		return(exit_val);
+	}
+
+	/*
+	 * Where should we put temporary files?
+	 */
+	if ((tmpdir = getenv("TMPDIR")) == NULL || *tmpdir == '\0')
+		tmpdir = _PATH_TMP;
+	tdlen = strlen(tmpdir);
+	while(tdlen > 0 && tmpdir[tdlen - 1] == '/')
+		tdlen--;
+	tempfile = malloc(tdlen + 1 + sizeof(_TFILE_BASE));
+	if (tempfile == NULL) {
+		paxwarn(1, "Cannot allocate memory for temp file name.");
+		return(exit_val);
+	}
+	if (tdlen)
+		memcpy(tempfile, tmpdir, tdlen);
+	tempbase = tempfile + tdlen;
+	*tempbase++ = '/';
+
 	/*
 	 * parse options, determine operational mode, general init
 	 */
 	options(argc, argv);
-        if ((gen_init() < 0) || (tty_init() < 0))
+	if ((gen_init() < 0) || (tty_init() < 0))
 		return(exit_val);

 	/*
@@ -247,6 +287,8 @@ main(argc, argv)
 		archive();
 		break;
 	case APPND:
+		if (gzip_program != NULL)
+			err(1, "can not gzip while appending");
 		append();
 		break;
 	case COPY:
@@ -269,7 +311,7 @@ main(argc, argv)
 *	never....
 */

-#if __STDC__
+#ifdef __STDC__
 void
 sig_cleanup(int which_sig)
 #else
@@ -285,9 +327,9 @@ sig_cleanup(which_sig)
 	 */
 	vflag = vfpart = 1;
 	if (which_sig == SIGXCPU)
-		pax_warn(0, "Cpu time limit reached, cleaning up.");
+		paxwarn(0, "Cpu time limit reached, cleaning up.");
 	else
-		pax_warn(0, "Signal caught, cleaning up.");
+		paxwarn(0, "Signal caught, cleaning up.");

 	ar_close();
 	proc_dir();
@@ -302,7 +344,7 @@ sig_cleanup(which_sig)
 *	when dealing with a medium to large sized archives.
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 gen_init(void)
 #else
@@ -358,9 +400,10 @@ gen_init()
 	    (sigaddset(&s_mask,SIGINT) < 0)||(sigaddset(&s_mask,SIGHUP) < 0) ||
 	    (sigaddset(&s_mask,SIGPIPE) < 0)||(sigaddset(&s_mask,SIGQUIT)<0) ||
 	    (sigaddset(&s_mask,SIGXCPU) < 0)||(sigaddset(&s_mask,SIGXFSZ)<0)) {
-		pax_warn(1, "Unable to set up signal mask");
+		paxwarn(1, "Unable to set up signal mask");
 		return(-1);
 	}
+	memset(&n_hand, 0, sizeof n_hand);
 	n_hand.sa_mask = s_mask;
 	n_hand.sa_flags = 0;
 	n_hand.sa_handler = sig_cleanup;
@@ -397,6 +440,6 @@ gen_init()
 	return(0);

    out:
-	sys_warn(1, errno, "Unable to set up signal handler");
+	syswarn(1, errno, "Unable to set up signal handler");
 	return(-1);
 }
@@ -42,15 +42,16 @@
 * BSD PAX global data structures and constants.
 */

-#define	MAXBLK		32256	/* MAX blocksize supported (posix SPEC) */
+#define	MAXBLK		64512	/* MAX blocksize supported (posix SPEC) */
 				/* WARNING: increasing MAXBLK past 32256 */
 				/* will violate posix spec. */
+#define	MAXBLK_POSIX	32256	/* MAX blocksize supported as per POSIX */
 #define BLKMULT		512	/* blocksize must be even mult of 512 bytes */
 				/* Don't even think of changing this */
 #define DEVBLK		8192	/* default read blksize for devices */
 #define FILEBLK		10240	/* default read blksize for files */
 #define PAXPATHLEN	3072	/* maximum path length for pax. MUST be */
-				/* longer than the system MAXPATHLEN */
+				/* longer than the system PATH_MAX */

 /*
 * Pax modes of operation
@@ -87,7 +88,7 @@ typedef struct {
 	int bsz;		/* default block size. used when the user */
 				/* does not specify a blocksize for writing */
 				/* Appends continue to with the blocksize */
-				/* the archive is currently using.*/
+				/* the archive is currently using. */
 	int hsz;		/* Header size in bytes. this is the size of */
 				/* the smallest header this format supports. */
 				/* Headers are assumed to fit in a BLKMULT. */
@@ -164,6 +165,7 @@ typedef struct {
 typedef struct pattern {
 	char		*pstr;		/* pattern to match, user supplied */
 	char		*pend;		/* end of a prefix match */
+	char		*chdname;	/* the dir to change to if not NULL.  */
 	int		plen;		/* length of pstr */
 	int		flgs;		/* processing/state flags */
 #define MTCH		0x1		/* pattern has been matched */
@@ -225,7 +227,7 @@ typedef struct oplist {
 * General Macros
 */
 #ifndef MIN
-#define        MIN(a,b) (((a)<(b))?(a):(b))
+#define	       MIN(a,b) (((a)<(b))?(a):(b))
 #endif
 #define MAJOR(x)	major(x)
 #define MINOR(x)	minor(x)
@@ -234,6 +236,7 @@ typedef struct oplist {
 /*
 * General Defines
 */
-#define HEX	16
-#define OCT	8
-#define _PAX_	1
+#define HEX		16
+#define OCT		8
+#define _PAX_		1
+#define _TFILE_BASE	"paxXXXXXXXXXX"
@@ -78,7 +78,7 @@ static GRPT **grptb = NULL;		/* group selection table */
 *	0 if this archive member should be processed, 1 if it should be skipped
 */

-#if __STDC__
+#ifdef __STDC__
 int
 sel_chk(register ARCHD *arcn)
 #else
@@ -109,7 +109,7 @@ sel_chk(arcn)
 *	0 if added ok, -1 otherwise;
 */

-#if __STDC__
+#ifdef __STDC__
 int
 usr_add(register char *str)
 #else
@@ -130,8 +130,8 @@ usr_add(str)
 		return(-1);
 	if ((usrtb == NULL) &&
 	    ((usrtb = (USRT **)calloc(USR_TB_SZ, sizeof(USRT *))) == NULL)) {
-                pax_warn(1, "Unable to allocate memory for user selection table");
-                return(-1);
+		paxwarn(1, "Unable to allocate memory for user selection table");
+		return(-1);
 	}

 	/*
@@ -144,15 +144,15 @@ usr_add(str)
 		if ((str[0] == '\\') && (str[1] == '#'))
 			++str;
 		if ((pw = getpwnam(str)) == NULL) {
-                	pax_warn(1, "Unable to find uid for user: %s", str);
-                	return(-1);
+			paxwarn(1, "Unable to find uid for user: %s", str);
+			return(-1);
 		}
 		uid = (uid_t)pw->pw_uid;
-        } else
+	} else
 #		ifdef NET2_STAT
 		uid = (uid_t)atoi(str+1);
 #		else
-		uid = (uid_t)strtoul(str+1, (char **)NULL, 10);
+		uid = (uid_t)strtoul(str+1, NULL, 10);
 #		endif
 	endpwent();

@@ -161,11 +161,11 @@ usr_add(str)
 	 */
 	indx = ((unsigned)uid) % USR_TB_SZ;
 	if ((pt = usrtb[indx]) != NULL) {
-                while (pt != NULL) {
-                        if (pt->uid == uid)
+		while (pt != NULL) {
+			if (pt->uid == uid)
 				return(0);
-                        pt = pt->fow;
-                }
+			pt = pt->fow;
+		}
 	}

 	/*
@@ -177,8 +177,8 @@ usr_add(str)
 		usrtb[indx] = pt;
 		return(0);
 	}
-        pax_warn(1, "User selection table out of memory");
-        return(-1);
+	paxwarn(1, "User selection table out of memory");
+	return(-1);
 }

 /*
@@ -188,7 +188,7 @@ usr_add(str)
 *	0 if this archive member should be processed, 1 if it should be skipped
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 usr_match(register ARCHD *arcn)
 #else
@@ -222,7 +222,7 @@ usr_match(arcn)
 *	0 if added ok, -1 otherwise;
 */

-#if __STDC__
+#ifdef __STDC__
 int
 grp_add(register char *str)
 #else
@@ -243,8 +243,8 @@ grp_add(str)
 		return(-1);
 	if ((grptb == NULL) &&
 	    ((grptb = (GRPT **)calloc(GRP_TB_SZ, sizeof(GRPT *))) == NULL)) {
-                pax_warn(1, "Unable to allocate memory fo group selection table");
-                return(-1);
+		paxwarn(1, "Unable to allocate memory fo group selection table");
+		return(-1);
 	}

 	/*
@@ -257,15 +257,15 @@ grp_add(str)
 		if ((str[0] == '\\') && (str[1] == '#'))
 			++str;
 		if ((gr = getgrnam(str)) == NULL) {
-                	pax_warn(1,"Cannot determine gid for group name: %s", str);
-                	return(-1);
+			paxwarn(1,"Cannot determine gid for group name: %s", str);
+			return(-1);
 		}
 		gid = (gid_t)gr->gr_gid;
-        } else
+	} else
 #		ifdef NET2_STAT
 		gid = (gid_t)atoi(str+1);
 #		else
-		gid = (gid_t)strtoul(str+1, (char **)NULL, 10);
+		gid = (gid_t)strtoul(str+1, NULL, 10);
 #		endif
 	endgrent();

@@ -274,11 +274,11 @@ grp_add(str)
 	 */
 	indx = ((unsigned)gid) % GRP_TB_SZ;
 	if ((pt = grptb[indx]) != NULL) {
-                while (pt != NULL) {
-                        if (pt->gid == gid)
+		while (pt != NULL) {
+			if (pt->gid == gid)
 				return(0);
-                        pt = pt->fow;
-                }
+			pt = pt->fow;
+		}
 	}

 	/*
@@ -290,8 +290,8 @@ grp_add(str)
 		grptb[indx] = pt;
 		return(0);
 	}
-        pax_warn(1, "Group selection table out of memory");
-        return(-1);
+	paxwarn(1, "Group selection table out of memory");
+	return(-1);
 }

 /*
@@ -301,7 +301,7 @@ grp_add(str)
 *	0 if this archive member should be processed, 1 if it should be skipped
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 grp_match(register ARCHD *arcn)
 #else
@@ -357,7 +357,7 @@ grp_match(arcn)
 *	0 if the time range was added to the list, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 trng_add(register char *str)
 #else
@@ -376,14 +376,14 @@ trng_add(str)
 	 * throw out the badly formed time ranges
 	 */
 	if ((str == NULL) || (*str == '\0')) {
-		pax_warn(1, "Empty time range string");
+		paxwarn(1, "Empty time range string");
 		return(-1);
 	}

 	/*
 	 * locate optional flags suffix /{cm}.
 	 */
-	if ((flgpt = rindex(str, '/')) != NULL)
+	if ((flgpt = strrchr(str, '/')) != NULL)
 		*flgpt++ = '\0';

 	for (stpt = str; *stpt != '\0'; ++stpt) {
@@ -403,7 +403,7 @@ trng_add(str)
 			++dot;
 			continue;
 		}
-		pax_warn(1, "Improperly specified time range: %s", str);
+		paxwarn(1, "Improperly specified time range: %s", str);
 		goto out;
 	}

@@ -411,7 +411,7 @@ trng_add(str)
 	 * allocate space for the time range and store the limits
 	 */
 	if ((pt = (TIME_RNG *)malloc(sizeof(TIME_RNG))) == NULL) {
-		pax_warn(1, "Unable to allocate memory for time range");
+		paxwarn(1, "Unable to allocate memory for time range");
 		return(-1);
 	}

@@ -434,7 +434,7 @@ trng_add(str)
 				pt->flgs |= CMPCTME;
 				break;
 			default:
-				pax_warn(1, "Bad option %c with time range %s",
+				paxwarn(1, "Bad option %c with time range %s",
 				    *flgpt, str);
 				goto out;
 			}
@@ -445,13 +445,13 @@ trng_add(str)
 	/*
 	 * start off with the current time
 	 */
-	pt->low_time = pt->high_time = time((time_t *)NULL);
+	pt->low_time = pt->high_time = time(NULL);
 	if (*str != '\0') {
 		/*
 		 * add lower limit
 		 */
 		if (str_sec(str, &(pt->low_time)) < 0) {
-			pax_warn(1, "Illegal lower time range %s", str);
+			paxwarn(1, "Illegal lower time range %s", str);
 			(void)free((char *)pt);
 			goto out;
 		}
@@ -463,7 +463,7 @@ trng_add(str)
 		 * add upper limit
 		 */
 		if (str_sec(up_pt, &(pt->high_time)) < 0) {
-			pax_warn(1, "Illegal upper time range %s", up_pt);
+			paxwarn(1, "Illegal upper time range %s", up_pt);
 			(void)free((char *)pt);
 			goto out;
 		}
@@ -474,7 +474,7 @@ trng_add(str)
 		 */
 		if (pt->flgs & HASLOW) {
 			if (pt->low_time > pt->high_time) {
-				pax_warn(1, "Upper %s and lower %s time overlap",
+				paxwarn(1, "Upper %s and lower %s time overlap",
 					up_pt, str);
 				(void)free((char *)pt);
 				return(-1);
@@ -492,7 +492,7 @@ trng_add(str)
 	return(0);

    out:
-	pax_warn(1, "Time range format is: [yy[mm[dd[hh]]]]mm[.ss][/[c][m]]");
+	paxwarn(1, "Time range format is: [yy[mm[dd[hh]]]]mm[.ss][/[c][m]]");
 	return(-1);
 }

@@ -503,7 +503,7 @@ trng_add(str)
 *	0 if this archive member should be processed, 1 if it should be skipped
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 trng_match(register ARCHD *arcn)
 #else
@@ -578,7 +578,7 @@ trng_match(arcn)
 *	0 if converted ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 str_sec(register char *str, time_t *tval)
 #else
@@ -592,7 +592,7 @@ str_sec(str, tval)
 	register char *dot = NULL;

 	lt = localtime(tval);
-	if ((dot = index(str, '.')) != NULL) {
+	if ((dot = strchr(str, '.')) != NULL) {
 		/*
 		 * seconds (.ss)
 		 */
@@ -105,7 +105,7 @@ static DEVT *chk_dev __P((dev_t, int));
 *	0 if created, -1 if failure
 */

-#if __STDC__
+#ifdef __STDC__
 int
 lnk_start(void)
 #else
@@ -116,9 +116,9 @@ lnk_start()
 	if (ltab != NULL)
 		return(0);
 	if ((ltab = (HRDLNK **)calloc(L_TAB_SZ, sizeof(HRDLNK *))) == NULL) {
-                pax_warn(1, "Cannot allocate memory for hard link table");
-                return(-1);
-        }
+		paxwarn(1, "Cannot allocate memory for hard link table");
+		return(-1);
+	}
 	return(0);
 }

@@ -134,7 +134,7 @@ lnk_start()
 *	if found returns 1; if not found returns 0; -1 on error
 */

-#if __STDC__
+#ifdef __STDC__
 int
 chk_lnk(register ARCHD *arcn)
 #else
@@ -180,8 +180,8 @@ chk_lnk(arcn)
 			 * other links.
 			 */
 			arcn->ln_nlen = l_strncpy(arcn->ln_name, pt->name,
-				PAXPATHLEN+1);
-			arcn->ln_name[PAXPATHLEN] = '\0';
+				sizeof(arcn->ln_name) - 1);
+			arcn->ln_name[arcn->ln_nlen] = '\0';
 			if (arcn->type == PAX_REG)
 				arcn->type = PAX_HRG;
 			else
@@ -216,7 +216,7 @@ chk_lnk(arcn)
 		(void)free((char *)pt);
 	}

-	pax_warn(1, "Hard link table out of memory");
+	paxwarn(1, "Hard link table out of memory");
 	return(-1);
 }

@@ -227,7 +227,7 @@ chk_lnk(arcn)
 *	we do not want to accidently point another file at it later on.
 */

-#if __STDC__
+#ifdef __STDC__
 void
 purg_lnk(register ARCHD *arcn)
 #else
@@ -287,7 +287,7 @@ purg_lnk(arcn)
 *	write phase
 */

-#if __STDC__
+#ifdef __STDC__
 void
 lnk_end(void)
 #else
@@ -352,7 +352,7 @@ lnk_end()
 *	0 if the table and file was created ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ftime_start(void)
 #else
@@ -360,29 +360,26 @@ int
 ftime_start()
 #endif
 {
-	char *pt;

 	if (ftab != NULL)
 		return(0);
 	if ((ftab = (FTM **)calloc(F_TAB_SZ, sizeof(FTM *))) == NULL) {
-                pax_warn(1, "Cannot allocate memory for file time table");
-                return(-1);
-        }
+		paxwarn(1, "Cannot allocate memory for file time table");
+		return(-1);
+	}

 	/*
 	 * get random name and create temporary scratch file, unlink name
 	 * so it will get removed on exit
 	 */
-	if ((pt = tempnam((char *)NULL, (char *)NULL)) == NULL)
-		return(-1);
-	(void)unlink(pt);
-
-	if ((ffd = open(pt, O_RDWR | O_CREAT,  S_IRWXU)) < 0) {
-		sys_warn(1, errno, "Unable to open temporary file: %s", pt);
+	memcpy(tempbase, _TFILE_BASE, sizeof(_TFILE_BASE));
+	if ((ffd = mkstemp(tempfile)) < 0) {
+		syswarn(1, errno, "Unable to create temporary file: %s",
+		    tempfile);
 		return(-1);
 	}
+	(void)unlink(tempfile);

-	(void)unlink(pt);
 	return(0);
 }

@@ -398,7 +395,7 @@ ftime_start()
 *	-1 on error
 */

-#if __STDC__
+#ifdef __STDC__
 int
 chk_ftime(register ARCHD *arcn)
 #else
@@ -436,12 +433,12 @@ chk_ftime(arcn)
 				 * from the scratch file.
 				 */
 				if (lseek(ffd,pt->seek,SEEK_SET) != pt->seek) {
-					sys_warn(1, errno,
+					syswarn(1, errno,
 					    "Failed ftime table seek");
 					return(-1);
 				}
 				if (read(ffd, ckname, namelen) != namelen) {
-					sys_warn(1, errno,
+					syswarn(1, errno,
 					    "Failed ftime table read");
 					return(-1);
 				}
@@ -493,11 +490,11 @@ chk_ftime(arcn)
 				ftab[indx] = pt;
 				return(0);
 			}
-			sys_warn(1, errno, "Failed write to file time table");
+			syswarn(1, errno, "Failed write to file time table");
 		} else
-			sys_warn(1, errno, "Failed seek on file time table");
+			syswarn(1, errno, "Failed seek on file time table");
 	} else
-		pax_warn(1, "File time table ran out of memory");
+		paxwarn(1, "File time table ran out of memory");

 	if (pt != NULL)
 		(void)free((char *)pt);
@@ -523,7 +520,7 @@ chk_ftime(arcn)
 *	0 if successful, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 name_start(void)
 #else
@@ -534,9 +531,9 @@ name_start()
 	if (ntab != NULL)
 		return(0);
 	if ((ntab = (NAMT **)calloc(N_TAB_SZ, sizeof(NAMT *))) == NULL) {
-                pax_warn(1, "Cannot allocate memory for interactive rename table");
-                return(-1);
-        }
+		paxwarn(1, "Cannot allocate memory for interactive rename table");
+		return(-1);
+	}
 	return(0);
 }

@@ -549,7 +546,7 @@ name_start()
 *	0 if added, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 add_name(register char *oname, int onamelen, char *nname)
 #else
@@ -567,7 +564,7 @@ add_name(oname, onamelen, nname)
 		/*
 		 * should never happen
 		 */
-		pax_warn(0, "No interactive rename table, links may fail\n");
+		paxwarn(0, "No interactive rename table, links may fail\n");
 		return(0);
 	}

@@ -593,7 +590,7 @@ add_name(oname, onamelen, nname)

 			(void)free((char *)pt->nname);
 			if ((pt->nname = strdup(nname)) == NULL) {
-				pax_warn(1, "Cannot update rename table");
+				paxwarn(1, "Cannot update rename table");
 				return(-1);
 			}
 			return(0);
@@ -614,7 +611,7 @@ add_name(oname, onamelen, nname)
 		}
 		(void)free((char *)pt);
 	}
-	pax_warn(1, "Interactive rename table out of memory");
+	paxwarn(1, "Interactive rename table out of memory");
 	return(-1);
 }

@@ -625,14 +622,15 @@ add_name(oname, onamelen, nname)
 *	new name (oname is the link to name)
 */

-#if __STDC__
+#ifdef __STDC__
 void
-sub_name(register char *oname, int *onamelen)
+sub_name(register char *oname, int *onamelen, size_t onamesize)
 #else
 void
-sub_name(oname, onamelen)
+sub_name(oname, onamelen, onamesize)
 	register char *oname;
 	int *onamelen;
+	size_t onamesize;
 #endif
 {
 	register NAMT *pt;
@@ -649,15 +647,15 @@ sub_name(oname, onamelen)

 	while (pt != NULL) {
 		/*
-		 * walk down the hash cahin looking for a match
+		 * walk down the hash chain looking for a match
 		 */
 		if (strcmp(oname, pt->oname) == 0) {
 			/*
 			 * found it, replace it with the new name
 			 * and return (we know that oname has enough space)
 			 */
-			*onamelen = l_strncpy(oname, pt->nname, PAXPATHLEN+1);
-			oname[PAXPATHLEN] = '\0';
+			*onamelen = l_strncpy(oname, pt->nname, onamesize - 1);
+			oname[*onamelen] = '\0';
 			return;
 		}
 		pt = pt->fow;
@@ -716,7 +714,7 @@ sub_name(oname, onamelen)
 *	0 if successful, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 dev_start(void)
 #else
@@ -727,9 +725,9 @@ dev_start()
 	if (dtab != NULL)
 		return(0);
 	if ((dtab = (DEVT **)calloc(D_TAB_SZ, sizeof(DEVT *))) == NULL) {
-                pax_warn(1, "Cannot allocate memory for device mapping table");
-                return(-1);
-        }
+		paxwarn(1, "Cannot allocate memory for device mapping table");
+		return(-1);
+	}
 	return(0);
 }

@@ -743,7 +741,7 @@ dev_start()
 *	0 if added ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 add_dev(register ARCHD *arcn)
 #else
@@ -770,7 +768,7 @@ add_dev(arcn)
 *	is returned (indicates an error).
 */

-#if __STDC__
+#ifdef __STDC__
 static DEVT *
 chk_dev(dev_t dev, int add)
 #else
@@ -813,7 +811,7 @@ chk_dev(dev, add)
 	 * list must be NULL.
 	 */
 	if ((pt = (DEVT *)malloc(sizeof(DEVT))) == NULL) {
-		pax_warn(1, "Device map table out of memory");
+		paxwarn(1, "Device map table out of memory");
 		return(NULL);
 	}
 	pt->dev = dev;
@@ -835,7 +833,7 @@ chk_dev(dev, add)
 *	0 if all ok, -1 otherwise.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 map_dev(register ARCHD *arcn, u_long dev_mask, u_long ino_mask)
 #else
@@ -955,9 +953,9 @@ map_dev(arcn, dev_mask, ino_mask)
 	return(0);

    bad:
-	pax_warn(1, "Unable to fix truncated inode/device field when storing %s",
+	paxwarn(1, "Unable to fix truncated inode/device field when storing %s",
 	    arcn->name);
-	pax_warn(0, "Archive may create improper hard links when extracted");
+	paxwarn(0, "Archive may create improper hard links when extracted");
 	return(0);
 }

@@ -985,7 +983,7 @@ map_dev(arcn, dev_mask, ino_mask)
 *	0 is created ok, -1 otherwise.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 atdir_start(void)
 #else
@@ -996,9 +994,9 @@ atdir_start()
 	if (atab != NULL)
 		return(0);
 	if ((atab = (ATDIR **)calloc(A_TAB_SZ, sizeof(ATDIR *))) == NULL) {
-                pax_warn(1,"Cannot allocate space for directory access time table");
-                return(-1);
-        }
+		paxwarn(1,"Cannot allocate space for directory access time table");
+		return(-1);
+	}
 	return(0);
 }

@@ -1010,7 +1008,7 @@ atdir_start()
 *	entries are for directories READ by pax
 */

-#if __STDC__
+#ifdef __STDC__
 void
 atdir_end(void)
 #else
@@ -1046,7 +1044,7 @@ atdir_end()
 *	and chained by inode number. This is for directories READ by pax
 */

-#if __STDC__
+#ifdef __STDC__
 void
 add_atdir(char *fname, dev_t dev, ino_t ino, time_t mtime, time_t atime)
 #else
@@ -1103,7 +1101,7 @@ add_atdir(fname, dev, ino, mtime, atime)
 		(void)free((char *)pt);
 	}

-	pax_warn(1, "Directory access time reset table ran out of memory");
+	paxwarn(1, "Directory access time reset table ran out of memory");
 	return;
 }

@@ -1118,7 +1116,7 @@ add_atdir(fname, dev, ino, mtime, atime)
 *	0 if found, -1 if not found.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 get_atdir(dev_t dev, ino_t ino, time_t *mtime, time_t *atime)
 #else
@@ -1202,7 +1200,7 @@ get_atdir(dev, ino, mtime, atime)
 *	0 if ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 dir_start(void)
 #else
@@ -1210,22 +1208,20 @@ int
 dir_start()
 #endif
 {
-	char *pt;

 	if (dirfd != -1)
 		return(0);
-	if ((pt = tempnam((char *)NULL, (char *)NULL)) == NULL)
-		return(-1);

 	/*
 	 * unlink the file so it goes away at termination by itself
 	 */
-	(void)unlink(pt);
-	if ((dirfd = open(pt, O_RDWR|O_CREAT, 0600)) >= 0) {
-		(void)unlink(pt);
+	memcpy(tempbase, _TFILE_BASE, sizeof(_TFILE_BASE));
+	if ((dirfd = mkstemp(tempfile)) >= 0) {
+		(void)unlink(tempfile);
 		return(0);
 	}
-	pax_warn(1, "Unable to create temporary file for directory times: %s", pt);
+	paxwarn(1, "Unable to create temporary file for directory times: %s",
+	    tempfile);
 	return(-1);
 }

@@ -1242,7 +1238,7 @@ dir_start()
 *	pax spec)
 */

-#if __STDC__
+#ifdef __STDC__
 void
 add_dir(char *name, int nlen, struct stat *psb, int frc_mode)
 #else
@@ -1264,7 +1260,7 @@ add_dir(name, nlen, psb, frc_mode)
 	 * in the trailer
 	 */
 	if ((dblk.npos = lseek(dirfd, 0L, SEEK_CUR)) < 0) {
-		pax_warn(1,"Unable to store mode and times for directory: %s",name);
+		paxwarn(1,"Unable to store mode and times for directory: %s",name);
 		return;
 	}

@@ -1282,7 +1278,7 @@ add_dir(name, nlen, psb, frc_mode)
 		return;
 	}

-	pax_warn(1,"Unable to store mode and times for created directory: %s",name);
+	paxwarn(1,"Unable to store mode and times for created directory: %s",name);
 	return;
 }

@@ -1292,7 +1288,7 @@ add_dir(name, nlen, psb, frc_mode)
 *	by pax
 */

-#if __STDC__
+#ifdef __STDC__
 void
 proc_dir(void)
 #else
@@ -1338,7 +1334,7 @@ proc_dir()
 	(void)close(dirfd);
 	dirfd = -1;
 	if (cnt != dircnt)
-		pax_warn(1,"Unable to set mode and times for created directories");
+		paxwarn(1,"Unable to set mode and times for created directories");
 	return;
 }

@@ -1360,7 +1356,7 @@ proc_dir()
 *	the hash value of the string MOD (%) the table size.
 */

-#if __STDC__
+#ifdef __STDC__
 u_int
 st_hash(char *name, int len, int tabsz)
 #else
@@ -1386,7 +1382,7 @@ st_hash(name, len, tabsz)
 	 * spread out the keys)
 	 */
 	if (len > MAXKEYLEN) {
-                pt = &(name[len - MAXKEYLEN]);
+		pt = &(name[len - MAXKEYLEN]);
 		len = MAXKEYLEN;
 	} else
 		pt = name;
@@ -78,7 +78,7 @@ static int tar_nodir;			/* do not write dirs under old tar */
 *	0 if ok, -1 otherwise (what wr_skip returns)
 */

-#if __STDC__
+#ifdef __STDC__
 int
 tar_endwr(void)
 #else
@@ -96,7 +96,7 @@ tar_endwr()
 *	size of trailer (2 * BLKMULT)
 */

-#if __STDC__
+#ifdef __STDC__
 off_t
 tar_endrd(void)
 #else
@@ -118,7 +118,7 @@ tar_endrd()
 *	could never contain a header.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 tar_trail(register char *buf, register int in_resync, register int *cnt)
 #else
@@ -162,14 +162,14 @@ tar_trail(buf, in_resync, cnt)
 * ul_oct()
 *	convert an unsigned long to an octal string. many oddball field
 *	termination characters are used by the various versions of tar in the
- *	different fields. term selects which kind to use. str is BLANK padded
+ *	different fields. term selects which kind to use. str is '0' padded
 *	at the front to len. we are unable to use only one format as many old
 *	tar readers are very cranky about this.
 * Return:
 *	0 if the number fit into the string, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 ul_oct(u_long val, register char *str, register int len, int term)
 #else
@@ -215,7 +215,7 @@ ul_oct(val, str, len, term)
 	}

 	while (pt >= str)
-		*pt-- = ' ';
+		*pt-- = '0';
 	if (val != (u_long)0)
 		return(-1);
 	return(0);
@@ -226,14 +226,14 @@ ul_oct(val, str, len, term)
 * uqd_oct()
 *	convert an u_quad_t to an octal string. one of many oddball field
 *	termination characters are used by the various versions of tar in the
- *	different fields. term selects which kind to use. str is BLANK padded
+ *	different fields. term selects which kind to use. str is '0' padded
 *	at the front to len. we are unable to use only one format as many old
 *	tar readers are very cranky about this.
 * Return:
 *	0 if the number fit into the string, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 static int
 uqd_oct(u_quad_t val, register char *str, register int len, int term)
 #else
@@ -279,7 +279,7 @@ uqd_oct(val, str, len, term)
 	}

 	while (pt >= str)
-		*pt-- = ' ';
+		*pt-- = '0';
 	if (val != (u_quad_t)0)
 		return(-1);
 	return(0);
@@ -296,7 +296,7 @@ uqd_oct(val, str, len, term)
 *	unsigned long checksum
 */

-#if __STDC__
+#ifdef __STDC__
 static u_long
 tar_chksm(register char *blk, register int len)
 #else
@@ -344,7 +344,7 @@ tar_chksm(blk, len)
 *	0 if a tar header, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 tar_id(register char *blk, int size)
 #else
@@ -385,7 +385,7 @@ tar_id(blk, size)
 *	0 if ok -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 tar_opt(void)
 #else
@@ -398,9 +398,9 @@ tar_opt()
 	while ((opt = opt_next()) != NULL) {
 		if (strcmp(opt->name, TAR_OPTION) ||
 		    strcmp(opt->value, TAR_NODIR)) {
-			pax_warn(1, "Unknown tar format -o option/value pair %s=%s",
+			paxwarn(1, "Unknown tar format -o option/value pair %s=%s",
 			    opt->name, opt->value);
-			pax_warn(1,"%s=%s is the only supported tar format option",
+			paxwarn(1,"%s=%s is the only supported tar format option",
 			    TAR_OPTION, TAR_NODIR);
 			return(-1);
 		}
@@ -409,7 +409,7 @@ tar_opt()
 		 * we only support one option, and only when writing
 		 */
 		if ((act != APPND) && (act != ARCHIVE)) {
-			pax_warn(1, "%s=%s is only supported when writing.",
+			paxwarn(1, "%s=%s is only supported when writing.",
 			    opt->name, opt->value);
 			return(-1);
 		}
@@ -427,7 +427,7 @@ tar_opt()
 *	0
 */

-#if __STDC__
+#ifdef __STDC__
 int
 tar_rd(register ARCHD *arcn, register char *buf)
 #else
@@ -453,13 +453,17 @@ tar_rd(arcn, buf)
 	 * copy out the name and values in the stat buffer
 	 */
 	hd = (HD_TAR *)buf;
-	arcn->nlen = l_strncpy(arcn->name, hd->name, sizeof(hd->name));
+	arcn->nlen = l_strncpy(arcn->name, hd->name, sizeof(arcn->name) - 1);
 	arcn->name[arcn->nlen] = '\0';
 	arcn->sb.st_mode = (mode_t)(asc_ul(hd->mode,sizeof(hd->mode),OCT) &
 	    0xfff);
 	arcn->sb.st_uid = (uid_t)asc_ul(hd->uid, sizeof(hd->uid), OCT);
 	arcn->sb.st_gid = (gid_t)asc_ul(hd->gid, sizeof(hd->gid), OCT);
-	arcn->sb.st_size = (size_t)asc_ul(hd->size, sizeof(hd->size), OCT);
+#ifdef NET2_STAT
+	arcn->sb.st_size = (off_t)asc_ul(hd->size, sizeof(hd->size), OCT);
+#else
+	arcn->sb.st_size = (off_t)asc_uqd(hd->size, sizeof(hd->size), OCT);
+#endif
 	arcn->sb.st_mtime = (time_t)asc_ul(hd->mtime, sizeof(hd->mtime), OCT);
 	arcn->sb.st_ctime = arcn->sb.st_atime = arcn->sb.st_mtime;

@@ -478,7 +482,7 @@ tar_rd(arcn, buf)
 		 */
 		arcn->type = PAX_SLK;
 		arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname,
-			sizeof(hd->linkname));
+			sizeof(arcn->ln_name) - 1);
 		arcn->ln_name[arcn->ln_nlen] = '\0';
 		arcn->sb.st_mode |= S_IFLNK;
 		break;
@@ -490,7 +494,7 @@ tar_rd(arcn, buf)
 		arcn->type = PAX_HLK;
 		arcn->sb.st_nlink = 2;
 		arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname,
-			sizeof(hd->linkname));
+			sizeof(arcn->ln_name) - 1);
 		arcn->ln_name[arcn->ln_nlen] = '\0';

 		/*
@@ -499,6 +503,16 @@ tar_rd(arcn, buf)
 		 */
 		arcn->sb.st_mode |= S_IFREG;
 		break;
+	case DIRTYPE:
+		/*
+		 * It is a directory, set the mode for -v printing
+		 */
+		arcn->type = PAX_DIR;
+		arcn->sb.st_mode |= S_IFDIR;
+		arcn->sb.st_nlink = 2;
+		arcn->ln_name[0] = '\0';
+		arcn->ln_nlen = 0;
+		break;
 	case AREGTYPE:
 	case REGTYPE:
 	default:
@@ -550,7 +564,7 @@ tar_rd(arcn, buf)
 *	data to write after the header, -1 if archive write failed
 */

-#if __STDC__
+#ifdef __STDC__
 int
 tar_wr(register ARCHD *arcn)
 #else
@@ -575,23 +589,23 @@ tar_wr(arcn)
 			return(1);
 		break;
 	case PAX_CHR:
-		pax_warn(1, "Tar cannot archive a character device %s",
+		paxwarn(1, "Tar cannot archive a character device %s",
 		    arcn->org_name);
 		return(1);
 	case PAX_BLK:
-		pax_warn(1, "Tar cannot archive a block device %s", arcn->org_name);
+		paxwarn(1, "Tar cannot archive a block device %s", arcn->org_name);
 		return(1);
 	case PAX_SCK:
-		pax_warn(1, "Tar cannot archive a socket %s", arcn->org_name);
+		paxwarn(1, "Tar cannot archive a socket %s", arcn->org_name);
 		return(1);
 	case PAX_FIF:
-		pax_warn(1, "Tar cannot archive a fifo %s", arcn->org_name);
+		paxwarn(1, "Tar cannot archive a fifo %s", arcn->org_name);
 		return(1);
 	case PAX_SLK:
 	case PAX_HLK:
 	case PAX_HRG:
 		if (arcn->ln_nlen > sizeof(hd->linkname)) {
-			pax_warn(1,"Link name too long for tar %s", arcn->ln_name);
+			paxwarn(1,"Link name too long for tar %s", arcn->ln_name);
 			return(1);
 		}
 		break;
@@ -607,8 +621,8 @@ tar_wr(arcn)
 	len = arcn->nlen;
 	if (arcn->type == PAX_DIR)
 		++len;
-	if (len > sizeof(hd->name)) {
-		pax_warn(1, "File name too long for tar %s", arcn->name);
+	if (len >= sizeof(hd->name)) {
+		paxwarn(1, "File name too long for tar %s", arcn->name);
 		return(1);
 	}

@@ -621,7 +635,8 @@ tar_wr(arcn)
 	 * a header)
 	 */
 	hd = (HD_TAR *)hdblk;
-	zf_strncpy(hd->name, arcn->name, sizeof(hd->name));
+	l_strncpy(hd->name, arcn->name, sizeof(hd->name) - 1);
+	hd->name[sizeof(hd->name) - 1] = '\0';
 	arcn->pad = 0;

 	if (arcn->type == PAX_DIR) {
@@ -631,7 +646,7 @@ tar_wr(arcn)
 		 * dirs, so no pad.
 		 */
 		hd->linkflag = AREGTYPE;
-		bzero(hd->linkname, sizeof(hd->linkname));
+		memset(hd->linkname, 0, sizeof(hd->linkname));
 		hd->name[len-1] = '/';
 		if (ul_oct((u_long)0L, hd->size, sizeof(hd->size), 1))
 			goto out;
@@ -640,7 +655,8 @@ tar_wr(arcn)
 		 * no data follows this file, so no pad
 		 */
 		hd->linkflag = SYMTYPE;
-		zf_strncpy(hd->linkname,arcn->ln_name, sizeof(hd->linkname));
+		l_strncpy(hd->linkname,arcn->ln_name, sizeof(hd->linkname) - 1);
+		hd->linkname[sizeof(hd->linkname) - 1] = '\0';
 		if (ul_oct((u_long)0L, hd->size, sizeof(hd->size), 1))
 			goto out;
 	} else if ((arcn->type == PAX_HLK) || (arcn->type == PAX_HRG)) {
@@ -648,7 +664,8 @@ tar_wr(arcn)
 		 * no data follows this file, so no pad
 		 */
 		hd->linkflag = LNKTYPE;
-		zf_strncpy(hd->linkname,arcn->ln_name, sizeof(hd->linkname));
+		l_strncpy(hd->linkname,arcn->ln_name, sizeof(hd->linkname) - 1);
+		hd->linkname[sizeof(hd->linkname) - 1] = '\0';
 		if (ul_oct((u_long)0L, hd->size, sizeof(hd->size), 1))
 			goto out;
 	} else {
@@ -656,7 +673,7 @@ tar_wr(arcn)
 		 * data follows this file, so set the pad
 		 */
 		hd->linkflag = AREGTYPE;
-		bzero(hd->linkname, sizeof(hd->linkname));
+		memset(hd->linkname, 0, sizeof(hd->linkname));
 #		ifdef NET2_STAT
 		if (ul_oct((u_long)arcn->sb.st_size, hd->size,
 		    sizeof(hd->size), 1)) {
@@ -664,7 +681,7 @@ tar_wr(arcn)
 		if (uqd_oct((u_quad_t)arcn->sb.st_size, hd->size,
 		    sizeof(hd->size), 1)) {
 #		endif
-			pax_warn(1,"File is too large for tar %s", arcn->org_name);
+			paxwarn(1,"File is too large for tar %s", arcn->org_name);
 			return(1);
 		}
 		arcn->pad = TAR_PAD(arcn->sb.st_size);
@@ -685,7 +702,7 @@ tar_wr(arcn)
 	 * to be written
 	 */
 	if (ul_oct(tar_chksm(hdblk, sizeof(HD_TAR)), hd->chksum,
-	    sizeof(hd->chksum), 2))
+	    sizeof(hd->chksum), 3))
 		goto out;
 	if (wr_rdbuf(hdblk, sizeof(HD_TAR)) < 0)
 		return(-1);
@@ -699,7 +716,7 @@ tar_wr(arcn)
 	/*
 	 * header field is out of range
 	 */
-	pax_warn(1, "Tar header field is too small for %s", arcn->org_name);
+	paxwarn(1, "Tar header field is too small for %s", arcn->org_name);
 	return(1);
 }

@@ -714,7 +731,7 @@ tar_wr(arcn)
 *	0 if ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ustar_strd(void)
 #else
@@ -734,7 +751,7 @@ ustar_strd()
 *	0 if ok, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ustar_stwr(void)
 #else
@@ -755,7 +772,7 @@ ustar_stwr()
 *	0 if a ustar header, -1 otherwise
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ustar_id(char *blk, int size)
 #else
@@ -794,7 +811,7 @@ ustar_id(blk, size)
 *	0
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ustar_rd(register ARCHD *arcn, register char *buf)
 #else
@@ -818,6 +835,7 @@ ustar_rd(arcn, buf)
 	arcn->org_name = arcn->name;
 	arcn->sb.st_nlink = 1;
 	arcn->pat = NULL;
+	arcn->nlen = 0;
 	hd = (HD_USTAR *)buf;

 	/*
@@ -826,12 +844,12 @@ ustar_rd(arcn, buf)
 	 */
 	dest = arcn->name;
 	if (*(hd->prefix) != '\0') {
-		cnt = l_strncpy(arcn->name, hd->prefix, sizeof(hd->prefix));
-		dest = arcn->name + arcn->nlen;
+		cnt = l_strncpy(dest, hd->prefix, sizeof(arcn->name) - 2);
+		dest += cnt;
 		*dest++ = '/';
+		cnt++;
 	}
-	arcn->nlen = l_strncpy(dest, hd->name, sizeof(hd->name));
-	arcn->nlen += cnt;
+	arcn->nlen = cnt + l_strncpy(dest, hd->name, sizeof(arcn->name) - cnt);
 	arcn->name[arcn->nlen] = '\0';

 	/*
@@ -840,7 +858,11 @@ ustar_rd(arcn, buf)
 	 */
 	arcn->sb.st_mode = (mode_t)(asc_ul(hd->mode, sizeof(hd->mode), OCT) &
 	    0xfff);
-	arcn->sb.st_size = (size_t)asc_ul(hd->size, sizeof(hd->size), OCT);
+#ifdef NET2_STAT
+	arcn->sb.st_size = (off_t)asc_ul(hd->size, sizeof(hd->size), OCT);
+#else
+	arcn->sb.st_size = (off_t)asc_uqd(hd->size, sizeof(hd->size), OCT);
+#endif
 	arcn->sb.st_mtime = (time_t)asc_ul(hd->mtime, sizeof(hd->mtime), OCT);
 	arcn->sb.st_ctime = arcn->sb.st_atime = arcn->sb.st_mtime;

@@ -920,7 +942,7 @@ ustar_rd(arcn, buf)
 		 * copy the link name
 		 */
 		arcn->ln_nlen = l_strncpy(arcn->ln_name, hd->linkname,
-			sizeof(hd->linkname));
+			sizeof(arcn->ln_name) - 1);
 		arcn->ln_name[arcn->ln_nlen] = '\0';
 		break;
 	case CONTTYPE:
@@ -952,7 +974,7 @@ ustar_rd(arcn, buf)
 *	data to write after the header, -1 if archive write failed
 */

-#if __STDC__
+#ifdef __STDC__
 int
 ustar_wr(register ARCHD *arcn)
 #else
@@ -969,7 +991,7 @@ ustar_wr(arcn)
 	 * check for those file system types ustar cannot store
 	 */
 	if (arcn->type == PAX_SCK) {
-		pax_warn(1, "Ustar cannot archive a socket %s", arcn->org_name);
+		paxwarn(1, "Ustar cannot archive a socket %s", arcn->org_name);
 		return(1);
 	}

@@ -978,7 +1000,7 @@ ustar_wr(arcn)
 	 */
 	if (((arcn->type == PAX_SLK) || (arcn->type == PAX_HLK) ||
 	    (arcn->type == PAX_HRG)) && (arcn->ln_nlen >= sizeof(hd->linkname))){
-		pax_warn(1, "Link name too long for ustar %s", arcn->ln_name);
+		paxwarn(1, "Link name too long for ustar %s", arcn->ln_name);
 		return(1);
 	}

@@ -987,7 +1009,7 @@ ustar_wr(arcn)
 	 * pt != arcn->name, the name has to be split
 	 */
 	if ((pt = name_split(arcn->name, arcn->nlen)) == NULL) {
-		pax_warn(1, "File name too long for ustar %s", arcn->name);
+		paxwarn(1, "File name too long for ustar %s", arcn->name);
 		return(1);
 	}
 	hd = (HD_USTAR *)hdblk;
@@ -1002,16 +1024,17 @@ ustar_wr(arcn)
 		 * occur, we remove the / and copy the first part to the prefix
 		 */
 		*pt = '\0';
-		zf_strncpy(hd->prefix, arcn->name, sizeof(hd->prefix));
+		l_strncpy(hd->prefix, arcn->name, sizeof(hd->prefix) - 1);
 		*pt++ = '/';
 	} else
-		bzero(hd->prefix, sizeof(hd->prefix));
+		memset(hd->prefix, 0, sizeof(hd->prefix));

 	/*
 	 * copy the name part. this may be the whole path or the part after
 	 * the prefix
 	 */
-	zf_strncpy(hd->name, pt, sizeof(hd->name));
+	l_strncpy(hd->name, pt, sizeof(hd->name) - 1);
+	hd->name[sizeof(hd->name) - 1] = '\0';

 	/*
 	 * set the fields in the header that are type dependent
@@ -1019,9 +1042,9 @@ ustar_wr(arcn)
 	switch(arcn->type) {
 	case PAX_DIR:
 		hd->typeflag = DIRTYPE;
-		bzero(hd->linkname, sizeof(hd->linkname));
-		bzero(hd->devmajor, sizeof(hd->devmajor));
-		bzero(hd->devminor, sizeof(hd->devminor));
+		memset(hd->linkname, 0, sizeof(hd->linkname));
+		memset(hd->devmajor, 0, sizeof(hd->devmajor));
+		memset(hd->devminor, 0, sizeof(hd->devminor));
 		if (ul_oct((u_long)0L, hd->size, sizeof(hd->size), 3))
 			goto out;
 		break;
@@ -1031,7 +1054,7 @@ ustar_wr(arcn)
 			hd->typeflag = CHRTYPE;
 		else
 			hd->typeflag = BLKTYPE;
-		bzero(hd->linkname, sizeof(hd->linkname));
+		memset(hd->linkname, 0, sizeof(hd->linkname));
 		if (ul_oct((u_long)MAJOR(arcn->sb.st_rdev), hd->devmajor,
 		   sizeof(hd->devmajor), 3) ||
 		   ul_oct((u_long)MINOR(arcn->sb.st_rdev), hd->devminor,
@@ -1041,9 +1064,9 @@ ustar_wr(arcn)
 		break;
 	case PAX_FIF:
 		hd->typeflag = FIFOTYPE;
-		bzero(hd->linkname, sizeof(hd->linkname));
-		bzero(hd->devmajor, sizeof(hd->devmajor));
-		bzero(hd->devminor, sizeof(hd->devminor));
+		memset(hd->linkname, 0, sizeof(hd->linkname));
+		memset(hd->devmajor, 0, sizeof(hd->devmajor));
+		memset(hd->devminor, 0, sizeof(hd->devminor));
 		if (ul_oct((u_long)0L, hd->size, sizeof(hd->size), 3))
 			goto out;
 		break;
@@ -1054,9 +1077,10 @@ ustar_wr(arcn)
 			hd->typeflag = SYMTYPE;
 		else
 			hd->typeflag = LNKTYPE;
-		zf_strncpy(hd->linkname,arcn->ln_name, sizeof(hd->linkname));
-		bzero(hd->devmajor, sizeof(hd->devmajor));
-		bzero(hd->devminor, sizeof(hd->devminor));
+		l_strncpy(hd->linkname,arcn->ln_name, sizeof(hd->linkname) - 1);
+		hd->linkname[sizeof(hd->linkname) - 1] = '\0';
+		memset(hd->devmajor, 0, sizeof(hd->devmajor));
+		memset(hd->devminor, 0, sizeof(hd->devminor));
 		if (ul_oct((u_long)0L, hd->size, sizeof(hd->size), 3))
 			goto out;
 		break;
@@ -1070,9 +1094,9 @@ ustar_wr(arcn)
 			hd->typeflag = CONTTYPE;
 		else
 			hd->typeflag = REGTYPE;
-		bzero(hd->linkname, sizeof(hd->linkname));
-		bzero(hd->devmajor, sizeof(hd->devmajor));
-		bzero(hd->devminor, sizeof(hd->devminor));
+		memset(hd->linkname, 0, sizeof(hd->linkname));
+		memset(hd->devmajor, 0, sizeof(hd->devmajor));
+		memset(hd->devminor, 0, sizeof(hd->devminor));
 		arcn->pad = TAR_PAD(arcn->sb.st_size);
 #		ifdef NET2_STAT
 		if (ul_oct((u_long)arcn->sb.st_size, hd->size,
@@ -1081,14 +1105,14 @@ ustar_wr(arcn)
 		if (uqd_oct((u_quad_t)arcn->sb.st_size, hd->size,
 		    sizeof(hd->size), 3)) {
 #		endif
-			pax_warn(1,"File is too long for ustar %s",arcn->org_name);
+			paxwarn(1,"File is too long for ustar %s",arcn->org_name);
 			return(1);
 		}
 		break;
 	}

-	zf_strncpy(hd->magic, TMAGIC, TMAGLEN);
-	zf_strncpy(hd->version, TVERSION, TVERSLEN);
+	l_strncpy(hd->magic, TMAGIC, TMAGLEN);
+	l_strncpy(hd->version, TVERSION, TVERSLEN);

 	/*
 	 * set the remaining fields. Some versions want all 16 bits of mode
@@ -1099,8 +1123,8 @@ ustar_wr(arcn)
 	    ul_oct((u_long)arcn->sb.st_gid, hd->gid, sizeof(hd->gid), 3) ||
 	    ul_oct((u_long)arcn->sb.st_mtime,hd->mtime,sizeof(hd->mtime),3))
 		goto out;
-	zf_strncpy(hd->uname,name_uid(arcn->sb.st_uid, 0),sizeof(hd->uname));
-	zf_strncpy(hd->gname,name_gid(arcn->sb.st_gid, 0),sizeof(hd->gname));
+	l_strncpy(hd->uname,name_uid(arcn->sb.st_uid, 0),sizeof(hd->uname));
+	l_strncpy(hd->gname,name_gid(arcn->sb.st_gid, 0),sizeof(hd->gname));

 	/*
 	 * calculate and store the checksum write the header to the archive
@@ -1122,7 +1146,7 @@ ustar_wr(arcn)
    	/*
 	 * header field is out of range
 	 */
-	pax_warn(1, "Ustar header field is too small for %s", arcn->org_name);
+	paxwarn(1, "Ustar header field is too small for %s", arcn->org_name);
 	return(1);
 }

@@ -1138,7 +1162,7 @@ ustar_wr(arcn)
 *	the file name is too long
 */

-#if __STDC__
+#ifdef __STDC__
 static char *
 name_split(register char *name, register int len)
 #else
@@ -1154,7 +1178,7 @@ name_split(name, len)
 	 * check to see if the file name is small enough to fit in the name
 	 * field. if so just return a pointer to the name.
 	 */
-	if (len <= TNMSZ)
+	if (len < TNMSZ)
 		return(name);
 	if (len > (TPFSZ + TNMSZ))
 		return(NULL);
@@ -52,7 +52,7 @@ static const char rcsid[] =
 #include <string.h>
 #include "pax.h"
 #include "extern.h"
-#if __STDC__
+#ifdef __STDC__
 #include <stdarg.h>
 #else
 #include <varargs.h>
@@ -62,7 +62,7 @@ static const char rcsid[] =
 * routines that deal with I/O to and from the user
 */

-#define DEVTTY          "/dev/tty"      /* device for interactive i/o */
+#define DEVTTY	  "/dev/tty"      /* device for interactive i/o */
 static FILE *ttyoutf = NULL;		/* output pointing at control tty */
 static FILE *ttyinf = NULL;		/* input pointing at control tty */

@@ -72,7 +72,7 @@ static FILE *ttyinf = NULL;		/* input pointing at control tty */
 *	open fails, future ops that require user input will get an EOF
 */

-#if __STDC__
+#ifdef __STDC__
 int
 tty_init(void)
 #else
@@ -82,7 +82,7 @@ tty_init()
 {
 	int ttyfd;

-        if ((ttyfd = open(DEVTTY, O_RDWR)) >= 0) {
+	if ((ttyfd = open(DEVTTY, O_RDWR)) >= 0) {
 		if ((ttyoutf = fdopen(ttyfd, "w")) != NULL) {
 			if ((ttyinf = fdopen(ttyfd, "r")) != NULL)
 				return(0);
@@ -92,7 +92,7 @@ tty_init()
 	}

 	if (iflag) {
-		pax_warn(1, "Fatal error, cannot open %s", DEVTTY);
+		paxwarn(1, "Fatal error, cannot open %s", DEVTTY);
 		return(-1);
 	}
 	return(0);
@@ -104,18 +104,18 @@ tty_init()
 *	if there is no controlling terminal, just return.
 */

-#if __STDC__
+#ifdef __STDC__
 void
-tty_prnt(char *fmt, ...)
+tty_prnt(const char *fmt, ...)
 #else
 void
 tty_prnt(fmt, va_alist)
-	char *fmt;
+	const char *fmt;
 	va_dcl
 #endif
 {
 	va_list ap;
-#	if __STDC__
+#	ifdef __STDC__
 	va_start(ap, fmt);
 #	else
 	va_start(ap);
@@ -135,7 +135,7 @@ tty_prnt(fmt, va_alist)
 *	0 if data was read, -1 otherwise.
 */

-#if __STDC__
+#ifdef __STDC__
 int
 tty_read(char *str, int len)
 #else
@@ -160,24 +160,24 @@ tty_read(str, len)
 }

 /*
- * pax_warn()
- *	write a pax_warning message to stderr. if "set" the exit value of pax
+ * paxwarn()
+ *	write a warning message to stderr. if "set" the exit value of pax
 *	will be non-zero.
 */

-#if __STDC__
+#ifdef __STDC__
 void
-pax_warn(int set, char *fmt, ...)
+paxwarn(int set, const char *fmt, ...)
 #else
 void
-pax_warn(set, fmt, va_alist)
+paxwarn(set, fmt, va_alist)
 	int set;
-	char *fmt;
+	const char *fmt;
 	va_dcl
 #endif
 {
 	va_list ap;
-#	if __STDC__
+#	ifdef __STDC__
 	va_start(ap, fmt);
 #	else
 	va_start(ap);
@@ -189,6 +189,7 @@ pax_warn(set, fmt, va_alist)
 	 * line by itself
 	 */
 	if (vflag && vfpart) {
+		(void)fflush(listf);
 		(void)fputc('\n', stderr);
 		vfpart = 0;
 	}
@@ -199,25 +200,25 @@ pax_warn(set, fmt, va_alist)
 }

 /*
- * sys_warn()
- *	write a pax_warning message to stderr. if "set" the exit value of pax
+ * syswarn()
+ *	write a warning message to stderr. if "set" the exit value of pax
 *	will be non-zero.
 */

-#if __STDC__
+#ifdef __STDC__
 void
-sys_warn(int set, int errnum, char *fmt, ...)
+syswarn(int set, int errnum, const char *fmt, ...)
 #else
 void
-sys_warn(set, errnum, fmt, va_alist)
+syswarn(set, errnum, fmt, va_alist)
 	int set;
 	int errnum;
-	char *fmt;
+	const char *fmt;
 	va_dcl
 #endif
 {
 	va_list ap;
-#	if __STDC__
+#	ifdef __STDC__
 	va_start(ap, fmt);
 #	else
 	va_start(ap);
@@ -229,6 +230,7 @@ sys_warn(set, errnum, fmt, va_alist)
 	 * line by itself
 	 */
 	if (vflag && vfpart) {
+		(void)fflush(listf);
 		(void)fputc('\n', stderr);
 		vfpart = 0;
 	}
@@ -240,6 +242,6 @@ sys_warn(set, errnum, fmt, va_alist)
 	 * format and print the errno
 	 */
 	if (errnum > 0)
-		(void)fprintf(stderr, " <%s>", sys_errlist[errnum]);
+		(void)fprintf(stderr, " <%s>", strerror(errnum));
 	(void)fputc('\n', stderr);
 }
@@ -32,7 +32,9 @@
 */

 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)nlist.c	8.4 (Berkeley) 4/2/94";
+#endif
 static const char rcsid[] =
  "$FreeBSD$";
 #endif /* not lint */
@@ -34,7 +34,7 @@
 .\"
 .Dd April 18, 1994
 .Dt PS 1
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm ps
 .Nd process status
@@ -79,6 +79,9 @@ The options are as follows:
 .Bl -tag -width indent
 .It Fl a
 Display information about other users' processes as well as your own.
+This can be disabled by setting the
+.Va kern.ps_showallprocs
+sysctl to zero.
 .It Fl c
 Change the ``command'' column output to just contain the executable name,
 rather than the full command line.
@@ -164,9 +167,8 @@ option implies the
 .Fl m
 option.
 .It Fl W
-Extract swap information from the specified file instead of the
-default
-.Pa /dev/drum .
+Extract swap information from the specified file instead of
+using libkvm.
 .It Fl w
 Use 132 columns to display information, instead of the default which
 is your window size.
@@ -503,7 +505,8 @@ the mount point of
 .Xr kvm 3 ,
 .Xr strftime 3 ,
 .Xr procfs 5 ,
-.Xr pstat 8
+.Xr pstat 8 ,
+.Xr sysctl 8
 .Sh BUGS
 Since
 .Nm
@@ -59,13 +59,13 @@ static const char rcsid[] =
 #include <fcntl.h>
 #include <kvm.h>
 #include <limits.h>
+#include <locale.h>
 #include <nlist.h>
 #include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <locale.h>
 #include <pwd.h>
 #include <utmp.h>

@@ -229,7 +229,7 @@ main(argc, argv)
 			/* FALLTHROUGH */
 		case 't': {
 			struct stat sb;
-			char *ttypath, pathbuf[MAXPATHLEN];
+			char *ttypath, pathbuf[PATH_MAX];

 			if (strcmp(optarg, "co") == 0)
 				ttypath = _PATH_CONSOLE;
@@ -3,6 +3,8 @@

 PROG=	pwd
 LINKS=	${BINDIR}/pwd ${BINDIR}/realpath
-MAN1=	pwd.1 realpath.1
+MAN=	pwd.1 realpath.1
+
+WARNS?=	2

 .include <bsd.prog.mk>
@@ -37,7 +37,7 @@
 .\"
 .Dd April 28, 1995
 .Dt PWD 1
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm pwd
 .Nd return working directory name
@@ -55,9 +55,7 @@ Consult the
 .Xr builtin 1
 manual page.
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh STANDARDS
 The
 .Nm
@@ -71,8 +69,8 @@ flag is not supported.
 .Xr builtin 1 ,
 .Xr cd 1 ,
 .Xr csh 1 ,
-.Xr getcwd 3 ,
-.Xr sh 1
+.Xr sh 1 ,
+.Xr getcwd 3
 .Sh BUGS
 In
 .Xr csh  1
@@ -46,11 +46,13 @@ static const char rcsid[] =
 #endif /* not lint */

 #include <err.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/param.h>

+int main __P((int, char *[]));
 void usage __P((void));

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

 	/*
 	 * Flags for pwd are a bit strange.  The POSIX 1003.2B/D9 document
@@ -85,7 +87,7 @@ main(argc, argv)
 			err(1, "%s", argv[0]);
 		(void)printf("%s\n", p);
 	} else  if (argc == 0) {
-		p = getcwd(NULL, 0);
+		p = getcwd(NULL, (size_t)0);
 		if (p == NULL)
 			err(1, ".");
 		(void)printf("%s\n", p);
@@ -38,7 +38,7 @@
 .\"
 .Dd November 24, 2000
 .Dt REALPATH 1
-.Os FreeBSD
+.Os
 .Sh NAME
 .Nm realpath
 .Nd return resolved physical path
@@ -58,9 +58,7 @@ and
 in
 .Ar path .
 .Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and >0 if an error occurs.
+.Ex -std
 .Sh SEE ALSO
 .Xr realpath 3
 .Sh HISTORY
@@ -46,6 +46,6 @@ char	*colon __P((char *));
 void	 lostconn __P((int));
 void	 nospace __P((void));
 int	 okname __P((char *));
-void	 run_err __P((const char *, ...));
+void	 run_err __P((const char *, ...)) __printflike(1, 2);
 int	 susystem __P((char *, int));
 void	 verifydir __P((char *));
@@ -34,7 +34,7 @@
 .\"
 .Dd May 31, 1993
 .Dt RCP 1
-.Os BSD 4.3r
+.Os
 .Sh NAME
 .Nm rcp
 .Nd remote file copy
@@ -58,6 +58,8 @@ static const char rcsid[] =
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <libutil.h>
+#include <limits.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <signal.h>
@@ -66,7 +68,6 @@ static const char rcsid[] =
 #include <string.h>
 #include <string.h>
 #include <unistd.h>
-#include <libutil.h>

 #include "pathnames.h"
 #include "extern.h"
@@ -106,10 +107,11 @@ char cmd[CMDNEEDS];		/* must hold "rcp -r -p -d\0" */

 #ifdef KERBEROS
 int	 kerberos __P((char **, char *, char *, char *));
-void	 oldw __P((const char *, ...));
+void	 oldw __P((const char *, ...)) __printflike(1, 2);
 #endif
 int	 response __P((void));
 void	 rsource __P((char *, struct stat *));
+void	 run_err __P((const char *, ...)) __printflike(1, 2);
 void	 sink __P((int, char *[]));
 void	 source __P((int, char *[]));
 void	 tolocal __P((int, char *[]));
@@ -308,8 +310,10 @@ toremote(targ, argc, argv)
 				suser = argv[i];
 				if (*suser == '\0')
 					suser = pwd->pw_name;
-				else if (!okname(suser))
+				else if (!okname(suser)) {
+					++errs;
 					continue;
+				}
 				(void)snprintf(bp, len,
 				    "%s %s -l %s -n %s %s '%s%s%s:%s'",
 				    _PATH_RSH, host, suser, cmd, src,
@@ -389,8 +393,10 @@ tolocal(argc, argv)
 			suser = argv[i];
 			if (*suser == '\0')
 				suser = pwd->pw_name;
-			else if (!okname(suser))
+			else if (!okname(suser)) {
+				++errs;
 				continue;
+			}
 		}
 		len = strlen(src) + CMDNEEDS + 20;
 		if ((bp = malloc(len)) == NULL)
@@ -513,7 +519,7 @@ rsource(name, statp)
 {
 	DIR *dirp;
 	struct dirent *dp;
-	char *last, *vect[1], path[MAXPATHLEN];
+	char *last, *vect[1], path[PATH_MAX];

 	if (!(dirp = opendir(name))) {
 		run_err("%s: %s", name, strerror(errno));
@@ -546,7 +552,7 @@ rsource(name, statp)
 			continue;
 		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
 			continue;
-		if (strlen(name) + 1 + strlen(dp->d_name) >= MAXPATHLEN - 1) {
+		if (strlen(name) + 1 + strlen(dp->d_name) >= sizeof(path)) {
 			run_err("%s/%s: name too long", name, dp->d_name);
 			continue;
 		}
@@ -98,7 +98,7 @@ okname(cp0)
 		c = *cp;
 		if (c & 0200)
 			goto bad;
-		if (!isalpha(c) && !isdigit(c) && c != '_' && c != '-')
+		if (!isalpha(c) && !isdigit(c) && c != '_' && c != '-' && c != '.')
 			goto bad;
 	} while (*++cp);
 	return (1);
@@ -123,7 +123,7 @@ susystem(s, userid)

 	case 0:
 		(void)setuid(userid);
-		execl(_PATH_BSHELL, "sh", "-c", s, NULL);
+		execl(_PATH_BSHELL, "sh", "-c", s, (char *)NULL);
 		_exit(127);
 	}
 	istat = signal(SIGINT, SIG_IGN);
@@ -2,6 +2,7 @@
 # $FreeBSD$

 PROG=	rm
+WARNS?=	2
 SRCS=	rm.c

 LINKS=	${BINDIR}/rm ${BINDIR}/unlink
@@ -69,7 +69,7 @@ the exit status to reflect an error.
 The
 .Fl f
 option overrides any previous
-.Fl i 
+.Fl i
 options.
 .It Fl i
 Request confirmation before attempting to remove each file, regardless of
@@ -78,7 +78,7 @@ terminal.
 The
 .Fl i
 option overrides any previous
-.Fl f 
+.Fl f
 options.
 .It Fl P
 Overwrite regular files before deleting them.
@@ -86,14 +86,14 @@ Files are overwritten three times, first with the byte pattern 0xff,
 then 0x00, and then 0xff again, before they are deleted.
 .It Fl R
 Attempt to remove the file hierarchy rooted in each file argument.
-The 
+The
 .Fl R
 option implies the
 .Fl d
 option.
 If the
 .Fl i
-option is specified, the user is prompted for confirmation before 
+option is specified, the user is prompted for confirmation before
 each directory's contents are processed (as well as before the attempt
 is made to remove the directory).
 If the user does not respond affirmatively, the file hierarchy rooted in
@@ -179,7 +179,7 @@ utility differs from historical implementations in that the
 .Fl f
 option only masks attempts to remove non-existent files instead of
 masking a large variety of errors.
-The 
+The
 .Fl v
 option is non-standard and its use in scripts is not recommended.
 .Pp
@@ -183,7 +183,7 @@ rm_tree(argv)
 		flags |= FTS_NOSTAT;
 	if (Wflag)
 		flags |= FTS_WHITEOUT;
-	if (!(fts = fts_open(argv, flags, (int (*)())NULL)))
+	if (!(fts = fts_open(argv, flags, NULL)))
 		err(1, NULL);
 	while ((p = fts_read(fts)) != NULL) {
 		switch (p->fts_info) {
@@ -8,7 +8,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail

 PROG=	rmail
 SRCS=	rmail.c
-MAN8=	rmail.8
+MAN=	rmail.8
 CFLAGS+=-I${SENDMAIL_DIR}/include

 .if exists(${.OBJDIR}/../../lib/libsmutil)
@@ -3,4 +3,6 @@

 PROG=	rmdir

+WARNS?=	2
+
 .include <bsd.prog.mk>
@@ -52,6 +52,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>

+int main __P((int, char *[]));
 int rm_path __P((char *));
 void usage __P((void));

@@ -173,7 +173,7 @@ expcmd(argc, argv)

 	i = arith(p);

-	out1fmt("%d\n", i);
+	out1fmt("%ld\n", i);
 	return (! i);
 }

@@ -85,7 +85,7 @@

 #ifdef __STDC__
 pointer stalloc(int);
-void error(char *, ...);
+void error(const char *, ...) __printf0like(1, 2);
 #else
 pointer stalloc();
 void error();
@@ -38,14 +38,14 @@
 .\"
 .Dd May 4, 1995
 .Dt ECHO 1
-.Os BSD 4.4
+.Os
 .Sh NAME
 .Nm echo
 .Nd produce message in a shell script
 .Sh SYNOPSIS
 .Nm
 .Op Fl n | Fl e
-.Ar args... 
+.Ar args...
 .Sh DESCRIPTION
 .Nm
 prints its arguments on the standard output, separated by spaces.