MFC: fortune(6) datfiles

unprivileged users from tracing a process which formerly had
privileges (described in FreeBSD-SA-02:30)

Approved by:	security-officer

COPYRIGHT

@@ -1,3 +1,4 @@
+# $FreeBSD$
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94
 
 All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite

Makefile

@@ -1,16 +1,13 @@
 #
-#	$Id: Makefile,v 1.109.2.3 1997/04/11 16:57:40 asami Exp $
+# $FreeBSD$
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
-#	-DMAKE_LOCAL to add ./local to the SUBDIR list
-#	-DMAKE_PORTS to add ./ports to the SUBDIR list
-#	-DMAKE_EBONES to build eBones (KerberosIV)
-#	-DALLLANG to build documentation for all languages
-#	  (where available -- see share/doc/Makefile)
+#	-DMAKE_KERBEROS4 to build KerberosIV
 #
 #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNOCLEAN do not clean at all
+#	-DNOTOOLS do not rebuild any tools first
 #	-DNOCRYPT will prevent building of crypt versions
 #	-DNOLKM do not build loadable kernel modules
 #	-DNOOBJDIR do not run ``${MAKE} obj''
@@ -19,11 +16,15 @@
 #	-DNOGAMES do not go into games subdir
 #	-DNOSHARE do not go into share subdir
 #	-DNOINFO do not make or install info files
+#	-DNOLIBC_R do not build libc_r.
+#	-DNOPERL do not make or install perl
+#	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
 
 #
 # The intended user-driven targets are:
-# world       - rebuild *everything*, including glue to help do upgrades.
-# reinstall   - use an existing (eg: NFS mounted) build to do an update.
+# buildworld  - rebuild *everything*, including glue to help do upgrades
+# installworld- install everything built by "buildworld"
+# world       - buildworld + installworld
 # update      - convenient way to update your source tree (eg: sup/cvs)
 # most        - build user commands, no libraries or include files
 # installmost - install user commands, no libraries or include files
@@ -32,10 +33,20 @@
 # /usr/share/mk.  These include:
 #		obj depend all install clean cleandepend cleanobj
 
+.if (!make(world)) && (!make(buildworld)) && (!make(installworld))
+.MAKEFLAGS:=	${.MAKEFLAGS} -m ${.CURDIR}/share/mk
+.endif
 
 # Put initial settings here.
 SUBDIR=
 
+# We must do share/info early so that installation of info `dir'
+# entries works correctly.  Do it first since it is less likely to
+# grow dependencies on include and lib than vice versa.
+.if exists(share/info)
+SUBDIR+= share/info
+.endif
+
 # We must do include and lib first so that the perl *.ph generation
 # works correctly as it uses the header files installed by this.
 .if exists(include)
@@ -54,8 +65,8 @@ SUBDIR+= games
 .if exists(gnu)
 SUBDIR+= gnu
 .endif
-.if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
-SUBDIR+= eBones
+.if exists(kerberosIV) && exists(crypto) && !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
+SUBDIR+= kerberosIV
 .endif
 .if exists(libexec)
 SUBDIR+= libexec
@@ -89,11 +100,12 @@ SUBDIR+= etc
 
 # These are last, since it is nice to at least get the base system
 # rebuilt before you do them.
-.if defined(MAKE_LOCAL) & exists(local) & exists(local/Makefile)
-SUBDIR+= local
+.if defined(LOCAL_DIRS)
+.for _DIR in ${LOCAL_DIRS}
+.if exists(${_DIR}) & exists(${_DIR}/Makefile)
+SUBDIR+= ${_DIR}
 .endif
-.if defined(MAKE_PORTS) & exists(ports) & exists(ports/Makefile)
-SUBDIR+= ports
+.endfor
 .endif
 
 # Handle -DNOOBJDIR, -DNOCLEAN and -DNOCLEANDIR
@@ -113,8 +125,8 @@ CLEANDIR=	cleandir
 .endif
 .endif
 
-SUP?=           sup
-SUPFLAGS?=      -v
+SUP?=		cvsup
+SUPFLAGS?=	-g -L 2 -P -
 
 #
 # While building tools for bootstrapping, we dont need to waste time on
@@ -135,87 +147,14 @@ world:
 	@echo "make world started on `LC_TIME=C date`"
 	@echo "--------------------------------------------------------------"
 .if target(pre-world)
+	@echo
 	@echo "--------------------------------------------------------------"
 	@echo " Making 'pre-world' target"
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR} && ${MAKE} pre-world
-	@echo
 .endif
-	@echo "--------------------------------------------------------------"
-	@echo " Making hierarchy"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} hierarchy
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding /usr/share/mk"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} mk
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Cleaning up the source tree"
-	@echo "--------------------------------------------------------------"
-.if defined(NOCLEAN)
-	@echo "Not cleaning anything! I sure hope you know what you are doing!"
-.else
-	cd ${.CURDIR} && ${MAKE} ${CLEANDIR}
-.endif
-	@echo
-.if !defined(NOOBJDIR)
-	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding the obj tree"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} obj
-	@echo
-.endif
-	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding bootstrap tools"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} bootstrap
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding tools necessary to build the include files"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} include-tools
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding /usr/include"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} includes
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding tools needed to build the libraries"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} lib-tools
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding /usr/lib"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} libraries
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding sgml tools, symorder, groff and zic(8)"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} build-tools
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding dependencies"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} depend
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Building everything.."
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} all
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Installing everything.."
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} install
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding man page indexes"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}/share/man && ${MAKE} makedb
+	cd ${.CURDIR} && ${MAKE} buildworld
+	cd ${.CURDIR} && ${MAKE} -B installworld
 .if target(post-world)
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -228,6 +167,146 @@ world:
 	@echo "make world completed on `LC_TIME=C date`"
 	@echo "--------------------------------------------------------------"
 
+.if defined(MAKEOBJDIRPREFIX)
+WORLDTMP=	${MAKEOBJDIRPREFIX}${.CURDIR}/tmp
+.else
+WORLDTMP=	/usr/obj${.CURDIR}/tmp
+.endif
+STRICTTMPPATH=	${WORLDTMP}/sbin:${WORLDTMP}/usr/sbin:${WORLDTMP}/bin:${WORLDTMP}/usr/bin
+TMPPATH=	${STRICTTMPPATH}:${PATH}
+
+# XXX COMPILER_PATH is needed for finding cc1, ld and as
+# XXX GCC_EXEC_PREFIX is for *crt.o.  It is probably unnecssary now
+#	tbat LIBRARY_PATH is set.  We still can't use -nostdlib, since gcc
+#	wouldn't link *crt.o or libgcc if it were used.
+# XXX LD_LIBRARY_PATH is for ld.so.  It is also used by ld, although we don't
+#	want that - all compile-time library paths should be resolved by gcc.
+#	It fails for set[ug]id executables (are any used?).
+COMPILER_ENV=	BISON_SIMPLE=${WORLDTMP}/usr/share/misc/bison.simple \
+		COMPILER_PATH=${WORLDTMP}/usr/libexec:${WORLDTMP}/usr/bin \
+		GCC_EXEC_PREFIX=${WORLDTMP}/usr/lib/ \
+		LD_LIBRARY_PATH=${WORLDTMP}${SHLIBDIR} \
+		LIBRARY_PATH=${WORLDTMP}${SHLIBDIR}:${WORLDTMP}/usr/lib
+
+BMAKEENV=	PATH=${TMPPATH} ${COMPILER_ENV} NOEXTRADEPEND=t
+XMAKEENV=	PATH=${STRICTTMPPATH} ${COMPILER_ENV} \
+		CC='cc -nostdinc'	# XXX -nostdlib
+
+# used to compile and install 'make' in temporary build tree
+IBMAKE=	${BMAKEENV} ${MAKE} DESTDIR=${WORLDTMP}
+# bootstrap make
+BMAKE=	${BMAKEENV} ${WORLDTMP}/usr/bin/${MAKE} DESTDIR=${WORLDTMP}
+# cross make used for compilation
+XMAKE=	${XMAKEENV} ${WORLDTMP}/usr/bin/${MAKE} DESTDIR=${WORLDTMP}
+# cross make used for final installation
+IXMAKE=	${XMAKEENV} ${WORLDTMP}/usr/bin/${MAKE}
+
+#
+# buildworld
+#
+# Attempt to rebuild the entire system, with reasonable chance of
+# success, regardless of how old your existing system is.
+#
+buildworld:
+.if !defined(NOCLEAN)
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Cleaning up the temporary build tree"
+	@echo "--------------------------------------------------------------"
+	mkdir -p ${WORLDTMP}
+	chflags -R noschg ${WORLDTMP}/
+	rm -rf ${WORLDTMP}
+.endif
+.if !defined(NOTOOLS)
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Making make"
+	@echo "--------------------------------------------------------------"
+	mkdir -p ${WORLDTMP}/usr/bin
+.if !defined(NOCLEAN) || !defined(NOOBJDIR)
+	cd ${.CURDIR}/usr.bin/make && \
+		${IBMAKE} -I${.CURDIR}/share/mk ${CLEANDIR} ${OBJDIR}
+.endif
+	cd ${.CURDIR}/usr.bin/make && \
+		${IBMAKE} -I${.CURDIR}/share/mk depend && \
+		${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} all && \
+		${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} install && \
+		${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} clean cleandepend
+.endif
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Making hierarchy"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR} && ${BMAKE} hierarchy
+.if !defined(NOCLEAN)
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Cleaning up the obj tree"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR} && ${BMAKE} par-${CLEANDIR}
+.endif
+.if !defined(NOOBJDIR)
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Rebuilding the obj tree"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR} && ${BMAKE} par-obj
+.endif
+.if !defined(NOTOOLS)
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Rebuilding bootstrap tools"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR} && ${BMAKE} bootstrap
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Rebuilding tools necessary to build the include files"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR} && ${BMAKE} include-tools
+.endif
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Rebuilding /usr/include"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR} && SHARED=symlinks ${BMAKE} includes
+.if !defined(NOTOOLS)
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Rebuilding tools needed to build the libraries"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR} && ${BMAKE} lib-tools
+.endif
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Rebuilding /usr/lib"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR} && ${BMAKE} libraries
+.if !defined(NOTOOLS)
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Rebuilding all other tools needed to build the world"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR} && ${BMAKE} build-tools
+.endif
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Rebuilding dependencies"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR} && ${XMAKE} ${.MAKEFLAGS} par-depend
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Building everything.."
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR} && ${XMAKE} all
+
+#
+# installworld
+#
+# Installs everything compiled by a 'buildworld'.
+#
+installworld:
+	cd ${.CURDIR} && ${IXMAKE} reinstall
+
 #
 # reinstall
 #
@@ -242,21 +321,20 @@ reinstall:
 	cd ${.CURDIR} && ${MAKE} hierarchy
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding /usr/share/mk"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${MAKE} mk
-	@echo
-	@echo "--------------------------------------------------------------"
 	@echo " Installing everything.."
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR} && ${MAKE} install
 	@echo
 	@echo "--------------------------------------------------------------"
+	@echo " Re-scanning the shared libraries.."
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR} && ldconfig -R
+	@echo
+	@echo "--------------------------------------------------------------"
 	@echo " Rebuilding man page indexes"
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}/share/man && ${MAKE} makedb
 
-
 #
 # update
 #
@@ -266,7 +344,7 @@ reinstall:
 update:
 .if defined(SUP_UPDATE)
 	@echo "--------------------------------------------------------------"
-	@echo "Running sup"
+	@echo "Running ${SUP}"
 	@echo "--------------------------------------------------------------"
 	@${SUP} ${SUPFLAGS} ${SUPFILE}
 .if defined(SUPFILE1)
@@ -280,10 +358,9 @@ update:
 	@echo "--------------------------------------------------------------"
 	@echo "Updating /usr/src from cvs repository" ${CVSROOT}
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} &&  cvs -q update -P -d
+	cd ${.CURDIR} && cvs -q update -P -d -r RELENG_2_2
 .endif
 
-
 #
 # most
 #
@@ -301,8 +378,8 @@ most:
 	cd ${.CURDIR}/gnu/libexec &&	${MAKE} ${.MAKEFLAGS} all
 	cd ${.CURDIR}/gnu/usr.bin &&	${MAKE} ${.MAKEFLAGS} all
 	cd ${.CURDIR}/gnu/usr.sbin &&	${MAKE} ${.MAKEFLAGS} all
-#.if defined(MAKE_EBONES) && !defined(NOCRYPT)
-#	cd ${.CURDIR}/eBones	&&	${MAKE} ${.MAKEFLAGS} most
+#.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT)
+#	cd ${.CURDIR}/kerberosIV	&&	${MAKE} ${.MAKEFLAGS} most
 #.endif
 #.if !defined(NOSECURE) && !defined(NOCRYPT)
 #	cd ${.CURDIR}/secure	&&	${MAKE} ${.MAKEFLAGS} most
@@ -326,8 +403,8 @@ installmost:
 	cd ${.CURDIR}/gnu/libexec &&	${MAKE} ${.MAKEFLAGS} install
 	cd ${.CURDIR}/gnu/usr.bin &&	${MAKE} ${.MAKEFLAGS} install
 	cd ${.CURDIR}/gnu/usr.sbin &&	${MAKE} ${.MAKEFLAGS} install
-#.if defined(MAKE_EBONES) && !defined(NOCRYPT)
-#	cd ${.CURDIR}/eBones	&&	${MAKE} ${.MAKEFLAGS} installmost
+#.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT)
+#	cd ${.CURDIR}/kerberos4	&&	${MAKE} ${.MAKEFLAGS} installmost
 #.endif
 #.if !defined(NOSECURE) && !defined(NOCRYPT)
 #	cd ${.CURDIR}/secure	&&	${MAKE} ${.MAKEFLAGS} installmost
@@ -350,34 +427,43 @@ installmost:
 hierarchy:
 	cd ${.CURDIR}/etc &&		${MAKE} distrib-dirs
 
-#
-# mk - update the /usr/share/mk makefiles.
-#
-mk:
-	cd ${.CURDIR}/share/mk &&	${MAKE} install
-
 #
 # bootstrap - [re]build tools needed to run the actual build, this includes
 # tools needed by 'make depend', as some tools are needed to generate source
 # for the dependency information to be gathered from.
 #
 bootstrap:
+.if defined(DESTDIR)
+	rm -f ${DESTDIR}/usr/src/sys
+	ln -s ${.CURDIR}/sys ${DESTDIR}/usr/src
+	cd ${.CURDIR}/include && find -dx . | cpio -dump ${DESTDIR}/usr/include
+	cd ${.CURDIR}/include && make symlinks
+.endif
 	cd ${.CURDIR}/usr.bin/make && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/usr.bin/xinstall && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/usr.bin/lex && ${MAKE} bootstrap && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} -DNOLIB all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} -DNOLIB all && \
+		${MAKE} ${MK_FLAGS} -DNOLIB -B install ${CLEANDIR}
+.if !defined(NOOBJDIR)
+	cd ${.CURDIR}/usr.bin/lex && ${MAKE} obj
+.endif
 
 #
 # include-tools - generally the same as 'bootstrap', except that it's for
 # things that are specifically needed to generate include files.
 #
-# XXX should be merged with bootstrap, it's not worth keeeping them seperate
+# XXX should be merged with bootstrap, it's not worth keeeping them separate.
+# Well, maybe it is now.  We force 'cleandepend' here to avoid dependencies
+# on cleaned away headers in ${WORLDTMP}.
 #
 include-tools:
-	cd ${.CURDIR}/usr.bin/rpcgen && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} depend all install ${CLEANDIR} ${OBJDIR}
+	cd ${.CURDIR}/usr.bin/rpcgen && ${MAKE} -B cleandepend depend && \
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 
 #
 # includes - possibly generate and install the include files.
@@ -388,25 +474,31 @@ includes:
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include
 .endif
-	cd ${.CURDIR}/include/rpcsvc &&		${MAKE} all
-	cd ${.CURDIR}/include &&		${MAKE} install
+	cd ${.CURDIR}/include &&		${MAKE} -B all install
 	cd ${.CURDIR}/gnu/include &&		${MAKE} install
 	cd ${.CURDIR}/gnu/lib/libreadline &&	${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libregex &&	${MAKE} beforeinstall
-	cd ${.CURDIR}/gnu/lib/libstdc++ &&      ${MAKE} beforeinstall
-	cd ${.CURDIR}/gnu/lib/libg++ &&         ${MAKE} beforeinstall
-	cd ${.CURDIR}/gnu/lib/libdialog &&      ${MAKE} beforeinstall
-.if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
-	cd ${.CURDIR}/eBones/include &&		${MAKE} beforeinstall
-	cd ${.CURDIR}/eBones/lib/libkrb &&	${MAKE} beforeinstall
-	cd ${.CURDIR}/eBones/lib/libkadm &&	${MAKE} beforeinstall
+	cd ${.CURDIR}/gnu/lib/libstdc++ &&	${MAKE} beforeinstall
+	cd ${.CURDIR}/gnu/lib/libg++ &&		${MAKE} beforeinstall
+	cd ${.CURDIR}/gnu/lib/libdialog &&	${MAKE} beforeinstall
+.if exists(kerberosIV) && !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
+	cd ${.CURDIR}/kerberosIV/lib/libacl &&	${MAKE} beforeinstall
+	cd ${.CURDIR}/kerberosIV/lib/libkadm &&	${MAKE} beforeinstall
+	cd ${.CURDIR}/kerberosIV/lib/libkafs &&	${MAKE} beforeinstall
+	cd ${.CURDIR}/kerberosIV/lib/libkdb &&	${MAKE} beforeinstall
+	cd ${.CURDIR}/kerberosIV/lib/libkrb &&	${MAKE} beforeinstall
+	cd ${.CURDIR}/kerberosIV/lib/libtelnet && ${MAKE} beforeinstall
+.else
+	cd ${.CURDIR}/lib/libtelnet &&		${MAKE} beforeinstall
 .endif
+	cd ${.CURDIR}/lib/csu/i386 &&		${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libalias &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libc &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcurses &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libedit &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libftpio &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmd &&		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libmytinfo &&         ${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libmytinfo &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libncurses &&		${MAKE} beforeinstall
 .if !defined(WANT_CSRG_LIBM)
 	cd ${.CURDIR}/lib/msun &&		${MAKE} beforeinstall
@@ -414,42 +506,38 @@ includes:
 	cd ${.CURDIR}/lib/libpcap &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/librpcsvc &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libskey &&		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libtcl &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libtermcap &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcom_err &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libss &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libscsi &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libutil &&		${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libz &&		${MAKE} beforeinstall
 
 #
 # lib-tools - build tools to compile and install the libraries.
 #
+# XXX gperf is required for cc
+# XXX a new ld and tsort is required for cc
 lib-tools:
-	cd ${.CURDIR}/usr.bin/tsort && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/gnu/usr.bin/ld && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/gnu/usr.bin/as && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/usr.bin/ar && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/usr.bin/ranlib && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/usr.bin/nm && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/usr.bin/lex/lib && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/usr.bin/compile_et && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR} && \
-		rm -f /usr/sbin/compile_et
-	cd ${.CURDIR}/usr.bin/mk_cmds && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/gnu/usr.bin/bison && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/gnu/usr.bin/gperf && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/gnu/usr.bin/cc && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+.for d in				\
+		gnu/usr.bin/gperf	\
+		gnu/usr.bin/ld		\
+		usr.bin/tsort		\
+		gnu/usr.bin/as		\
+		gnu/usr.bin/bison	\
+		gnu/usr.bin/awk		\
+		usr.bin/ar		\
+		usr.bin/compile_et	\
+		usr.bin/lex/lib		\
+		usr.bin/mk_cmds		\
+		usr.bin/nm		\
+		usr.bin/ranlib		\
+		usr.bin/uudecode	\
+		gnu/usr.bin/cc
+	cd ${.CURDIR}/$d && ${MAKE} depend && \
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
+.endfor
 
 #
 # libraries - build and install the libraries
@@ -457,62 +545,160 @@ lib-tools:
 libraries:
 .if exists(lib/csu/i386)
 	cd ${.CURDIR}/lib/csu/i386 && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(lib/libcompat)
 	cd ${.CURDIR}/lib/libcompat && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
+.endif
+.if exists(lib/libc)
+	cd ${.CURDIR}/lib/libc && ${MAKE} depend && \
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
+.endif
+.if exists(lib/libmytinfo)
+	cd ${.CURDIR}/lib/libmytinfo && ${MAKE} depend && \
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(lib/libncurses)
 	cd ${.CURDIR}/lib/libncurses && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(lib/libtermcap)
 	cd ${.CURDIR}/lib/libtermcap && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(gnu)
 	cd ${.CURDIR}/gnu/lib && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(secure) && !defined(NOCRYPT) && !defined(NOSECURE)
 	cd ${.CURDIR}/secure/lib && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(lib)
 	cd ${.CURDIR}/lib && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(usr.bin/lex/lib)
 	cd ${.CURDIR}/usr.bin/lex/lib && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
-.if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
-	cd ${.CURDIR}/eBones/lib && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+.if exists(kerberosIV) && exists(crypto) && !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
+	cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && \
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(usr.sbin/pcvt/keycap)
 	cd ${.CURDIR}/usr.sbin/pcvt/keycap && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
+.endif
+
+# Exclude perl from the build-tools if NOPERL is defined.
+.if defined(NOPERL)
+_perl=
+.else
+_perl=	gnu/usr.bin/perl/perl
 .endif
 
 #
 # build-tools - build and install any other tools needed to complete the
 # compile and install.
+# ifdef stale
+# bc and cpp are required to build groff.  Otherwise, the order here is
+# mostly historical, i.e., bogus.
+# chmod is used to build gcc's tmpmultilib[2] at obscure times.
+# endif stale
+# XXX uname is a bug - the target should not depend on the host.
 #
 build-tools:
 .for d in				\
-		share/info		\
-		gnu/usr.bin/texinfo	\
+		bin/cat 		\
+		bin/chmod		\
+		bin/cp 			\
+		bin/date		\
+		bin/dd			\
+		bin/echo		\
+		usr.bin/yacc		\
+		bin/expr		\
+		bin/hostname		\
+		bin/ln			\
+		bin/ls			\
+		bin/mkdir		\
+		bin/mv			\
+		bin/rm			\
+		bin/test		\
+		gnu/usr.bin/bc		\
+		gnu/usr.bin/grep	\
+		gnu/usr.bin/groff	\
+		gnu/usr.bin/gzip	\
+		gnu/usr.bin/man/makewhatis	\
+		gnu/usr.bin/patch	\
+		${_perl}		\
+		gnu/usr.bin/sort	\
+		gnu/usr.bin/texinfo     \
+		usr.bin/basename	\
+		usr.bin/cap_mkdb	\
+		usr.bin/chflags		\
+		usr.bin/cmp		\
+		usr.bin/col		\
+		usr.bin/cpp		\
+		usr.bin/expand		\
+		usr.bin/file2c		\
+		usr.bin/find		\
+		usr.bin/gencat		\
+		usr.bin/id		\
+		usr.bin/lorder		\
+		usr.bin/m4		\
+		usr.bin/mkdep		\
+		usr.bin/paste		\
+		usr.bin/sed		\
+		usr.bin/size		\
+		usr.bin/soelim		\
+		usr.bin/strip		\
 		usr.bin/symorder	\
-		usr.bin/sgmls		\
-		usr.bin/sgmlfmt		\
-		share/sgml		\
+		usr.bin/touch		\
+		usr.bin/tr		\
+		usr.bin/true		\
+		usr.bin/uname		\
+		usr.bin/uuencode	\
+		usr.bin/vgrind		\
+		usr.bin/vi		\
+		usr.bin/wc		\
+		usr.sbin/chown		\
+		usr.sbin/mtree		\
 		usr.sbin/zic		\
-		gnu/usr.bin/awk		\
-		gnu/usr.bin/groff
+		bin/sh
 	cd ${.CURDIR}/$d && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+		${MAKE} ${MK_FLAGS} all && \
+		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
+.endfor
+
+.for __target in clean cleandir obj depend
+.for entry in ${SUBDIR}
+${entry}.${__target}__D: .PHONY
+	if test -d ${.CURDIR}/${entry}.${MACHINE}; then \
+		${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE}"; \
+		edir=${entry}.${MACHINE}; \
+		cd ${.CURDIR}/$${edir}; \
+	else \
+		${ECHODIR} "===> ${DIRPRFX}${entry}"; \
+		edir=${entry}; \
+		cd ${.CURDIR}/$${edir}; \
+	fi; \
+	${MAKE} ${__target} DIRPRFX=${DIRPRFX}$${edir}/
+.endfor
+par-${__target}: ${SUBDIR:S/$/.${__target}__D/}
 .endfor
 
 .include <bsd.subdir.mk>

README

@@ -1,5 +1,5 @@
 This is the top level of the FreeBSD source directory.  This file
-was last revised on: $Id$
+was last revised on: $FreeBSD$
 
 For copyright information, please see the file COPYRIGHT in this
 directory (additional copyright information also exists for some
@@ -10,13 +10,14 @@ The Makefile in this directory supports a number of targets for
 building components (or all) of the FreeBSD source tree, the most
 commonly used one being ``world'', which rebuilds and installs
 everything in the FreeBSD system from the source tree except the
-kernel.  Please see the top of the Makefile for more information on
-the standard build targets and compile-time flags.
+kernel and the contents of /etc.  Please see the top of the Makefile
+in this directory for more information on the standard build targets
+and compile-time flags.
 
-Building a kernel with config(1) is a somewhat more involved process,
+Building a kernel with config(8) is a somewhat more involved process,
 documentation for which can be found at:
    http://www.freebsd.org/handbook/kernelconfig.html
-And in the config(1) man page.
+And in the config(8) man page.
 
 The sample kernel configuration files reside in the sys/i386/conf
 sub-directory (assuming that you've installed the kernel sources), the
@@ -33,7 +34,7 @@ bin		System/User commands.
 
 contrib		Packages contributed by 3rd parties.
 
-eBones		Kerberos package - NOT FOR EXPORT!
+crypto		Export controlled stuff (see crypto/README).
 
 etc		Template files for /etc
 
@@ -44,6 +45,8 @@ gnu		Various commands and libraries under the GNU Public License.
 
 include		System include files.
 
+kerberosIV	Kerberos package - also export controlled.
+
 lib		System libraries.
 
 libexec		System daemons.

bin/Makefile

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.4 1995/10/01 14:24:01 markm Exp $
+# $FreeBSD$
 
 SUBDIR= cat chio chmod cp csh date dd df domainname echo ed expr hostname \
 	kill ln ls mkdir mv pax ps pwd rcp rm rmail rmdir sh sleep \

bin/Makefile.inc

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 BINDIR?=	/bin
 NOSHARED?=	YES

bin/cat/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	cat
 

bin/cat/cat.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\"	$Id: cat.1,v 1.6 1997/02/22 14:01:26 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1995
 .Dt CAT 1
@@ -48,7 +48,7 @@
 .Op Ar
 .Sh DESCRIPTION
 The
-.Nm cat
+.Nm
 utility reads files sequentially, writing them to the standard output.
 The
 .Ar file
@@ -56,47 +56,44 @@ operands are processed in command line order.
 A single dash represents the standard input.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl b
-Implies the
-.Fl n
-option but doesn't number blank lines.
+Number the non-blank output lines, starting at 1.
 .It Fl e
-Implies the
+Display non-printing characters (see the
 .Fl v
-option, and displays a dollar sign
+option), and display a dollar sign
 .Pq Ql \&$
-at the end of each line
-as well.
+at the end of each line.
 .It Fl n
 Number the output lines, starting at 1.
 .It Fl s
 Squeeze multiple adjacent empty lines, causing the output to be
 single spaced.
 .It Fl t
-Implies the
+Display non-printing characters (see the
 .Fl v
-option, and displays tab characters as
-.Ql ^I
-as well.
+option), and display tab characters as
+.Ql ^I .
 .It Fl u
 The
 .Fl u
 option guarantees that the output is unbuffered.
 .It Fl v
-Displays non-printing characters so they are visible.
+Display non-printing characters so they are visible.
 Control characters print as
 .Ql ^X
 for control-X; the delete
 character (octal 0177) prints as
 .Ql ^?
-Non-ascii characters (with the high bit set) are printed as
+.Pf Non- Tn ASCII
+characters (with the high bit set) are printed as
 .Ql M-
 (for meta) followed by the character for the low 7 bits.
 .El
 .Pp
 The
-.Nm cat
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh BUGS
 Because of the shell language mechanism used to perform output
@@ -119,7 +116,8 @@ will cause the original data in file1 to be destroyed!
 A
 .Nm
 command appeared in Version 1 AT&T UNIX. 
-Dennis Ritchie designed and wrote the first man page. 
+.An Dennis Ritchie
+designed and wrote the first man page.
 It appears to have been
 .Xr cat 1 .
 

bin/cat/cat.c

@@ -33,17 +33,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cat.c,v 1.4 1996/09/28 21:19:27 imp Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
+static char const sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -78,7 +78,7 @@ main(argc, argv)
 
 	setlocale(LC_CTYPE, "");
 
-	while ((ch = getopt(argc, argv, "benstuv")) != EOF)
+	while ((ch = getopt(argc, argv, "benstuv")) != -1)
 		switch (ch) {
 		case 'b':
 			bflag = nflag = 1;	/* -b implies -n */

bin/chio/Makefile

@@ -1,9 +1,7 @@
-#	$Id: $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	chio
 SRCS=	chio.c
-BINOWN=	root
-BINMODE=4555
 
 .include <bsd.prog.mk>

bin/chio/chio.1

@@ -30,6 +30,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
+.\" $FreeBSD$
+.\"
 .Dd April 2, 1996
 .Dt CHIO 1
 .Os
@@ -61,49 +63,53 @@ rather than the default device
 .El
 .Pp
 The default changer may be overridden by setting the environment variable
-.Nm CHANGER
+.Ev CHANGER
 to the desired changer device.
 .Pp
 A medium changer apparatus is made up of
-.Pa elements .
+.Em elements .
 There are four element types:
-.Pa picker
+.Em picker
 (medium transport),
-.Pa slot
+.Em slot
 (storage),
-.Pa portal
+.Em portal
 (import/export), and
-.Pa drive
+.Em drive
 (data transfer).  In this command description, the shorthand
-.Nm ET
+.Em ET
 will be used to represent an element type, and
-.Nm EU
+.Em EU
 will be used to represent an element unit.  For example, to represent
-the first robotic arm in the changer, the ET would be
+the first robotic arm in the changer, the
+.Em ET
+would be
 .Dq picker
-and the EU would be
+and the
+.Em EU
+would be
 .Dq 0 .
 .Pp
 .Sh SUPPORTED COMMANDS
-.Nm chio move
+.Bl -tag -width indent
+.It Xo Nm chio move
 .Ar <from ET> <from EU> <to ET> <to EU>
 .Op Ar inv
-.Pp
-Moves the media unit from
+.Xc
+Move the media unit from
 .Pa <from ET/EU>
 to
 .Pa <to ET/EU> .
 If the optional modifier
 .Pa inv
 is specified, the media unit will be inverted before insertion.
-.Pp
-.Nm chio exchange
+.It Xo Nm chio exchange
 .Ar <src ET> <src EU> <dst1 ET> <dst1 EU>
 .Op Ar <dst2 ET> <dst2 ET>
 .Op Ar inv1
 .Op Ar inv2
-.Pp
-Performs a media unit exchange operation.  The media unit in
+.Xc
+Perform a media unit exchange operation.  The media unit in
 .Pa <src ET/EU>
 is moved to
 .Pa <dst1 ET/EU>
@@ -124,17 +130,16 @@ specify whether the media units are to be inverted before insertion into
 .Pa <dst1 ET/EU>
 and
 .Pa <dst2 ET/EU>
-respecitively.
+respectively.
 .Pp
 Note that not all medium changers support the
 .Nm exchange
 operation; The changer must have multiple free pickers or emulate
 multiple free pickers with transient storage.
-.Pp
-.Nm chio position
+.It Xo Nm chio position
 .Ar <to ET> <to EU>
 .Op Ar inv
-.Pp
+.Xc
 Position the picker in front of the element described by
 .Pa <to ET/EU> .
 If the optional modifier
@@ -142,61 +147,59 @@ If the optional modifier
 is specified, the media unit will be inverted before insertion.
 .Pp
 Note that not all changers behave as expected when issued this command.
-.Pp
-.Nm chio params
-.Pp
+.It Nm chio params
 Report the number of slots, drives, pickers, and portals in the changer,
 and which picker unit the changer is currently configured to use.
-.Pp
-.Nm chio getpicker
-.Pp
+.It Nm chio getpicker
 Report which picker unit the changer is currently configured to use.
-.Pp
-.Nm chio setpicker
+.It Xo Nm chio setpicker
 .Ar <unit>
-.Pp
+.Xc
 Configure the changer to use picker
 .Pa <unit> .
-.Pp
-.Nm chio status
+.It Xo Nm chio status
 .Op Ar <type>
-.Pp
+.Xc
 Report the status of all elements in the changer.  If
 .Pa <type>
 is specified, report the status of all elements of type
 .Pa <type> .
+.El
 .Pp
 The status bits are defined as follows:
 .Bl -tag -width indent
-.It Nm FULL
+.It FULL
 Element contains a media unit.
-.It Nm IMPEXP
+.It IMPEXP
 Media was deposited into element by an outside human operator.
-.It Nm EXCEPT
+.It EXCEPT
 Element is in an abnormal state.
-.It Nm ACCESS
+.It ACCESS
 Media in this element is accessible by a picker.
-.It Nm EXENAB
-Element supports passing media (exporting) to an outsite human operator.
-.It Nm INENAB
+.It EXENAB
+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
-.Nm chio move slot 3 drive 0
-.Pp
-Moves the media in slot 3 (fourth slot) to drive 0 (first drive).
-.Pp
-.Nm chio setpicker 2
-Configures the changer to use picker 2 (third picker) for operations.
-.Pp
+.Bl -tag -width indent
+.It Nm chio move slot 3 drive 0
+Move the media in slot 3 (fourth slot) to drive 0 (first drive).
+.It Nm chio setpicker 2
+Configure the changer to use picker 2 (third picker) for operations.
+.El
 .Sh FILES
-/dev/ch0 - default changer device
+.Bl -tag -width /dev/ch0 -compact
+.It Pa /dev/ch0
+default changer device
+.El
 .Sh SEE ALSO
 .Xr mt 1 ,
-.Xr mount 8 .
-.Sh AUTHOR
+.Xr ch 4 ,
+.Xr mount 8
+.Sh AUTHORS
 The
-.Nm chio
-program and SCSI changer driver were written by Jason R. Thorpe
-<[email protected]> for And Communications, http://www.and.com/
+.Nm
+program and SCSI changer driver were written by
+.An Jason R. Thorpe Aq [email protected]
+for And Communications, http://www.and.com/

bin/chio/chio.c

@@ -1,4 +1,4 @@
-/*	$Id: $	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe <[email protected]>
@@ -47,8 +47,6 @@
 #include "defs.h"
 #include "pathnames.h"
 
-extern	char *__progname;	/* from crt0.o */
-
 static	void usage __P((void));
 static	void cleanup __P((void));
 static	int parse_element_type __P((char *));
@@ -103,7 +101,6 @@ main(argc, argv)
 	char **argv;
 {
 	int ch, i;
-	char *cp;
 
 	while ((ch = getopt(argc, argv, "f:")) != -1) {
 		switch (ch) {
@@ -209,8 +206,8 @@ do_move(cname, argc, argv)
 	return (0);
 
  usage:
-	fprintf(stderr, "usage: %s %s "
-	    "<from ET> <from EU> <to ET> <to EU> [inv]\n", __progname, cname);
+	fprintf(stderr, "usage: chio %s "
+	    "<from ET> <from EU> <to ET> <to EU> [inv]\n", cname);
 	return (1);
 }
 
@@ -302,9 +299,9 @@ do_exchange(cname, argc, argv)
 	return (0);
 
  usage:
-	fprintf(stderr, "usage: %s %s <src ET> <src EU> <dst1 ET> <dst1 EU>\n"
-	    "       [<dst2 ET> <dst2 EU>] [inv1] [inv2]\n",
-	    __progname, cname);
+	fprintf(stderr,
+		"usage: chio %s <src ET> <src EU> <dst1 ET> <dst1 EU>\n"
+		"       [<dst2 ET> <dst2 EU>] [inv1] [inv2]\n", cname);
 	return (1);
 }
 
@@ -363,8 +360,7 @@ do_position(cname, argc, argv)
 	return (0);
 
  usage:
-	fprintf(stderr, "usage: %s %s <to ET> <to EU> [inv]\n",
-	    __progname, cname);
+	fprintf(stderr, "usage: chio %s <to ET> <to EU> [inv]\n", cname);
 	return (1);
 }
 
@@ -378,7 +374,7 @@ do_params(cname, argc, argv)
 
 	/* No arguments to this command. */
 	if (argc) {
-		warnx("%s: no arguements expected", cname);
+		warnx("%s: no arguments expected", cname);
 		goto usage;
 	}
 
@@ -400,7 +396,7 @@ do_params(cname, argc, argv)
 	return (0);
 
  usage:
-	fprintf(stderr, "usage: %s %s\n", __progname, cname);
+	fprintf(stderr, "usage: chio %s\n", cname);
 	return (1);
 }
 
@@ -427,7 +423,7 @@ do_getpicker(cname, argc, argv)
 	return (0);
 
  usage:
-	fprintf(stderr, "usage: %s %s\n", __progname, cname);
+	fprintf(stderr, "usage: chio %s\n", cname);
 	return (1);
 }
 
@@ -456,7 +452,7 @@ do_setpicker(cname, argc, argv)
 	return (0);
 
  usage:
-	fprintf(stderr, "usage: %s %s <picker>\n", __progname, cname);
+	fprintf(stderr, "usage: chio %s <picker>\n", cname);
 	return (1);
 }
 
@@ -470,7 +466,10 @@ do_status(cname, argc, argv)
 	struct changer_params data;
 	u_int8_t *statusp;
 	int i, count, chet, schet, echet;
-	char *cmdname, *description;
+	char *description;
+
+	count = 0;
+	description = NULL;
 
 	/*
 	 * On a status command, we expect the following:
@@ -562,8 +561,7 @@ do_status(cname, argc, argv)
 	return (0);
 
  usage:
-	fprintf(stderr, "usage: %s %s [<element type>]\n", __progname,
-	    cname);
+	fprintf(stderr, "usage: chio %s [<element type>]\n", cname);
 	return (1);
 }
 
@@ -637,7 +635,8 @@ bits_to_string(v, cp)
 			np++;
 		if ((v & (1 << (f - 1))) == 0)
 			continue;
-		bp += sprintf(bp, "%c%.*s", sep, np - cp, cp);
+		bp += snprintf(bp, sizeof(buf) - (bp - &buf[0]),
+						"%c%.*s", sep, np - cp, cp);
 		sep = ',';
 	}
 	if (sep != '<')
@@ -657,7 +656,12 @@ cleanup()
 static void
 usage()
 {
+	int i;
 
-	fprintf(stderr, "usage: %s command arg1 arg2 ...\n", __progname);
+	fprintf(stderr, "usage: chio [-f changer] command [args ...]\n");
+	fprintf(stderr, "commands:");
+	for (i = 0; commands[i].cc_name; i++)
+		fprintf(stderr, " %s", commands[i].cc_name);
+	fprintf(stderr, "\n");
 	exit(1);
 }

bin/chio/defs.h

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

bin/chio/pathnames.h

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

bin/chmod/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	chmod
 

bin/chmod/chmod.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"	$Id: chmod.1,v 1.7 1997/02/22 14:01:29 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
@@ -51,7 +51,7 @@
 .Ar file ...
 .Sh DESCRIPTION
 The
-.Nm chmod
+.Nm
 utility modifies the file mode bits of the listed files
 as specified by the
 .Ar mode
@@ -82,7 +82,7 @@ Symbolic links do not have modes, so unless the
 or
 .Fl L
 option is set,
-.Nm chmod
+.Nm
 on a symbolic link always succeeds and has no effect.
 The
 .Fl H ,
@@ -99,35 +99,63 @@ Only the owner of a file or the super-user is permitted to change
 the mode of a file.
 .Pp
 The
-.Nm chmod
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh MODES
 Modes may be absolute or symbolic.
-An absolute mode is an octal number constructed by
-.Ar or-ing
-the following values:
+An absolute mode is an octal number constructed from the sum of
+one or more of the following values:
 .Pp
 .Bl -tag -width 6n -compact -offset indent
 .It Li 4000
-set-user-ID-on-execution
+(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 
+.Xr chmod 2
+and the 
+.Ar suiddir
+option to
+.Xr mount 1 .
 .It Li 2000
-set-group-ID-on-execution
+(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
-sticky bit, see chmod(2)
+(the sticky bit)  
+When set on a directory, unprivileged users can delete and rename
+only those files in the directory that are owned by them, regardless of 
+the permissions on the directory.  Under FreeBSD, the sticky bit is 
+ignored for executable files and may only be set for directories (see 
+.Xr sticky 8 ).
 .It Li 0400
-read by owner
+Allow read by owner.
 .It Li 0200
-write by owner
+Allow write by owner.
 .It Li 0100
-execute (or search for directories) by owner
-.It Li 0070
-read, write, execute/search by group
-.It Li 0007
-read, write, execute/search by others
+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 
+group members to search in the directory.
+.It Li 0004
+Allow read by others.
+.It Li 0002
+Allow write by others.
+.It Li 0001
+For files, allow execution by others.  For directories allow others to
+search in the directory.
 .El
 .Pp
-The read, write, and execute/search values for group and others
-are encoded as described for owner.
+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:
 .Bd -literal -offset indent
@@ -276,16 +304,18 @@ option for the naughty bits.
 .Sh SEE ALSO
 .Xr chflags 1 ,
 .Xr install 1 ,
+.Xr mount 1 ,
 .Xr chmod 2 ,
 .Xr stat 2 ,
 .Xr umask 2 ,
 .Xr fts 3 ,
 .Xr setmode 3 ,
 .Xr symlink 7 ,
-.Xr chown 8
+.Xr chown 8 ,
+.Xr sticky 8
 .Sh STANDARDS
 The
-.Nm chmod
+.Nm
 utility is expected to be
 .St -p1003.2
 compatible with the exception of the

bin/chmod/chmod.c

@@ -30,17 +30,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: chmod.c,v 1.4 1995/03/19 13:27:43 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1989, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
+static char const sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -73,7 +73,7 @@ main(argc, argv)
 	set = NULL;
 	omode = 0;
 	Hflag = Lflag = Pflag = Rflag = fflag = hflag = 0;
-	while ((ch = getopt(argc, argv, "HLPRXfgorstuwx")) != EOF)
+	while ((ch = getopt(argc, argv, "HLPRXfgorstuwx")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;

bin/cp/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	cp
 SRCS=	cp.c utils.c

bin/cp/cp.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: cp.1,v 1.9 1997/02/22 14:01:32 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt CP 1
@@ -60,7 +60,7 @@
 .Ar source_file ... target_directory
 .Sh DESCRIPTION
 In the first synopsis form, the
-.Nm cp
+.Nm
 utility copies the contents of the
 .Ar source_file
 to the
@@ -72,7 +72,7 @@ is copied to the destination
 .Ar target_directory .
 The names of the files themselves are not changed.
 If
-.Nm cp
+.Nm
 detects an attempt to copy a file to itself, the copy will fail.
 .Pp
 The following options are available:
@@ -94,11 +94,11 @@ option is specified, no symbolic links are followed.
 If
 .Ar source_file
 designates a directory,
-.Nm cp
+.Nm
 copies the directory and the entire subtree connected at that point.
 This option also causes symbolic links to be copied, rather than
 indirected through, and for
-.Nm cp
+.Nm
 to create special files rather than copying them as normal files.
 Created directories have the same mode as the corresponding source
 directory, unmodified by the process' umask.
@@ -112,8 +112,8 @@ option overrides any previous
 .Fl i
 options.)
 .It Fl i
-Causes
-.Nm cp
+Cause
+.Nm
 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
@@ -127,8 +127,8 @@ option overrides any previous
 .Fl f
 options.)
 .It Fl p
-Causes
-.Nm cp
+Cause
+.Nm
 to preserve in the copy as many of the modification time, access time,
 file flags, file mode, user ID, and group ID as allowed by permissions.
 .Pp
@@ -143,13 +143,15 @@ be preserved, the set group ID bit is not preserved
 in the copy's permissions.
 If the source file has both its set user ID and set group ID bits on,
 and either the user ID or group ID cannot be preserved, neither
-the set user ID or set group ID bits are preserved in the copy's
+the set user ID nor set group ID bits are preserved in the copy's
 permissions.
 .El
 .Pp
 For each destination file that already exists, its contents are
-overwritten if permissions allow, but its mode, user ID, and group
-ID are unchanged.
+overwritten if permissions allow.  Its mode, user ID, and group
+ID are unchanged unless the
+.Fl p
+option was specified.
 .Pp
 In the second synopsis form, 
 .Ar target_directory 
@@ -200,7 +202,7 @@ command's actions are determined by the last one specified.
 exits 0 on success, >0 if an error occurred.
 .Sh COMPATIBILITY
 Historic versions of the
-.Nm cp
+.Nm
 utility had a
 .Fl r
 option.
@@ -215,7 +217,7 @@ or fifo's.
 .Xr symlink 7
 .Sh STANDARDS
 The
-.Nm cp
+.Nm
 command is expected to be
 .St -p1003.2
 compatible.

bin/cp/cp.c

@@ -33,17 +33,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cp.c,v 1.9 1996/02/19 05:56:33 pst Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1988, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";
+static char const sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";
 #endif /* not lint */
 
 /*
@@ -51,7 +51,7 @@ static char sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";
  *
  * The global PATH_T structure "to" always contains the path to the
  * current target file.  Since fts(3) does not change directories,
- * this path can be either absolute or dot-realative.
+ * this path can be either absolute or dot-relative.
  *
  * The basic algorithm is to initialize "to" and use fts(3) to traverse
  * the file hierarchy rooted in the argument list.  A trivial case is the
@@ -105,7 +105,7 @@ main(argc, argv)
 	char *target;
 
 	Hflag = Lflag = Pflag = 0;
-	while ((ch = getopt(argc, argv, "HLPRfipr")) != EOF)
+	while ((ch = getopt(argc, argv, "HLPRfipr")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
@@ -253,7 +253,7 @@ copy(argv, type, fts_options)
 	struct stat to_stat;
 	FTS *ftsp;
 	FTSENT *curr;
-	int base, dne, nlen, rval;
+	int base = 0, dne, nlen, rval;
 	char *p, *target_mid;
 
 	if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL)
@@ -261,6 +261,7 @@ copy(argv, type, fts_options)
 	for (rval = 0; (curr = fts_read(ftsp)) != NULL;) {
 		switch (curr->fts_info) {
 		case FTS_NS:
+		case FTS_DNR:
 		case FTS_ERR:
 			warnx("%s: %s",
 			    curr->fts_path, strerror(curr->fts_errno));
@@ -341,6 +342,13 @@ copy(argv, type, fts_options)
 					(void)fts_set(ftsp, curr, FTS_SKIP);
 				continue;
 			}
+			if (!S_ISDIR(curr->fts_statp->st_mode) &&
+			    S_ISDIR(to_stat.st_mode)) {
+		warnx("cannot overwrite directory %s with non-directory %s",
+				    to.p_path, curr->fts_path);
+				rval = 1;
+				continue;
+			}
 			dne = 0;
 		}
 

bin/cp/extern.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- *	$Id: extern.h,v 1.3 1996/02/18 18:48:26 wosch Exp $
+ * $FreeBSD$
  */
 
 typedef struct {

bin/cp/utils.c

@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: utils.c,v 1.6 1996/02/18 18:48:26 wosch Exp wosch $
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
+static char const sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -60,7 +60,8 @@ copy_file(entp, dne)
 {
 	static char buf[MAXBSIZE];
 	struct stat to_stat, *fs;
-	int ch, checkch, from_fd, rcount, rval, to_fd, wcount;
+	int ch, checkch, from_fd, rcount, rval, to_fd, wcount, wresid;
+	char *bufp;
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
 	char *p;
 #endif
@@ -81,13 +82,16 @@ copy_file(entp, dne)
 	 * modified by the umask.)
 	 */
 	if (!dne) {
+#define YESNO "(y/n [n]) "
 		if (iflag) {
-			(void)fprintf(stderr, "overwrite %s? ", to.p_path);
+			(void)fprintf(stderr, "overwrite %s? %s", 
+					to.p_path, YESNO);
 			checkch = ch = getchar();
 			while (ch != '\n' && ch != EOF)
 				ch = getchar();
 			if (checkch != 'y' && checkch != 'Y') {
 				(void)close(from_fd);
+				(void)fprintf(stderr, "not overwritten\n");
 				return (0);
 			}
 		}
@@ -121,11 +125,17 @@ copy_file(entp, dne)
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
 	if (fs->st_size <= 8 * 1048576) {
 		if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
-		    0, from_fd, (off_t)0)) == (char *)-1) {
+		    MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
 			warn("%s", entp->fts_path);
 			rval = 1;
 		} else {
-			if (write(to_fd, p, fs->st_size) != fs->st_size) {
+			for (bufp = p, wresid = fs->st_size; ;
+			    bufp += wcount, wresid -= wcount) {
+				wcount = write(to_fd, bufp, wresid);
+				if (wcount >= wresid || wcount <= 0)
+					break;
+			}
+			if (wcount != wresid) {
 				warn("%s", to.p_path);
 				rval = 1;
 			}
@@ -139,8 +149,13 @@ copy_file(entp, dne)
 #endif
 	{
 		while ((rcount = read(from_fd, buf, MAXBSIZE)) > 0) {
-			wcount = write(to_fd, buf, rcount);
-			if (rcount != wcount || wcount == -1) {
+			for (bufp = buf, wresid = rcount; ;
+			    bufp += wcount, wresid -= wcount) {
+				wcount = write(to_fd, bufp, wresid);
+				if (wcount >= wresid || wcount <= 0)
+					break;
+			}
+			if (wcount != wresid) {
 				warn("%s", to.p_path);
 				rval = 1;
 				break;
@@ -192,7 +207,7 @@ copy_link(p, exists)
 	int len;
 	char link[MAXPATHLEN];
 
-	if ((len = readlink(p->fts_path, link, sizeof(link))) == -1) {
+	if ((len = readlink(p->fts_path, link, sizeof(link) - 1)) == -1) {
 		warn("readlink: %s", p->fts_path);
 		return (1);
 	}
@@ -247,7 +262,9 @@ setfile(fs, fd)
 	int fd;
 {
 	static struct timeval tv[2];
+	struct stat ts;
 	int rval;
+	int gotstat;
 
 	rval = 0;
 	fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
@@ -259,30 +276,42 @@ setfile(fs, fd)
 		warn("utimes: %s", to.p_path);
 		rval = 1;
 	}
+	if (fd ? fstat(fd, &ts) : stat(to.p_path, &ts))
+		gotstat = 0;
+	else {
+		gotstat = 1;
+		ts.st_mode &= S_ISUID | S_ISGID | S_ISVTX |
+			      S_IRWXU | S_IRWXG | S_IRWXO;
+	}
 	/*
 	 * Changing the ownership probably won't succeed, unless we're root
 	 * or POSIX_CHOWN_RESTRICTED is not set.  Set uid/gid before setting
 	 * the mode; current BSD behavior is to remove all setuid bits on
 	 * chown.  If chown fails, lose setuid/setgid bits.
 	 */
-	if (fd ? fchown(fd, fs->st_uid, fs->st_gid) :
-	    chown(to.p_path, fs->st_uid, fs->st_gid)) {
-		if (errno != EPERM) {
+	if (!gotstat || fs->st_uid != ts.st_uid || fs->st_gid != ts.st_gid)
+		if (fd ? fchown(fd, fs->st_uid, fs->st_gid) :
+		    chown(to.p_path, fs->st_uid, fs->st_gid)) {
+			if (errno != EPERM) {
+				warn("chown: %s", to.p_path);
+				rval = 1;
+			}
+			fs->st_mode &= ~(S_ISUID | S_ISGID);
+		}
+
+	if (!gotstat || fs->st_mode != ts.st_mode)
+		if (fd ? fchmod(fd, fs->st_mode) : chmod(to.p_path, fs->st_mode)) {
 			warn("chown: %s", to.p_path);
 			rval = 1;
 		}
-		fs->st_mode &= ~(S_ISUID | S_ISGID);
-	}
-	if (fd ? fchmod(fd, fs->st_mode) : chmod(to.p_path, fs->st_mode)) {
-		warn("chown: %s", to.p_path);
-		rval = 1;
-	}
 
-	if (fd ?
-	    fchflags(fd, fs->st_flags) : chflags(to.p_path, fs->st_flags)) {
-		warn("chflags: %s", to.p_path);
-		rval = 1;
-	}
+	if (!gotstat || fs->st_flags != ts.st_flags)
+		if (fd ?
+		    fchflags(fd, fs->st_flags) : chflags(to.p_path, fs->st_flags)) {
+			warn("chflags: %s", to.p_path);
+			rval = 1;
+		}
+
 	return (rval);
 }
 

bin/csh/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -11,7 +11,7 @@ DFLAGS=-DBUILTIN -DFILEC -DNLS -DSHORT_STRINGS
 CFLAGS+=-I${.CURDIR} -I. ${DFLAGS}
 SRCS=	alloc.c char.c const.c csh.c dir.c dol.c err.c exec.c exp.c file.c \
 	func.c glob.c hist.c init.c lex.c misc.c parse.c printf.c proc.c \
-	sem.c set.c str.c time.c const.h err.h
+	sem.c set.c str.c time.c const.h errnum.h
 .PATH:	${.CURDIR}/../../usr.bin/printf
 
 MAN1=	csh.1
@@ -19,23 +19,23 @@ MLINKS=	csh.1 limit.1 csh.1 alias.1 csh.1 bg.1 csh.1 dirs.1 csh.1 fg.1 \
 	csh.1 foreach.1 csh.1 history.1 csh.1 jobs.1 csh.1 popd.1 \
 	csh.1 pushd.1 csh.1 rehash.1 csh.1 repeat.1 csh.1 suspend.1 \
 	csh.1 stop.1 csh.1 source.1
-CLEANFILES+=err.h const.h
+CLEANFILES+=const.h errnum.h
 
-const.h: err.h
+const.h: errnum.h
 
-err.h: err.c
-	@rm -f $@
-	@echo '/* Do not edit this file, make creates it. */' > $@
-	@echo '#ifndef _h_sh_err' >> $@
-	@echo '#define _h_sh_err' >> $@
-	egrep 'ERR_' ${.CURDIR}/$*.c | egrep '^#define' >> $@
-	@echo '#endif /* _h_sh_err */' >> $@
+errnum.h: err.c
+	@rm -f ${.TARGET}
+	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
+	@echo '#ifndef _h_sh_error' >> ${.TARGET}
+	@echo '#define _h_sh_error' >> ${.TARGET}
+	egrep 'ERR_' ${.ALLSRC} | egrep '^#define' >> ${.TARGET}
+	@echo '#endif /* _h_sh_error */' >> ${.TARGET}
 
 const.h: const.c
-	@rm -f $@
-	@echo '/* Do not edit this file, make creates it. */' > $@
-	${CC} -E ${CFLAGS} ${.CURDIR}/$*.c | egrep 'Char STR' | \
+	@rm -f ${.TARGET}
+	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
+	${CC} -E ${CFLAGS} ${.ALLSRC} | egrep 'Char STR' | \
 	    sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
-	    sort >> $@
+	    sort >> ${.TARGET}
 
 .include <bsd.prog.mk>

bin/csh/USD.doc/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id$
+# $FreeBSD$
 
 DIR=	usd/04.csh
 SRCS=	tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g

bin/csh/USD.doc/csh.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\"	$Id: csh.1,v 1.2 1994/09/24 02:54:23 davidg Exp $
+.\" $FreeBSD$
 .\"
 .EH 'USD:4-%''An Introduction to the C shell'
 .OH 'An Introduction to the C shell''USD:4-%'

bin/csh/USD.doc/csh.2

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\"	$Id: csh.2,v 1.2 1994/09/24 02:54:24 davidg Exp $
+.\" $FreeBSD$
 .\"
 .nr H1 1
 .NH

bin/csh/USD.doc/csh.3

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 2
 .NH

bin/csh/USD.doc/csh.4

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 3
 .NH

bin/csh/USD.doc/csh.a

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .SH
 Appendix \- Special characters

bin/csh/USD.doc/csh.g

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .SH
 Glossary

bin/csh/USD.doc/tabs

@@ -30,6 +30,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n

bin/csh/alloc.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alloc.c,v 1.3 1995/03/19 13:28:10 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/csh/char.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/csh/char.h

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

bin/csh/const.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: const.c,v 1.3 1995/05/30 00:06:29 rgrimes Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/csh/csh.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\"	$Id: csh.1,v 1.8 1997/02/22 14:01:40 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 21, 1994
 .Dt CSH 1
@@ -46,15 +46,15 @@
 .Op Fl l
 .Sh DESCRIPTION
 The
-.Nm csh
+.Nm
 is a command language interpreter
 incorporating a history mechanism (see
-.Nm History Substitutions ) ,
+.Sx History Substitutions ) ,
 job control facilities (see
-.Nm Jobs ) ,
+.Sx Jobs ) ,
 interactive file name
 and user name completion (see
-.Nm File Name Completion ) ,
+.Sx File Name Completion ) ,
 and a C-like syntax. It is used both as an interactive
 login shell and a shell script command processor.
 .Ss Argument list processing
@@ -100,7 +100,7 @@ is the only flag specified).
 The shell loads
 .Pa .cshrc
 even if it does not belong to the effective user.
-.Xr su 1
+.Xr Su 1
 can pass
 .Fl m
 to the shell.
@@ -116,16 +116,16 @@ A
 may be used to escape the newline at the end of this
 line and continue onto another line.
 .It Fl v
-Causes the
+Cause the
 .Ar verbose
 variable to be set, with the effect
 that command input is echoed after history substitution.
 .It Fl x
-Causes the
+Cause the
 .Ar echo
 variable to be set, so that commands are echoed immediately before execution.
 .It Fl V
-Causes the
+Cause the
 .Ar verbose
 variable to be set even before
 .Pa .cshrc
@@ -157,7 +157,7 @@ Remaining arguments initialize the variable
 .Ar argv .
 .Pp
 An instance of
-.Nm csh
+.Nm
 begins by executing commands from the file
 .Pa /etc/csh.cshrc
 and,
@@ -256,7 +256,7 @@ showing that the job which was started asynchronously was job number
 1 and had one (top-level) process, whose process id was 1234.
 .Pp
 If you are running a job and wish to do something else you may hit the key
-.Nm ^Z
+.Em ^Z
 (control-Z) which sends a STOP signal to the current job.
 The shell will then normally show that the job has been `Stopped',
 and print another prompt.  You can then manipulate the state of this job,
@@ -271,11 +271,11 @@ the
 command
 .Ar fg  .
 A
-.Nm ^Z
+.Em ^Z
 takes effect immediately and
 is like an interrupt in that pending output and unread input are discarded
 when it is typed.  There is another special key
-.Nm ^Y
+.Em ^Y
 that does not generate a STOP signal until a program attempts to
 .Xr read  2
 it.
@@ -353,7 +353,7 @@ the shell variable
 .Ar filec
 (see
 .Ic set ) ,
-.Nm csh
+.Nm
 will
 interactively complete file names and user names from unique
 prefixes, when they are input from the terminal followed by
@@ -370,7 +370,7 @@ and the input is
 .Pp
 .Dl % vi ch<escape>
 .Pp
-.Nm csh
+.Nm
 will complete the prefix ``ch''
 to the only matching file name ``chaosnet'', changing the input
 line to
@@ -381,7 +381,7 @@ However, given
 .Pp
 .Dl % vi D<escape>
 .Pp
-.Nm csh
+.Nm
 will only expand the input to
 .Pp
 .Dl % vi DSC.
@@ -391,7 +391,7 @@ incomplete, since there are two file names matching the prefix ``D''.
 .Pp
 If a partial file name is followed by the end-of-file character
 (usually control-D), then, instead of completing the name,
-.Nm csh
+.Nm
 will list all file names matching the prefix.  For example,
 the input
 .Pp
@@ -455,7 +455,7 @@ in the previous command with little typing and a high degree of confidence.
 History substitutions begin with the character `!' and may begin
 .Ar anywhere
 in the input stream (with the proviso that they
-.Nm "do not"
+.Em "do not"
 nest.)
 This `!' may be preceded by a `\e' to prevent its special meaning; for
 convenience, an `!' is passed unchanged when it is followed by a blank,
@@ -631,7 +631,7 @@ Strings enclosed in `"' may be expanded as described below.
 .Pp
 In both cases the resulting text becomes (all or part of) a single word;
 only in one special case (see
-.Em Command Substitution
+.Sx Command Substitution
 below) does a `"' quoted string yield parts of more than one word;
 `\'' quoted strings never do.
 .Ss Alias substitution
@@ -708,7 +708,7 @@ occurs, and within `\''s where it
 .Em never
 occurs.
 Strings quoted by `\*(ga' are interpreted later (see
-.Nm "Command substitution"
+.Sx "Command substitution"
 below) so `$' substitution does not occur there until later, if at all.
 A `$' is passed unchanged if followed by a blank, tab, or end-of-line.
 .Pp
@@ -764,11 +764,11 @@ It is not an error for a range to be empty if the second argument is omitted
 or in range.
 .It $#name
 .It ${#name}
-Gives the number of words in the variable.
+Give the number of words in the variable.
 This is useful for later use in a
 `$argv[selector]'.
 .It $0
-Substitutes the name of the file from which command input is being read.
+Substitute the name of the file from which command input is being read.
 An error occurs if the name is not known.
 .It $number
 .It ${number}
@@ -788,16 +788,16 @@ The following substitutions may not be modified with `:' modifiers.
 .Bl -tag -width Ds -compact -offset indent
 .It $?name
 .It ${?name}
-Substitutes the string `1' if name is set, `0' if it is not.
+Substitute the string `1' if name is set, `0' if it is not.
 .It $?0
-Substitutes `1' if the current input filename is known, `0' if it is not.
+Substitute `1' if the current input filename is known, `0' if it is not.
 .It \&$\&$\&
 Substitute the (decimal) process number of the (parent) shell.
 .It $!
 Substitute the (decimal) process number of the last background process
 started by this shell.
 .It $<
-Substitutes a line from the standard
+Substitute a line from the standard
 input, with no further interpretation.
 It can be used to read from the keyboard in a shell script.
 .El
@@ -922,7 +922,7 @@ is expanded in the same way as `<' input filenames are.
 .It >>& name
 .It >>! name
 .It >>&! name
-Uses file
+Use file
 .Ar name
 as the standard output;
 like `>' but places output at the end of the file.
@@ -961,11 +961,11 @@ Several of the builtin commands (to be described later)
 take expressions, in which the operators are similar to those of C, with
 the same precedence.
 These expressions appear in the
-.Nm @,
-.Ar exit ,
-.Ar if ,
+.Em @ ,
+.Em exit ,
+.Em if ,
 and
-.Ar while
+.Em while
 commands.
 The following operators are available:
 .Bd -ragged -offset indent
@@ -1076,7 +1076,7 @@ or
 .Ar unalias .
 .Pp
 .It Ic alloc
-Shows the amount of dynamic memory acquired, broken down into used and
+Show the amount of dynamic memory acquired, broken down into used and
 free memory.
 With an argument shows the number of free and used blocks in each size
 category.  The categories start at size 8 and double at each step.
@@ -1085,11 +1085,11 @@ systems other than the VAX may use a different memory allocator.
 .Pp
 .It Ic bg
 .It Ic bg \&% Ns Ar job ...
-Puts the current or specified jobs into the background, continuing them
+Put the current or specified jobs into the background, continuing them
 if they were stopped.
 .Pp
 .It Ic break
-Causes execution to resume after the
+Cause execution to resume after the
 .Ic end
 of the nearest enclosing
 .Ic foreach
@@ -1099,7 +1099,7 @@ The remaining commands on the current line are executed.
 Multi-level breaks are thus possible by writing them all on one line.
 .Pp
 .It Ic breaksw
-Causes a break from a
+Cause a break from a
 .Ic switch ,
 resuming after the
 .Ic endsw .
@@ -1137,7 +1137,7 @@ or
 The rest of the commands on the current line are executed.
 .Pp
 .It Ic default :
-Labels the default case in a
+Label the default case in a
 .Ic switch
 statement.
 The default should come after all
@@ -1145,7 +1145,7 @@ The default should come after all
 labels.
 .Pp
 .It Ic dirs
-Prints the directory stack; the top of the stack is at the left,
+Print the directory stack; the top of the stack is at the left,
 the first directory in the stack being the current directory.
 .Pp
 .It Ic echo Ar  wordlist
@@ -1192,7 +1192,7 @@ variable (first form) or with the value of the specified
 .Pp
 .It Ic fg
 .It Ic fg % Ns Ar job ...
-Brings the current or specified jobs into the foreground, continuing them if
+Bring the current or specified jobs into the foreground, continuing them if
 they were stopped.
 .Pp
 .It Ic foreach Ar name (wordlist)
@@ -1252,7 +1252,7 @@ that does not begin with a `/'.
 .It Ic history Ar n
 .It Ic history Fl r Ar n
 .It Ic history Fl h Ar n
-Displays the history event list; if
+Display the history event list; if
 .Ar n
 is given only the
 .Ar n
@@ -1324,7 +1324,7 @@ must appear alone on its input line or after an
 .Pp
 .It Ic jobs
 .It Ic jobs Fl l
-Lists the active jobs; the
+List the active jobs; the
 .Fl l
 option lists process id's in addition to the normal information.
 .Pp
@@ -1332,10 +1332,10 @@ option lists process id's in addition to the normal information.
 .It Ic kill Ar pid
 .It Ic kill Fl sig Ar pid ...
 .It Ic kill Fl l
-Sends either the TERM (terminate) signal or the
+Send either the TERM (terminate) signal or the
 specified signal to the specified jobs or processes.
 Signals are either given by number or by names (as given in
-.Pa /usr/include/signal.h,
+.Pa /usr/include/signal.h ,
 stripped of the prefix ``SIG'').
 The signal names are listed by ``kill \-l''.
 There is no default, just saying `kill' does not
@@ -1349,7 +1349,7 @@ then the job or process will be sent a CONT (continue) signal as well.
 .It Ic limit Fl h
 .It Ic limit Fl h Ar resource
 .It Ic limit Fl h Ar resource maximum-use
-Limits the consumption by the current process and each process
+Limit the consumption by the current process and each process
 it creates to not individually exceed
 .Ar maximum-use
 on the
@@ -1405,7 +1405,7 @@ of the names suffice.
 .Pp
 .It Ic login
 Terminate a login shell, replacing it with an instance of
-.Pa /usr/bin/login.
+.Pa /usr/bin/login .
 This is one way to log off, included for compatibility with
 .Xr sh  1  .
 .Pp
@@ -1448,7 +1448,7 @@ All processes detached with `&' are effectively
 .Pp
 .It Ic notify
 .It Ic notify % Ns Ar job ...
-Causes the shell to notify the user asynchronously when the status of the
+Cause the shell to notify the user asynchronously when the status of the
 current or specified jobs change; normally notification is presented
 before a prompt.  This is automatic if the shell variable
 .Ic notify
@@ -1478,7 +1478,7 @@ are disabled (/etc/csh.cshrc, /etc/csh.login).
 .Pp
 .It Ic popd
 .It Ic popd Ar +n
-Pops the directory stack, returning to the new top directory.
+Pop the directory stack, returning to the new top directory.
 With an argument
 .Ns \`+ Ar n Ns \'
 discards the
@@ -1511,7 +1511,7 @@ stack around to be the top element and changes to it.  The members
 of the directory stack are numbered from the top starting at 0.
 .Pp
 .It Ic rehash
-Causes the internal hash table of the contents of the directories in
+Cause the internal hash table of the contents of the directories in
 the
 .Ic path
 variable to be recomputed.  This is needed if new commands are added
@@ -1589,7 +1589,7 @@ The most commonly used environment variables
 and
 .Ev PATH
 are automatically imported to and exported from the
-.Nm csh
+.Nm
 variables
 .Ar user ,
 .Ar term ,
@@ -1625,19 +1625,21 @@ commands.
 Normally input during
 .Ic source
 commands is not placed on the history list;
-the \-h option causes the commands to be placed on the
+the
+.Fl h
+option causes the commands to be placed on the
 history list without being executed.
 .Pp
 .It Ic stop
 .It Ic stop % Ns Ar job ...
-Stops the current or specified jobs that are executing in the background.
+Stop the current or specified jobs that are executing in the background.
 .Pp
 .It Ic suspend
-Causes the shell to stop in its tracks, much as if it had been sent a stop
+Cause the shell to stop in its tracks, much as if it had been sent a stop
 signal with
-.Ic ^Z .
+.Em ^Z .
 This is most often used to stop shells started by
-.Xr su  1 .
+.Xr su 1 .
 .Pp
 .It Ic switch Ar (string)
 .It Ic case Ar str1 :
@@ -1699,7 +1701,7 @@ is disabled.
 .It Ic unlimit Ar  resource
 .It Ic unlimit Fl h
 .It Ic unlimit Fl h Ar resource
-Removes the limitation on
+Remove the limitation on
 .Ar resource  .
 If no
 .Ar resource
@@ -1718,7 +1720,7 @@ It is not an error for nothing to be
 .Ic unset .
 .Pp
 .It Ic unsetenv Ar pattern
-Removes all variables whose name match the specified pattern from the
+Remove all variables whose name match the specified pattern from the
 environment.  See also the
 .Ic setenv
 command above and
@@ -1730,7 +1732,7 @@ If the shell is interactive, then an interrupt can disrupt the wait.
 After the interrupt, the shell prints names and job numbers of all jobs
 known to be outstanding.
 .It Ic which Ar command
-Displays the resolved command that will be executed by the shell.
+Display the resolved command that will be executed by the shell.
 .Pp
 .It Ic while Ar (expr)
 .It \&...
@@ -1755,10 +1757,10 @@ Prompting occurs here the first time through the loop as for the
 statement if the input is a terminal.
 .Pp
 .It Ic % Ns Ar job
-Brings the specified job into the foreground.
+Bring the specified job into the foreground.
 .Pp
 .It Ic % Ns Ar job Ic &
-Continues the specified job in the background.
+Continue the specified job in the background.
 .Pp
 .It Ic @
 .It Ic @ Ar name Ns = Ns expr
@@ -1831,7 +1833,7 @@ is likewise handled; it is not
 necessary to worry about its setting other than in the file
 .Ar \&.cshrc
 as inferior
-.Nm csh
+.Nm
 processes will import the definition of
 .Ar path
 from the environment, and re-export it if you then change it.
@@ -1842,7 +1844,7 @@ positional parameters are substituted, i.e., `$1' is replaced by
 `$argv[1]',
 etc.
 .It Ic cdpath
-Gives a list of alternate directories searched to find subdirectories
+Give a list of alternate directories searched to find subdirectories
 in
 .Ar chdir
 commands.
@@ -1910,10 +1912,9 @@ files are not accidentally destroyed, and that `>>' redirections
 refer to existing files.
 .It Ic noglob
 If set, filename expansion is inhibited.
-This inhibition is most useful in shell scripts that
- are not dealing with filenames,
-or after a list of filenames has been obtained and further expansions
-are not desirable.
+This inhibition is most useful in shell scripts that are not dealing with
+filenames, or after a list of filenames has been obtained and further
+expansions are not desirable.
 .It Ic nonomatch
 If set, it is not an error for a filename expansion to not match any
 existing files; instead the primitive pattern is returned.
@@ -1981,7 +1982,7 @@ If it terminated abnormally, then 0200 is added to the status.
 Builtin commands that fail return exit status `1',
 all other builtin commands set status to `0'.
 .It Ic time
-Controls automatic timing of commands.
+Control automatic timing of commands.
 If set, then any command that takes more than this many cpu seconds
 will cause a line giving user, system, and real times and a utilization
 percentage which is the ratio of user plus system times to real time
@@ -2080,27 +2081,35 @@ signal; otherwise this signal is passed on to children from the state in the
 shell's parent.
 Interrupts are not allowed when a login shell is reading the file
 .Pa \&.logout .
-.Sh AUTHOR
-William Joy.
-Job control and directory stack features first implemented by J.E. Kulp of
-IIASA, Laxenburg, Austria,
+.Sh AUTHORS
+.An William Joy .
+.Pp
+Job control and directory stack features first implemented by
+.An J.E. Kulp
+of IIASA, Laxenburg, Austria,
 with different syntax than that used now.
-File name completion code written by Ken Greer, HP Labs.
-Eight-bit implementation Christos S. Zoulas, Cornell University.
+.Pp
+File name completion code written by
+.An Ken Greer ,
+HP Labs.
+.Pp
+Eight-bit implementation
+.An Christos S. Zoulas ,
+Cornell University.
 .Sh FILES
 .Bl -tag -width /etc/passwd -compact
 .It Pa ~/.cshrc
-Read at beginning of execution by each shell.
+read at beginning of execution by each shell.
 .It Pa ~/.login
-Read by login shell, after `.cshrc' at login.
+read by login shell, after `.cshrc' at login.
 .It Pa ~/.logout
-Read by login shell, at logout.
+read by login shell, at logout.
 .It Pa /bin/sh
-Standard shell, for shell scripts not starting with a `#'.
+standard shell, for shell scripts not starting with a `#'.
 .It Pa /tmp/sh*
-Temporary file for `<<'.
+temporary file for `<<'.
 .It Pa /etc/passwd
-Source of home directories for `~name'.
+source of home directories for `~name'.
 .El
 .Sh LIMITATIONS
 Word lengths \-

bin/csh/csh.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: csh.c,v 1.5 1995/07/07 23:14:36 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -46,6 +46,7 @@ static char sccsid[] = "@(#)csh.c	8.2 (Berkeley) 10/12/93";
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <pwd.h>
@@ -114,10 +115,10 @@ main(argc, argv)
     int     argc;
     char  **argv;
 {
-    register Char *cp;
-    register char *tcp;
-    register int f;
-    register char **tempv;
+    Char *cp;
+    char *tcp;
+    int f;
+    char **tempv;
     struct sigvec osv;
 
     cshin = stdin;
@@ -229,7 +230,7 @@ main(argc, argv)
      */
     set(STRstatus, Strsave(STR0));
 
-    if ((tcp = getenv("HOME")) != NULL)
+    if ((tcp = getenv("HOME")) != NULL && strlen(tcp) < MAXPATHLEN)
 	cp = SAVE(tcp);
     else
 	cp = NULL;
@@ -524,7 +525,7 @@ notty:
 	{
 	    int     osetintr = setintr;
 	    sig_t   oparintr = parintr;
-	    sigset_t omask = sigblock(sigmask(SIGINT));
+	    int omask = sigblock(sigmask(SIGINT));
 
 	    setintr = 0;
 	    parintr = SIG_IGN;	/* Disable onintr */
@@ -603,9 +604,9 @@ void
 importpath(cp)
     Char   *cp;
 {
-    register int i = 0;
-    register Char *dp;
-    register Char **pv;
+    int i = 0;
+    Char *dp;
+    Char **pv;
     int     c;
 
     for (dp = cp; *dp; dp++)
@@ -623,7 +624,7 @@ importpath(cp)
 	    if ((c = *dp) == ':' || c == 0) {
 		*dp = 0;
 		if (*cp != '/' && (euid == 0 || uid == 0) &&
-		    (intact || intty && isatty(SHOUT)))
+		    (intact || (intty && isatty(SHOUT))))
 		    (void) fprintf(csherr,
 	    "Warning: imported path contains relative components\n");
 		pv[i++] = Strsave(*cp ? cp : STRdot);
@@ -647,7 +648,7 @@ static int
 srccat(cp, dp)
     Char   *cp, *dp;
 {
-    register Char *ep = Strspl(cp, dp);
+    Char *ep = Strspl(cp, dp);
     char   *ptr = short2str(ep);
 
     xfree((ptr_t) ep);
@@ -662,7 +663,7 @@ srcfile(f, onlyown, flag)
     char   *f;
     bool    onlyown, flag;
 {
-    register int unit;
+    int unit;
 
     if ((unit = open(f, O_RDONLY)) == -1)
 	return 0;
@@ -680,7 +681,7 @@ srcfile(f, onlyown, flag)
 int     insource;
 static void
 srcunit(unit, onlyown, hflg)
-    register int unit;
+    int unit;
     bool    onlyown, hflg;
 {
     /* We have to push down a lot of state here */
@@ -695,7 +696,7 @@ srcunit(unit, onlyown, hflg)
     bool    otell = cantell;
 
     struct Bin saveB;
-    volatile sigset_t omask;
+    volatile int omask;
     jmp_buf oldexit;
 
     /* The (few) real local variables */
@@ -731,7 +732,7 @@ srcunit(unit, onlyown, hflg)
     if (setintr)
 	omask = sigblock(sigmask(SIGINT));
     /* Setup the new values of the state stuff saved above */
-    bcopy((char *) &B, (char *) &(saveB), sizeof(B));
+    memmove((char *) &(saveB), (char *) &B, sizeof(B));
     fbuf = NULL;
     fseekp = feobp = fblocks = 0;
     oSHIN = SHIN, SHIN = unit, arginp = 0, onelflg = 0;
@@ -756,7 +757,7 @@ srcunit(unit, onlyown, hflg)
     if (setintr)
 	(void) sigsetmask(omask);
     if (oSHIN >= 0) {
-	register int i;
+	int i;
 
 	/* We made it to the new state... free up its storage */
 	/* This code could get run twice but xfree doesn't care */
@@ -765,7 +766,7 @@ srcunit(unit, onlyown, hflg)
 	xfree((ptr_t) fbuf);
 
 	/* Reset input arena */
-	bcopy((char *) &(saveB), (char *) &B, sizeof(B));
+	memmove((char *) &B, (char *) &(saveB), sizeof(B));
 
 	(void) close(SHIN), SHIN = oSHIN;
 	arginp = oarginp, onelflg = oonelflg;
@@ -931,9 +932,9 @@ pintr1(wantnl)
     bool    wantnl;
 {
     Char **v;
-    sigset_t omask;
+    int omask;
 
-    omask = sigblock((sigset_t) 0);
+    omask = sigblock(0);
     if (setintr) {
 	(void) sigsetmask(omask & ~sigmask(SIGINT));
 	if (pjobs) {
@@ -1003,7 +1004,7 @@ process(catch)
 	 * Interruptible during interactive reads
 	 */
 	if (setintr)
-	    (void) sigsetmask(sigblock((sigset_t) 0) & ~sigmask(SIGINT));
+	    (void) sigsetmask(sigblock(0) & ~sigmask(SIGINT));
 
 	/*
 	 * For the sake of reset()
@@ -1120,7 +1121,7 @@ dosource(v, t)
     struct command *t;
 
 {
-    register Char *f;
+    Char *f;
     bool    hflg = 0;
     Char    buf[BUFSIZ];
 
@@ -1150,8 +1151,8 @@ dosource(v, t)
 static void
 mailchk()
 {
-    register struct varent *v;
-    register Char **vp;
+    struct varent *v;
+    Char **vp;
     time_t  t;
     int     intvl, cnt;
     struct stat stb;
@@ -1338,7 +1339,7 @@ defaultpath()
 void
 printprompt()
 {
-    register Char *cp;
+    Char *cp;
 
     if (!whyles) {
 	for (cp = value(STRprompt); *cp; cp++)

bin/csh/csh.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)csh.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
@@ -84,7 +84,7 @@ typedef void *ptr_t;
 
 #include "const.h"
 #include "char.h"
-#include "err.h"
+#include "errnum.h"
 
 #define xmalloc(i)	Malloc(i)
 #define xrealloc(p, i)	Realloc(p, i)
@@ -187,8 +187,8 @@ jmp_buf reslab;
 #define	setexit()	(setjmp(reslab))
 #define	reset()		longjmp(reslab, 1)
  /* Should use structure assignment here */
-#define	getexit(a)	bcopy((char *)reslab, ((char *)(a)), sizeof reslab)
-#define	resexit(a)	bcopy((char *)(a), (char *)reslab, sizeof reslab)
+#define	getexit(a)	memmove((char *)(a), (char *)reslab, sizeof reslab)
+#define	resexit(a)	memmove((char *)reslab, (char *)(a), sizeof reslab)
 
 Char   *gointr;			/* Label for an onintr transfer */
 
@@ -421,8 +421,6 @@ struct varent {
 #define v_right		v_link[1]
 #define v_parent	v_link[2]
 
-struct varent *adrof1();
-
 #define adrof(v)	adrof1(v, &shvhed)
 #define value(v)	value1(v, &shvhed)
 

bin/csh/dir.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dir.c,v 1.3 1995/05/30 00:06:30 rgrimes Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -75,9 +75,9 @@ void
 dinit(hp)
     Char   *hp;
 {
-    register char *tcp;
-    register Char *cp;
-    register struct directory *dp;
+    char *tcp;
+    Char *cp;
+    struct directory *dp;
     char    path[MAXPATHLEN];
     static char *emsg = "csh: Trying to start from \"%s\"\n";
 
@@ -145,7 +145,7 @@ Char *dp;
      * Don't call set() directly cause if the directory contains ` or
      * other junk characters glob will fail.
      */
-    register Char **vec = (Char **) xmalloc((size_t) (2 * sizeof(Char **)));
+    Char **vec = (Char **) xmalloc((size_t) (2 * sizeof(Char **)));
 
     vec[0] = Strsave(dp);
     vec[1] = 0;
@@ -203,7 +203,7 @@ dodirs(v, t)
 static void
 printdirs()
 {
-    register struct directory *dp;
+    struct directory *dp;
     Char   *s, *hp = value(STRhome);
     int     idx, len, cur;
 
@@ -240,7 +240,7 @@ printdirs()
 
 void
 dtildepr(home, dir)
-    register Char *home, *dir;
+    Char *home, *dir;
 {
 
     if (!eq(home, STRslash) && prefix(home, dir))
@@ -340,8 +340,8 @@ dochngd(v, t)
     Char **v;
     struct command *t;
 {
-    register Char *cp;
-    register struct directory *dp;
+    Char *cp;
+    struct directory *dp;
 
     skipargs(&v, " [<dir>]");
     printd = 0;
@@ -389,7 +389,7 @@ dgoto(cp)
     Char   *dp;
 
     if (*cp != '/') {
-	register Char *p, *q;
+	Char *p, *q;
 	int     cwdlen;
 
 	for (p = dcwd->di_name; *p++;)
@@ -423,9 +423,9 @@ dgoto(cp)
  */
 static Char *
 dfollow(cp)
-    register Char *cp;
+    Char *cp;
 {
-    register Char *dp;
+    Char *dp;
     struct varent *c;
     char    ebuf[MAXPATHLEN];
     int serrno;
@@ -449,7 +449,7 @@ dfollow(cp)
     if (cp[0] != '/' && !prefix(STRdotsl, cp) && !prefix(STRdotdotsl, cp)
 	&& (c = adrof(STRcdpath))) {
 	Char  **cdp;
-	register Char *p;
+	Char *p;
 	Char    buf[MAXPATHLEN];
 
 	for (cdp = c->vec; *cdp; cdp++) {
@@ -491,7 +491,7 @@ dopushd(v, t)
     Char **v;
     struct command *t;
 {
-    register struct directory *dp;
+    struct directory *dp;
 
     skipargs(&v, " [<dir>|+<n>]");
     printd = 1;
@@ -523,7 +523,7 @@ dopushd(v, t)
 	    stderror(ERR_SYSTEM, tmp, strerror(errno));
     }
     else {
-	register Char *ccp;
+	Char *ccp;
 
 	ccp = dfollow(*v);
 	dp = (struct directory *) xcalloc(sizeof(struct directory), 1);
@@ -542,11 +542,11 @@ dopushd(v, t)
  */
 static struct directory *
 dfind(cp)
-    register Char *cp;
+    Char *cp;
 {
-    register struct directory *dp;
-    register int i;
-    register Char *ep;
+    struct directory *dp;
+    int i;
+    Char *ep;
 
     if (*cp++ != '+')
 	return (0);
@@ -576,7 +576,7 @@ dopopd(v, t)
     Char **v;
     struct command *t;
 {
-    register struct directory *dp, *p = NULL;
+    struct directory *dp, *p = NULL;
 
     skipargs(&v, " [+<n>]");
     printd = 1;
@@ -614,7 +614,7 @@ dopopd(v, t)
  */
 void
 dfree(dp)
-    register struct directory *dp;
+    struct directory *dp;
 {
 
     if (dp->di_count != 0) {
@@ -633,10 +633,10 @@ dfree(dp)
  */
 Char   *
 dcanon(cp, p)
-    register Char *cp, *p;
+    Char *cp, *p;
 {
-    register Char *sp;
-    register Char *p1, *p2;	/* general purpose */
+    Char *sp;
+    Char *p1, *p2;	/* general purpose */
     bool    slash;
 
     Char    link[MAXPATHLEN];
@@ -702,8 +702,7 @@ dcanon(cp, p)
 	     */
 	    *--sp = 0;		/* form the pathname for readlink */
 	    if (sp != cp && !adrof(STRignore_symlinks) &&
-		(cc = readlink(short2str(cp), tlink,
-			       sizeof tlink)) >= 0) {
+		(cc = readlink(short2str(cp), tlink, sizeof(tlink) - 1)) >= 0) {
 		(void) Strcpy(link, str2short(tlink));
 		link[cc] = '\0';
 
@@ -787,8 +786,7 @@ dcanon(cp, p)
 
 	    if (sp != cp && adrof(STRchase_symlinks) &&
 		!adrof(STRignore_symlinks) &&
-		(cc = readlink(short2str(cp), tlink,
-			       sizeof tlink)) >= 0) {
+		(cc = readlink(short2str(cp), tlink, sizeof(tlink) - 1)) >= 0) {
 		(void) Strcpy(link, str2short(tlink));
 		link[cc] = '\0';
 
@@ -923,7 +921,7 @@ dcanon(cp, p)
  */
 static void
 dnewcwd(dp)
-    register struct directory *dp;
+    struct directory *dp;
 {
     dcwd = dp;
     dset(dcwd->di_name);

bin/csh/dir.h

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

bin/csh/dol.c

@@ -30,13 +30,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dol.c,v 1.2 1994/09/24 02:53:56 davidg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
 static char sccsid[] = "@(#)dol.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
+#include <sys/times.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -105,10 +106,10 @@ static void	 Dtestq __P((int));
  */
 void
 Dfix(t)
-    register struct command *t;
+    struct command *t;
 {
-    register Char **pp;
-    register Char *p;
+    Char **pp;
+    Char *p;
 
     if (noexec)
 	return;
@@ -130,7 +131,7 @@ Dfix(t)
  */
 Char   *
 Dfix1(cp)
-    register Char *cp;
+    Char *cp;
 {
     Char   *Dv[2];
 
@@ -173,8 +174,8 @@ static Char *
 Dpack(wbuf, wp)
     Char   *wbuf, *wp;
 {
-    register int c;
-    register int i = MAXWLEN - (wp - wbuf);
+    int c;
+    int i = MAXWLEN - (wp - wbuf);
 
     for (;;) {
 	c = DgetC(DODOL);
@@ -220,11 +221,11 @@ Dpack(wbuf, wp)
 static int
 Dword()
 {
-    register int c, c1;
+    int c, c1;
     Char    wbuf[BUFSIZ];
-    register Char *wp = wbuf;
-    register int i = MAXWLEN;
-    register bool dolflg;
+    Char *wp = wbuf;
+    int i = MAXWLEN;
+    bool dolflg;
     bool    sofar = 0, done = 0;
 
     while (!done) {
@@ -340,9 +341,9 @@ Dword()
  */
 static int
 DgetC(flag)
-    register int flag;
+    int flag;
 {
-    register int c;
+    int c;
 
 top:
     if ((c = Dpeekc) != '\0') {
@@ -401,8 +402,8 @@ dolerror(s)
 static void
 Dgetdol()
 {
-    register Char *np;
-    register struct varent *vp = NULL;
+    Char *np;
+    struct varent *vp = NULL;
     Char    name[4 * MAXVARLEN + 1];
     int     c, sc;
     int     subscr = 0, lwb = 1, upb = 0;
@@ -574,7 +575,7 @@ Dgetdol()
 	else if (*np != '-')
 	    stderror(ERR_MISSING, '-');
 	else {
-	    register int i = upb;
+	    int i = upb;
 
 	    np++;
 	    if (Isdigit(*np)) {
@@ -632,7 +633,7 @@ eatbrac:
 static void
 fixDolMod()
 {
-    register int c;
+    int c;
 
     c = DgetC(0);
     if (c == ':') {
@@ -691,9 +692,9 @@ fixDolMod()
 
 static void
 setDolp(cp)
-    register Char *cp;
+    Char *cp;
 {
-    register Char *dp;
+    Char *dp;
     int i;
 
     if (dolnmod == 0 || dolmcnt == 0) {
@@ -804,7 +805,7 @@ unDredc(c)
 static int
 Dredc()
 {
-    register int c;
+    int c;
 
     if ((c = Dpeekrd) != '\0') {
 	Dpeekrd = 0;
@@ -822,7 +823,7 @@ Dredc()
 
 static void
 Dtestq(c)
-    register int c;
+    int c;
 {
 
     if (cmap(c, QUOTES))
@@ -839,21 +840,28 @@ void
 heredoc(term)
     Char *term;
 {
-    register int c;
+    int c;
     Char   *Dv[2];
     Char    obuf[BUFSIZ], lbuf[BUFSIZ], mbuf[BUFSIZ];
     int     ocnt, lcnt, mcnt;
-    register Char *lbp, *obp, *mbp;
+    Char *lbp, *obp, *mbp;
     Char  **vp;
     bool    quoted;
     char   *tmp;
+    struct timeval tv;
 
-    if (creat(tmp = short2str(shtemp), 0600) < 0)
-	stderror(ERR_SYSTEM, tmp, strerror(errno));
-    (void) close(0);
-    if (open(tmp, O_RDWR) < 0) {
+again:
+    tmp = short2str(shtemp);
+    if (open(tmp, O_RDWR|O_CREAT|O_TRUNC|O_EXCL, 0600) < 0) {
 	int     oerrno = errno;
-
+	if (errno == EEXIST) {
+	    if (unlink(tmp) == -1) {
+		(void) gettimeofday(&tv, NULL);
+		shtemp = Strspl(STRtmpsh, putn((((int)tv.tv_sec) ^
+		    ((int)tv.tv_usec) ^ ((int)getpid())) & 0x00ffffff));
+	    }
+	    goto again;
+	}
 	(void) unlink(tmp);
 	errno = oerrno;
 	stderror(ERR_SYSTEM, tmp, strerror(errno));

bin/csh/err.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -307,7 +307,7 @@ seterror(id, va_alist)
 #endif
 	if (id < 0 || id > sizeof(errorlist) / sizeof(errorlist[0]))
 	    id = ERR_INVALID;
-	vsprintf(berr, errorlist[id], va);
+	vsnprintf(berr, sizeof(berr), errorlist[id], va);
 	va_end(va);
 
 	seterr = strsave(berr);
@@ -342,7 +342,7 @@ stderror(id, va_alist)
 #endif
 {
     va_list va;
-    register Char **v;
+    Char **v;
     int     flags = id & ERR_FLAGS;
 
     id &= ~ERR_FLAGS;

bin/csh/exec.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exec.c,v 1.3 1995/05/30 00:06:32 rgrimes Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -113,10 +113,10 @@ doexec(v, t)
     Char **v;
     struct command *t;
 {
-    register Char *dp, **pv, **av, *sav;
-    register struct varent *pathv;
-    register bool slash;
-    register int hashval = 0, hashval1, i;
+    Char *dp, **pv, **av, *sav;
+    struct varent *pathv;
+    bool slash;
+    int hashval = 0, hashval1, i;
     Char   *blk[2];
 
     /*
@@ -193,7 +193,7 @@ doexec(v, t)
      * We must do this AFTER any possible forking (like `foo` in glob) so that
      * this shell can still do subprocesses.
      */
-    (void) sigsetmask((sigset_t) 0);
+    (void) sigsetmask(0);
     /*
      * If no path, no words in path, or a / in the filename then restrict the
      * command search.
@@ -265,12 +265,12 @@ pexerr()
 static void
 texec(sf, st)
     Char   *sf;
-    register Char **st;
+    Char **st;
 {
-    register char **t;
-    register char *f;
-    register struct varent *v;
-    register Char **vp;
+    char **t;
+    char *f;
+    struct varent *v;
+    Char **vp;
     Char   *lastsh[2];
     int     fd;
     unsigned char c;
@@ -361,7 +361,7 @@ texec(sf, st)
 void
 execash(t, kp)
     Char  **t;
-    register struct command *kp;
+    struct command *kp;
 {
     int     saveIN, saveOUT, saveDIAG, saveSTD;
     int     oSHIN;
@@ -446,8 +446,8 @@ dohash(v, t)
     struct command *t;
 {
     DIR    *dirp;
-    register struct dirent *dp;
-    register int cnt;
+    struct dirent *dp;
+    int cnt;
     int     i = 0;
     struct varent *pathv = adrof(STRpath);
     Char  **pv;
@@ -504,9 +504,9 @@ hashstat(v, t)
  */
 static int
 hashname(cp)
-    register Char *cp;
+    Char *cp;
 {
-    register long h = 0;
+    long h = 0;
 
     while (*cp)
 	h = hash(h, *cp++);
@@ -517,11 +517,11 @@ static int
 iscommand(name)
     Char   *name;
 {
-    register Char **pv;
-    register Char *sav;
-    register struct varent *v;
-    register bool slash = any(short2str(name), '/');
-    register int hashval = 0, hashval1, i;
+    Char **pv;
+    Char *sav;
+    struct varent *v;
+    bool slash = any(short2str(name), '/');
+    int hashval = 0, hashval1, i;
 
     v = adrof(STRpath);
     if (v == 0 || v->vec[0] == 0 || slash)
@@ -618,7 +618,7 @@ executable(dir, name, dir_ok)
 /*ARGSUSED*/
 void
 dowhich(v, c)
-    register Char **v;
+    Char **v;
     struct command *c;
 {
     struct wordent lex[3];
@@ -652,9 +652,9 @@ static void
 tellmewhat(lex)
     struct wordent *lex;
 {
-    register int i;
-    register struct biltins *bptr;
-    register struct wordent *sp = lex->next;
+    int i;
+    struct biltins *bptr;
+    struct wordent *sp = lex->next;
     bool    aliased = 0;
     Char   *s0, *s1, *s2, *cmd;
     Char    qc;
@@ -706,8 +706,8 @@ tellmewhat(lex)
     sp->word = cmd = globone(sp->word, G_IGNORE);
 
     if ((i = iscommand(strip(sp->word))) != 0) {
-	register Char **pv;
-	register struct varent *v;
+	Char **pv;
+	struct varent *v;
 	bool    slash = any(short2str(sp->word), '/');
 
 	v = adrof(STRpath);

bin/csh/exp.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -91,23 +91,23 @@ static void	etraci	__P((char *, int, Char ***));
 
 int
 expr(vp)
-    register Char ***vp;
+    Char ***vp;
 {
     return (exp0(vp, 0));
 }
 
 int
 exp0(vp, ignore)
-    register Char ***vp;
+    Char ***vp;
     bool    ignore;
 {
-    register int p1 = exp1(vp, ignore);
+    int p1 = exp1(vp, ignore);
 
 #ifdef EDEBUG
     etraci("exp0 p1", p1, vp);
 #endif
     if (**vp && eq(**vp, STRor2)) {
-	register int p2;
+	int p2;
 
 	(*vp)++;
 	p2 = exp0(vp, (ignore & IGNORE) || p1);
@@ -121,16 +121,16 @@ exp0(vp, ignore)
 
 static int
 exp1(vp, ignore)
-    register Char ***vp;
+    Char ***vp;
     bool    ignore;
 {
-    register int p1 = exp2(vp, ignore);
+    int p1 = exp2(vp, ignore);
 
 #ifdef EDEBUG
     etraci("exp1 p1", p1, vp);
 #endif
     if (**vp && eq(**vp, STRand2)) {
-	register int p2;
+	int p2;
 
 	(*vp)++;
 	p2 = exp1(vp, (ignore & IGNORE) || !p1);
@@ -144,16 +144,16 @@ exp1(vp, ignore)
 
 static int
 exp2(vp, ignore)
-    register Char ***vp;
+    Char ***vp;
     bool    ignore;
 {
-    register int p1 = exp2a(vp, ignore);
+    int p1 = exp2a(vp, ignore);
 
 #ifdef EDEBUG
     etraci("exp3 p1", p1, vp);
 #endif
     if (**vp && eq(**vp, STRor)) {
-	register int p2;
+	int p2;
 
 	(*vp)++;
 	p2 = exp2(vp, ignore);
@@ -167,16 +167,16 @@ exp2(vp, ignore)
 
 static int
 exp2a(vp, ignore)
-    register Char ***vp;
+    Char ***vp;
     bool    ignore;
 {
-    register int p1 = exp2b(vp, ignore);
+    int p1 = exp2b(vp, ignore);
 
 #ifdef EDEBUG
     etraci("exp2a p1", p1, vp);
 #endif
     if (**vp && eq(**vp, STRcaret)) {
-	register int p2;
+	int p2;
 
 	(*vp)++;
 	p2 = exp2a(vp, ignore);
@@ -190,16 +190,16 @@ exp2a(vp, ignore)
 
 static int
 exp2b(vp, ignore)
-    register Char ***vp;
+    Char ***vp;
     bool    ignore;
 {
-    register int p1 = exp2c(vp, ignore);
+    int p1 = exp2c(vp, ignore);
 
 #ifdef EDEBUG
     etraci("exp2b p1", p1, vp);
 #endif
     if (**vp && eq(**vp, STRand)) {
-	register int p2;
+	int p2;
 
 	(*vp)++;
 	p2 = exp2b(vp, ignore);
@@ -213,12 +213,12 @@ exp2b(vp, ignore)
 
 static int
 exp2c(vp, ignore)
-    register Char ***vp;
+    Char ***vp;
     bool    ignore;
 {
-    register Char *p1 = exp3(vp, ignore);
-    register Char *p2;
-    register int i;
+    Char *p1 = exp3(vp, ignore);
+    Char *p2;
+    int i;
 
 #ifdef EDEBUG
     etracc("exp2c p1", p1, vp);
@@ -261,11 +261,11 @@ exp2c(vp, ignore)
 
 static Char *
 exp3(vp, ignore)
-    register Char ***vp;
+    Char ***vp;
     bool    ignore;
 {
-    register Char *p1, *p2;
-    register int i;
+    Char *p1, *p2;
+    int i;
 
     p1 = exp3a(vp, ignore);
 #ifdef EDEBUG
@@ -307,11 +307,11 @@ exp3(vp, ignore)
 
 static Char *
 exp3a(vp, ignore)
-    register Char ***vp;
+    Char ***vp;
     bool    ignore;
 {
-    register Char *p1, *p2, *op;
-    register int i;
+    Char *p1, *p2, *op;
+    int i;
 
     p1 = exp4(vp, ignore);
 #ifdef EDEBUG
@@ -337,18 +337,18 @@ exp3a(vp, ignore)
 
 static Char *
 exp4(vp, ignore)
-    register Char ***vp;
+    Char ***vp;
     bool    ignore;
 {
-    register Char *p1, *p2;
-    register int i = 0;
+    Char *p1, *p2;
+    int i = 0;
 
     p1 = exp5(vp, ignore);
 #ifdef EDEBUG
     etracc("exp4 p1", p1, vp);
 #endif
     if (isa(**vp, ADDOP)) {
-	register Char *op = *(*vp)++;
+	Char *op = *(*vp)++;
 
 	p2 = exp4(vp, ignore);
 #ifdef EDEBUG
@@ -374,18 +374,18 @@ exp4(vp, ignore)
 
 static Char *
 exp5(vp, ignore)
-    register Char ***vp;
+    Char ***vp;
     bool    ignore;
 {
-    register Char *p1, *p2;
-    register int i = 0;
+    Char *p1, *p2;
+    int i = 0;
 
     p1 = exp6(vp, ignore);
 #ifdef EDEBUG
     etracc("exp5 p1", p1, vp);
 #endif
     if (isa(**vp, MULOP)) {
-	register Char *op = *(*vp)++;
+	Char *op = *(*vp)++;
 
 	p2 = exp5(vp, ignore);
 #ifdef EDEBUG
@@ -421,11 +421,11 @@ exp5(vp, ignore)
 
 static Char *
 exp6(vp, ignore)
-    register Char ***vp;
+    Char ***vp;
     bool    ignore;
 {
     int     ccode, i = 0;
-    register Char *cp, *dp, *ep;
+    Char *cp, *dp, *ep;
 
     if (**vp == 0)
 	stderror(ERR_NAME | ERR_EXPRESSION);
@@ -461,7 +461,7 @@ exp6(vp, ignore)
 	return (putn(ccode));
     }
     if (eq(**vp, STRLbrace)) {
-	register Char **v;
+	Char **v;
 	struct command faket;
 	Char   *fakecom[2];
 
@@ -600,18 +600,18 @@ exp6(vp, ignore)
 
 static void
 evalav(v)
-    register Char **v;
+    Char **v;
 {
     struct wordent paraml1;
-    register struct wordent *hp = &paraml1;
+    struct wordent *hp = &paraml1;
     struct command *t;
-    register struct wordent *wdp = hp;
+    struct wordent *wdp = hp;
 
     set(STRstatus, Strsave(STR0));
     hp->prev = hp->next = hp;
     hp->word = STRNULL;
     while (*v) {
-	register struct wordent *new =
+	struct wordent *new =
 	(struct wordent *) xcalloc(1, sizeof *wdp);
 
 	new->prev = wdp;
@@ -631,8 +631,8 @@ evalav(v)
 
 static int
 isa(cp, what)
-    register Char *cp;
-    register int what;
+    Char *cp;
+    int what;
 {
     if (cp == 0)
 	return ((what & RESTOP) != 0);
@@ -680,7 +680,7 @@ isa(cp, what)
 
 static int
 egetn(cp)
-    register Char *cp;
+    Char *cp;
 {
     if (*cp && *cp != '-' && !Isdigit(*cp))
 	stderror(ERR_NAME | ERR_EXPRESSION);

bin/csh/extern.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
@@ -161,7 +161,7 @@ Char	 *globone __P((Char *, int));
 int	  Gmatch __P((Char *, Char *));
 void	  ginit __P((void));
 Char	**globall __P((Char **));
-void	  rscan __P((Char **, void (*)()));
+void	  rscan __P((Char **, void (*)(int)));
 void	  tglob __P((Char **));
 void	  trim __P((Char **));
 #ifdef FILEC

bin/csh/file.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: file.c,v 1.3 1995/05/30 00:06:33 rgrimes Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -160,7 +160,7 @@ static void
 pushback(string)
     Char   *string;
 {
-    register Char *p;
+    Char *p;
     struct termios tty, tty_normal;
     int     omask;
     char    c;
@@ -184,8 +184,8 @@ pushback(string)
  */
 static void
 catn(des, src, count)
-    register Char *des, *src;
-    register int count;
+    Char *des, *src;
+    int count;
 {
     while (--count >= 0 && *des)
 	des++;
@@ -201,8 +201,8 @@ catn(des, src, count)
  */
 static void
 copyn(des, src, count)
-    register Char *des, *src;
-    register int count;
+    Char *des, *src;
+    int count;
 {
     while (--count >= 0)
 	if ((*des++ = *src++) == 0)
@@ -251,7 +251,7 @@ print_by_column(dir, items, count)
     Char   *dir, *items[];
     int     count;
 {
-    register int i, rows, r, c, maxwidth = 0, columns;
+    int i, rows, r, c, maxwidth = 0, columns;
 
     if (ioctl(SHOUT, TIOCGWINSZ, (ioctl_t) & win) < 0 || win.ws_col == 0)
 	win.ws_col = 80;
@@ -266,7 +266,7 @@ print_by_column(dir, items, count)
 	for (c = 0; c < columns; c++) {
 	    i = c * rows + r;
 	    if (i < count) {
-		register int w;
+		int w;
 
 		(void) fprintf(cshout, "%s", vis_str(items[i]));
 		(void) fputc(dir ? filetype(dir, items[i]) : ' ', cshout);
@@ -292,8 +292,8 @@ static Char *
 tilde(new, old)
     Char   *new, *old;
 {
-    register Char *o, *p;
-    register struct passwd *pw;
+    Char *o, *p;
+    struct passwd *pw;
     static Char person[40];
 
     if (old[0] != '~')
@@ -375,7 +375,7 @@ static void
 extract_dir_and_name(path, dir, name)
     Char   *path, *dir, *name;
 {
-    register Char *p;
+    Char *p;
 
     p = Strrchr(path, '/');
     if (p == NULL) {
@@ -393,8 +393,8 @@ getentry(dir_fd, looking_for_lognames)
     DIR    *dir_fd;
     int     looking_for_lognames;
 {
-    register struct passwd *pw;
-    register struct dirent *dirp;
+    struct passwd *pw;
+    struct dirent *dirp;
 
     if (looking_for_lognames) {
 	if ((pw = getpwent()) == NULL)
@@ -408,9 +408,9 @@ getentry(dir_fd, looking_for_lognames)
 
 static void
 free_items(items)
-    register Char **items;
+    Char **items;
 {
-    register int i;
+    int i;
 
     for (i = 0; items[i]; i++)
 	xfree((ptr_t) items[i]);
@@ -436,9 +436,9 @@ tsearch(word, command, max_word_length)
     int     max_word_length;
 {
     static Char **items = NULL;
-    register DIR *dir_fd;
-    register numitems = 0, ignoring = TRUE, nignored = 0;
-    register name_length, looking_for_lognames;
+    DIR *dir_fd;
+    int numitems = 0, ignoring = TRUE, nignored = 0;
+    int name_length, looking_for_lognames;
     Char    tilded_dir[MAXPATHLEN + 1], dir[MAXPATHLEN + 1];
     Char    name[MAXNAMLEN + 1], extended_name[MAXNAMLEN + 1];
     Char   *entry;
@@ -450,7 +450,7 @@ tsearch(word, command, max_word_length)
 
     looking_for_lognames = (*word == '~') && (Strchr(word, '/') == NULL);
     if (looking_for_lognames) {
-	(void) setpwent();
+	setpwent();
 	copyn(name, &word[1], MAXNAMLEN);	/* name sans ~ */
 	dir_fd = NULL;
     }
@@ -498,7 +498,7 @@ again:				/* search for matches */
 	ignoring = FALSE;
 	nignored = 0;
 	if (looking_for_lognames)
-	    (void) setpwent();
+	    setpwent();
 	else
 	    rewinddir(dir_fd);
 	goto again;
@@ -547,8 +547,8 @@ recognize(extended_name, entry, name_length, numitems)
     if (numitems == 1)		/* 1st match */
 	copyn(extended_name, entry, MAXNAMLEN);
     else {			/* 2nd & subsequent matches */
-	register Char *x, *ent;
-	register int len = 0;
+	Char *x, *ent;
+	int len = 0;
 
 	x = extended_name;
 	for (ent = entry; *x && *x == *ent++; x++, len++)
@@ -567,7 +567,7 @@ recognize(extended_name, entry, name_length, numitems)
  */
 static int
 is_prefix(check, template)
-    register Char *check, *template;
+    Char *check, *template;
 {
     do
 	if (*check == 0)
@@ -584,7 +584,7 @@ static int
 is_suffix(check, template)
     Char   *check, *template;
 {
-    register Char *c, *t;
+    Char *c, *t;
 
     for (c = check; *c++;)
 	continue;
@@ -603,7 +603,7 @@ tenex(inputline, inputline_size)
     Char   *inputline;
     int     inputline_size;
 {
-    register int numitems, num_read;
+    int numitems, num_read;
     char    tinputline[BUFSIZ];
 
 
@@ -613,8 +613,8 @@ tenex(inputline, inputline_size)
 	int     i;
 	static Char delims[] = {' ', '\'', '"', '\t', ';', '&', '<',
 	'>', '(', ')', '|', '^', '%', '\0'};
-	register Char *str_end, *word_start, last_Char, should_retype;
-	register int space_left;
+	Char *str_end, *word_start, last_Char, should_retype;
+	int space_left;
 	COMMAND command;
 
 	for (i = 0; i < num_read; i++)
@@ -671,10 +671,10 @@ tenex(inputline, inputline_size)
 
 static int
 ignored(entry)
-    register Char *entry;
+    Char *entry;
 {
     struct varent *vp;
-    register Char **cp;
+    Char **cp;
 
     if ((vp = adrof(STRfignore)) == NULL || (cp = vp->vec) == NULL)
 	return (FALSE);

bin/csh/func.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: func.c,v 1.4 1995/10/23 23:08:26 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -72,8 +72,8 @@ struct biltins *
 isbfunc(t)
     struct command *t;
 {
-    register Char *cp = t->t_dcom[0];
-    register struct biltins *bp, *bp1, *bp2;
+    Char *cp = t->t_dcom[0];
+    struct biltins *bp, *bp1, *bp2;
     static struct biltins label = {"", dozip, 0, 0};
     static struct biltins foregnd = {"%job", dofg1, 0, 0};
     static struct biltins backgnd = {"%job &", dobg1, 0, 0};
@@ -96,7 +96,7 @@ isbfunc(t)
      * one past the end.
      */
     for (bp1 = bfunc, bp2 = bfunc + nbfunc; bp1 < bp2;) {
-	register i;
+	int i;
 
 	bp = bp1 + ((bp2 - bp1) >> 1);
 	if ((i = *cp - *bp->bname) == 0 &&
@@ -112,8 +112,8 @@ isbfunc(t)
 
 void
 func(t, bp)
-    register struct command *t;
-    register struct biltins *bp;
+    struct command *t;
+    struct biltins *bp;
 {
     int     i;
 
@@ -133,8 +133,8 @@ doonintr(v, t)
     Char **v;
     struct command *t;
 {
-    register Char *cp;
-    register Char *vv = v[1];
+    Char *cp;
+    Char *vv = v[1];
 
     if (parintr == SIG_IGN)
 	return;
@@ -194,8 +194,8 @@ doalias(v, t)
     Char **v;
     struct command *t;
 {
-    register struct varent *vp;
-    register Char *p;
+    struct varent *vp;
+    Char *p;
 
     v++;
     p = *v++;
@@ -265,8 +265,8 @@ doif(v, kp)
     Char  **v;
     struct command *kp;
 {
-    register int i;
-    register Char **vv;
+    int i;
+    Char **vv;
 
     v++;
     i = expr(&v);
@@ -302,7 +302,7 @@ doif(v, kp)
  */
 static void
 reexecute(kp)
-    register struct command *kp;
+    struct command *kp;
 {
     kp->t_dflg &= F_SAVE;
     kp->t_dflg |= F_REPEAT;
@@ -339,7 +339,7 @@ void
 gotolab(lab)
     Char *lab;
 {
-    register struct whyle *wp;
+    struct whyle *wp;
     /*
      * While we still can, locate any unknown ends of existing loops. This
      * obscure code is the WORST result of the fact that we don't really parse.
@@ -365,7 +365,7 @@ doswitch(v, t)
     Char **v;
     struct command *t;
 {
-    register Char *cp, *lp;
+    Char *cp, *lp;
 
     v++;
     if (!*v || *(*v++) != '(')
@@ -419,8 +419,8 @@ doforeach(v, t)
     Char **v;
     struct command *t;
 {
-    register Char *cp, *sp;
-    register struct whyle *nwp;
+    Char *cp, *sp;
+    struct whyle *nwp;
 
     v++;
     sp = cp = strip(*v);
@@ -463,8 +463,8 @@ dowhile(v, t)
     Char **v;
     struct command *t;
 {
-    register int status;
-    register bool again = whyles != 0 && SEEKEQ(&whyles->w_start, &lineloc) &&
+    int status;
+    bool again = whyles != 0 && SEEKEQ(&whyles->w_start, &lineloc) &&
     whyles->w_fename == 0;
 
     v++;
@@ -479,7 +479,7 @@ dowhile(v, t)
     if (*v)
 	stderror(ERR_NAME | ERR_EXPRESSION);
     if (!again) {
-	register struct whyle *nwp =
+	struct whyle *nwp =
 	(struct whyle *) xcalloc(1, sizeof(*nwp));
 
 	nwp->w_start = lineloc;
@@ -507,7 +507,7 @@ preread()
 {
     whyles->w_end.type = I_SEEK;
     if (setintr)
-	(void) sigsetmask(sigblock((sigset_t) 0) & ~sigmask(SIGINT));
+	(void) sigsetmask(sigblock(0) & ~sigmask(SIGINT));
 
     search(T_BREAK, 0, NULL);		/* read the expression in */
     if (setintr)
@@ -564,8 +564,8 @@ dorepeat(v, kp)
     Char  **v;
     struct command *kp;
 {
-    register int i;
-    register sigset_t omask = 0;
+    int i;
+    int omask = 0;
 
     i = getn(v[1]);
     if (setintr)
@@ -593,10 +593,10 @@ doswbrk(v, t)
 
 int
 srchx(cp)
-    register Char *cp;
+    Char *cp;
 {
-    register struct srch *sp, *sp1, *sp2;
-    register i;
+    struct srch *sp, *sp1, *sp2;
+    int i;
 
     /*
      * Binary search Sp1 is the beginning of the current search range. Sp2 is
@@ -622,12 +622,12 @@ static Char *Sgoal;
 static void
 search(type, level, goal)
     int     type;
-    register int level;
+    int level;
     Char   *goal;
 {
     Char    wordbuf[BUFSIZ];
-    register Char *aword = wordbuf;
-    register Char *cp;
+    Char *aword = wordbuf;
+    Char *cp;
 
     Stype = type;
     Sgoal = goal;
@@ -722,10 +722,10 @@ search(type, level, goal)
 
 static int
 getword(wp)
-    register Char *wp;
+    Char *wp;
 {
-    register int found = 0;
-    register int c, d;
+    int found = 0;
+    int c, d;
     int     kwd = 0;
     Char   *owp = wp;
 
@@ -851,7 +851,7 @@ wfree()
     btell(&o);
 
     for (; whyles; whyles = nwp) {
-	register struct whyle *wp = whyles;
+	struct whyle *wp = whyles;
 	nwp = wp->w_next;
 
 	/*
@@ -901,13 +901,13 @@ doglob(v, t)
 static void
 xecho(sep, v)
     int    sep;
-    register Char **v;
+    Char **v;
 {
-    register Char *cp;
+    Char *cp;
     int     nonl = 0;
 
     if (setintr)
-	(void) sigsetmask(sigblock((sigset_t) 0) & ~sigmask(SIGINT));
+	(void) sigsetmask(sigblock(0) & ~sigmask(SIGINT));
     v++;
     if (*v == 0)
 	return;
@@ -924,7 +924,7 @@ xecho(sep, v)
     if (sep == ' ' && *v && eq(*v, STRmn))
 	nonl++, v++;
     while ((cp = *v++) != NULL) {
-	register int c;
+	int c;
 
 	while ((c = *cp++) != '\0')
 	    (void) vis_fputc(c | QUOTE, cshout);
@@ -952,10 +952,10 @@ dosetenv(v, t)
 
     v++;
     if ((vp = *v++) == 0) {
-	register Char **ep;
+	Char **ep;
 
 	if (setintr)
-	    (void) sigsetmask(sigblock((sigset_t) 0) & ~sigmask(SIGINT));
+	    (void) sigsetmask(sigblock(0) & ~sigmask(SIGINT));
 	for (ep = STR_environ; *ep; ep++)
 	    (void) fprintf(cshout, "%s\n", vis_str(*ep));
 	return;
@@ -1045,8 +1045,8 @@ void
 Setenv(name, val)
     Char   *name, *val;
 {
-    register Char **ep = STR_environ;
-    register Char *cp, *dp;
+    Char **ep = STR_environ;
+    Char *cp, *dp;
     Char   *blk[2];
     Char  **oep = ep;
 
@@ -1078,8 +1078,8 @@ static void
 Unsetenv(name)
     Char   *name;
 {
-    register Char **ep = STR_environ;
-    register Char *cp, *dp;
+    Char **ep = STR_environ;
+    Char *cp, *dp;
     Char  **oep = ep;
 
     for (; *ep; ep++) {
@@ -1104,8 +1104,8 @@ doumask(v, t)
     Char **v;
     struct command *t;
 {
-    register Char *cp = v[1];
-    register int i;
+    Char *cp = v[1];
+    int i;
 
     if (cp == 0) {
 	i = umask(0);
@@ -1151,7 +1151,7 @@ static struct limits *
 findlim(cp)
     Char   *cp;
 {
-    register struct limits *lp, *res;
+    struct limits *lp, *res;
 
     res = (struct limits *) NULL;
     for (lp = limits; lp->limconst >= 0; lp++)
@@ -1173,8 +1173,8 @@ dolimit(v, t)
     Char **v;
     struct command *t;
 {
-    register struct limits *lp;
-    register RLIM_TYPE limit;
+    struct limits *lp;
+    RLIM_TYPE limit;
     char    hard = 0;
 
     v++;
@@ -1199,11 +1199,10 @@ dolimit(v, t)
 
 static  RLIM_TYPE
 getval(lp, v)
-    register struct limits *lp;
+    struct limits *lp;
     Char  **v;
 {
-    register float f;
-    double  atof();
+    float f;
     Char   *cp = *v++;
 
     f = atof(short2str(cp));
@@ -1283,7 +1282,7 @@ limtail(cp, str)
 /*ARGSUSED*/
 static void
 plim(lp, hard)
-    register struct limits *lp;
+    struct limits *lp;
     Char    hard;
 {
     struct rlimit rlim;
@@ -1310,7 +1309,7 @@ dounlimit(v, t)
     Char **v;
     struct command *t;
 {
-    register struct limits *lp;
+    struct limits *lp;
     int     lerr = 0;
     Char    hard = 0;
 
@@ -1336,7 +1335,7 @@ dounlimit(v, t)
 
 static int
 setlim(lp, hard, limit)
-    register struct limits *lp;
+    struct limits *lp;
     Char    hard;
     RLIM_TYPE limit;
 {
@@ -1368,7 +1367,7 @@ dosuspend(v, t)
 {
     int     ctpgrp;
 
-    void    (*old) ();
+    void    (*old) __P((int));
 
     if (loginsh)
 	stderror(ERR_SUSPLOG);

bin/csh/glob.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: glob.c,v 1.5 1996/08/12 21:32:15 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -553,10 +553,10 @@ ginit()
 
 void
 rscan(t, f)
-    register Char **t;
-    void    (*f) ();
+    Char **t;
+    void    (*f) __P((int));
 {
-    register Char *p;
+    Char *p;
 
     while ((p = *t++) != NULL)
 	while (*p)
@@ -565,9 +565,9 @@ rscan(t, f)
 
 void
 trim(t)
-    register Char **t;
+    Char **t;
 {
-    register Char *p;
+    Char *p;
 
     while ((p = *t++) != NULL)
 	while (*p)
@@ -576,9 +576,9 @@ trim(t)
 
 void
 tglob(t)
-    register Char **t;
+    Char **t;
 {
-    register Char *p, c;
+    Char *p, c;
 
     while ((p = *t++) != NULL) {
 	if (*p == '~' || *p == '=')
@@ -622,7 +622,7 @@ dobackp(cp, literal)
     Char   *cp;
     bool    literal;
 {
-    register Char *lp, *rp;
+    Char *lp, *rp;
     Char   *ep, word[MAXPATHLEN];
 
     if (pargv) {
@@ -667,8 +667,8 @@ backeval(cp, literal)
     Char   *cp;
     bool    literal;
 {
-    register int icnt, c;
-    register Char *ip;
+    int icnt, c;
+    Char *ip;
     struct command faket;
     bool    hadnl;
     int     pvec[2], quoted;
@@ -851,9 +851,9 @@ Gmatch(string, pattern)
 
 static int
 pmatch(string, pattern)
-    register Char *string, *pattern;
+    Char *string, *pattern;
 {
-    register Char stringc, patternc;
+    Char stringc, patternc;
     int     match, negate_range;
     Char    rangec;
 
@@ -910,7 +910,7 @@ void
 Gcat(s1, s2)
     Char   *s1, *s2;
 {
-    register Char *p, *q;
+    Char *p, *q;
     int     n;
 
     for (p = s1; *p++;)
@@ -934,7 +934,7 @@ Gcat(s1, s2)
 #ifdef FILEC
 int
 sortscmp(a, b)
-    register const ptr_t a, b;
+    const ptr_t a, b;
 {
 #if defined(NLS) && !defined(NOSTRCOLL)
     char    buf[2048];

bin/csh/hist.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -56,8 +56,8 @@ void
 savehist(sp)
     struct wordent *sp;
 {
-    register struct Hist *hp, *np;
-    register int histlen = 0;
+    struct Hist *hp, *np;
+    int histlen = 0;
     Char   *cp;
 
     /* throw away null lines */
@@ -65,7 +65,7 @@ savehist(sp)
 	return;
     cp = value(STRhistory);
     if (*cp) {
-	register Char *p = cp;
+	Char *p = cp;
 
 	while (*p) {
 	    if (!Isdigit(*p)) {
@@ -86,10 +86,10 @@ savehist(sp)
 struct Hist *
 enthist(event, lp, docopy)
     int     event;
-    register struct wordent *lp;
+    struct wordent *lp;
     bool    docopy;
 {
-    register struct Hist *np;
+    struct Hist *np;
 
     np = (struct Hist *) xmalloc((size_t) sizeof(*np));
     np->Hnum = np->Href = event;
@@ -109,7 +109,7 @@ enthist(event, lp, docopy)
 
 static void
 hfree(hp)
-    register struct Hist *hp;
+    struct Hist *hp;
 {
 
     freelex(&hp->Hlex);
@@ -127,7 +127,7 @@ dohist(v, t)
     if (getn(value(STRhistory)) == 0)
 	return;
     if (setintr)
-	(void) sigsetmask(sigblock((sigset_t) 0) & ~sigmask(SIGINT));
+	(void) sigsetmask(sigblock(0) & ~sigmask(SIGINT));
     while (*++v && **v == '-') {
 	Char   *vp = *v;
 
@@ -177,7 +177,7 @@ dohist1(hp, np, rflg, hflg)
 
 static void
 phist(hp, hflg)
-    register struct Hist *hp;
+    struct Hist *hp;
     int     hflg;
 {
     if (hflg == 0)

bin/csh/init.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/csh/lex.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lex.c,v 1.3 1995/05/30 00:06:35 rgrimes Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -142,9 +142,9 @@ static Char getCtmp;
 
 int
 lex(hp)
-    register struct wordent *hp;
+    struct wordent *hp;
 {
-    register struct wordent *wdp;
+    struct wordent *wdp;
     int     c;
 
     btell(&lineloc);
@@ -165,7 +165,7 @@ lex(hp)
      * be ready and rarin to go even if it is interrupted.
      */
     do {
-	register struct wordent *new;
+	struct wordent *new;
 
 	new = (struct wordent *) xmalloc((size_t) sizeof(*wdp));
 	new->word = 0;
@@ -184,7 +184,7 @@ prlex(fp, sp0)
     FILE *fp;
     struct wordent *sp0;
 {
-    register struct wordent *sp = sp0->next;
+    struct wordent *sp = sp0->next;
 
     for (;;) {
 	(void) fprintf(fp, "%s", vis_str(sp->word));
@@ -198,15 +198,15 @@ prlex(fp, sp0)
 
 void
 copylex(hp, fp)
-    register struct wordent *hp;
-    register struct wordent *fp;
+    struct wordent *hp;
+    struct wordent *fp;
 {
-    register struct wordent *wdp;
+    struct wordent *wdp;
 
     wdp = hp;
     fp = fp->next;
     do {
-	register struct wordent *new;
+	struct wordent *new;
 
 	new = (struct wordent *) xmalloc((size_t) sizeof(*wdp));
 	new->prev = wdp;
@@ -221,9 +221,9 @@ copylex(hp, fp)
 
 void
 freelex(vp)
-    register struct wordent *vp;
+    struct wordent *vp;
 {
-    register struct wordent *fp;
+    struct wordent *fp;
 
     while (vp->next != vp) {
 	fp = vp->next;
@@ -237,11 +237,11 @@ freelex(vp)
 static Char *
 word()
 {
-    register Char c, c1;
-    register Char *wp;
+    Char c, c1;
+    Char *wp;
     Char    wbuf[BUFSIZ];
-    register bool dolflg;
-    register int i;
+    bool dolflg;
+    int i;
 
     wp = wbuf;
     i = BUFSIZ - 4;
@@ -358,9 +358,9 @@ ret:
 
 static int
 getC1(flag)
-    register int flag;
+    int flag;
 {
-    register Char c;
+    Char c;
 
     while (1) {
 	if ((c = peekc) != '\0') {
@@ -416,9 +416,9 @@ getC1(flag)
 static void
 getdol()
 {
-    register Char *np, *ep;
+    Char *np, *ep;
     Char    name[4 * MAXVARLEN + 1];
-    register int c;
+    int c;
     int     sc;
     bool    special = 0, toolong;
 
@@ -650,9 +650,9 @@ static void
 getexcl(sc)
     int    sc;
 {
-    register struct wordent *hp, *ip;
+    struct wordent *hp, *ip;
     int     left, right, dol;
-    register int c;
+    int c;
 
     if (sc == 0) {
 	sc = getC(0);
@@ -727,9 +727,9 @@ static struct wordent *
 getsub(en)
     struct wordent *en;
 {
-    register Char *cp;
+    Char *cp;
     int     delim;
-    register int c;
+    int c;
     int     sc;
     bool global;
     Char    orhsb[sizeof(rhsb) / sizeof(Char)];
@@ -872,12 +872,12 @@ dosub(sc, en, global)
     struct wordent lexi;
     bool    didsub = 0, didone = 0;
     struct wordent *hp = &lexi;
-    register struct wordent *wdp;
-    register int i = exclc;
+    struct wordent *wdp;
+    int i = exclc;
 
     wdp = hp;
     while (--i >= 0) {
-	register struct wordent *new =
+	struct wordent *new =
 		(struct wordent *) xcalloc(1, sizeof *wdp);
 
 	new->word = 0;
@@ -924,8 +924,8 @@ subword(cp, type, adid)
     bool   *adid;
 {
     Char    wbuf[BUFSIZ];
-    register Char *wp, *mp, *np;
-    register int i;
+    Char *wp, *mp, *np;
+    int i;
 
     *adid = 0;
     switch (type) {
@@ -996,8 +996,8 @@ domod(cp, type)
     Char   *cp;
     int     type;
 {
-    register Char *wp, *xp;
-    register int c;
+    Char *wp, *xp;
+    int c;
 
     switch (type) {
 
@@ -1042,7 +1042,7 @@ domod(cp, type)
 
 static int
 matchs(str, pat)
-    register Char *str, *pat;
+    Char *str, *pat;
 {
     while (*str && *pat && *str == *pat)
 	str++, pat++;
@@ -1051,11 +1051,11 @@ matchs(str, pat)
 
 static int
 getsel(al, ar, dol)
-    register int *al, *ar;
+    int *al, *ar;
     int     dol;
 {
-    register int c = getC(0);
-    register int i;
+    int c = getC(0);
+    int i;
     bool    first = *al < 0;
 
     switch (c) {
@@ -1139,9 +1139,9 @@ static struct wordent *
 gethent(sc)
     int     sc;
 {
-    register struct Hist *hp;
-    register Char *np;
-    register int c;
+    struct Hist *hp;
+    Char *np;
+    int c;
     int     event;
     bool    back = 0;
 
@@ -1258,12 +1258,12 @@ findev(cp, anyarg)
     Char   *cp;
     bool    anyarg;
 {
-    register struct Hist *hp;
+    struct Hist *hp;
 
     for (hp = Histlist.Hnext; hp; hp = hp->Hnext) {
 	Char   *dp;
-	register Char *p, *q;
-	register struct wordent *lp = hp->Hlex.next;
+	Char *p, *q;
+	struct wordent *lp = hp->Hlex.next;
 	int     argno = 0;
 
 	/*
@@ -1307,7 +1307,7 @@ findev(cp, anyarg)
 
 static void
 setexclp(cp)
-    register Char *cp;
+    Char *cp;
 {
     if (cp && cp[0] == '\n')
 	return;
@@ -1325,7 +1325,7 @@ int
 readc(wanteof)
     bool    wanteof;
 {
-    register int c;
+    int c;
     static  sincereal;
 
     aret = F_SEEK;
@@ -1440,10 +1440,10 @@ reread:
 static int
 bgetc()
 {
-    register int buf, off, c;
+    int buf, off, c;
 
 #ifdef FILEC
-    register int numleft = 0, roomleft;
+    int numleft = 0, roomleft;
     Char    ttyline[BUFSIZ];
 #endif
     char    tbuf[BUFSIZ + 1];
@@ -1474,7 +1474,7 @@ bgetc()
 again:
     buf = (int) fseekp / BUFSIZ;
     if (buf >= fblocks) {
-	register Char **nfbuf =
+	Char **nfbuf =
 	(Char **) xcalloc((size_t) (fblocks + 2),
 			  sizeof(Char **));
 
@@ -1505,7 +1505,7 @@ again:
 		    goto again;
 		}
 		if (c > 0)
-		    bcopy(ttyline, fbuf[buf] + off, c * sizeof(Char));
+		    memmove(fbuf[buf] + off, ttyline, c * sizeof(Char));
 		numleft = 0;
 	    }
 	    else {
@@ -1549,7 +1549,7 @@ again:
 static void
 bfree()
 {
-    register int sb, i;
+    int sb, i;
 
     if (cantell)
 	return;

bin/csh/misc.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: misc.c,v 1.2 1994/09/24 02:54:10 davidg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -53,8 +53,8 @@ static int	renum __P((int, int));
 
 int
 any(s, c)
-    register char *s;
-    register int c;
+    char *s;
+    int c;
 {
     if (!s)
 	return (0);		/* Check for nil pointer */
@@ -77,10 +77,10 @@ setzero(cp, i)
 
 char   *
 strsave(s)
-    register char *s;
+    char *s;
 {
     char   *n;
-    register char *p;
+    char *p;
 
     if (s == NULL)
 	s = "";
@@ -94,7 +94,7 @@ strsave(s)
 
 Char  **
 blkend(up)
-    register Char **up;
+    Char **up;
 {
 
     while (*up)
@@ -106,7 +106,7 @@ blkend(up)
 void
 blkpr(fp, av)
     FILE *fp;
-    register Char **av;
+    Char **av;
 {
 
     for (; *av; av++) {
@@ -118,9 +118,9 @@ blkpr(fp, av)
 
 int
 blklen(av)
-    register Char **av;
+    Char **av;
 {
-    register int i = 0;
+    int i = 0;
 
     while (*av++)
 	i++;
@@ -130,9 +130,9 @@ blklen(av)
 Char  **
 blkcpy(oav, bv)
     Char  **oav;
-    register Char **bv;
+    Char **bv;
 {
-    register Char **av = oav;
+    Char **av = oav;
 
     while ((*av++ = *bv++) != NULL)
 	continue;
@@ -152,7 +152,7 @@ void
 blkfree(av0)
     Char  **av0;
 {
-    register Char **av = av0;
+    Char **av = av0;
 
     if (!av0)
 	return;
@@ -163,9 +163,9 @@ blkfree(av0)
 
 Char  **
 saveblk(v)
-    register Char **v;
+    Char **v;
 {
-    register Char **newv =
+    Char **newv =
     (Char **) xcalloc((size_t) (blklen(v) + 1), sizeof(Char **));
     Char  **onewv = newv;
 
@@ -177,11 +177,11 @@ saveblk(v)
 #ifdef NOTUSED
 char   *
 strstr(s, t)
-    register char *s, *t;
+    char *s, *t;
 {
     do {
-	register char *ss = s;
-	register char *tt = t;
+	char *ss = s;
+	char *tt = t;
 
 	do
 	    if (*tt == '\0')
@@ -199,7 +199,7 @@ strspl(cp, dp)
     char   *cp, *dp;
 {
     char   *ep;
-    register char *p, *q;
+    char *p, *q;
 
     if (!cp)
 	cp = "";
@@ -221,9 +221,9 @@ strspl(cp, dp)
 
 Char  **
 blkspl(up, vp)
-    register Char **up, **vp;
+    Char **up, **vp;
 {
-    register Char **wp =
+    Char **wp =
     (Char **) xcalloc((size_t) (blklen(up) + blklen(vp) + 1),
 		      sizeof(Char **));
 
@@ -233,7 +233,7 @@ blkspl(up, vp)
 
 Char
 lastchr(cp)
-    register Char *cp;
+    Char *cp;
 {
 
     if (!cp)
@@ -252,7 +252,7 @@ lastchr(cp)
 void
 closem()
 {
-    register int f, flimit;
+    int f, flimit;
 
     for (f = 0, flimit = getdtablesize(); f < flimit; f++)
 	if (f != SHIN && f != SHOUT && f != SHERR && f != OLDSTD &&
@@ -277,7 +277,7 @@ donefds()
  */
 int
 dmove(i, j)
-    register int i, j;
+    int i, j;
 {
 
     if (i == j || i < 0)
@@ -296,7 +296,7 @@ dmove(i, j)
 
 int
 dcopy(i, j)
-    register int i, j;
+    int i, j;
 {
 
     if (i == j || i < 0 || (j < 0 && i > 2))
@@ -311,9 +311,9 @@ dcopy(i, j)
 
 static int
 renum(i, j)
-    register int i, j;
+    int i, j;
 {
-    register int k = dup(i);
+    int k = dup(i);
 
     if (k < 0)
 	return (-1);
@@ -334,10 +334,10 @@ renum(i, j)
  */
 void
 lshift(v, c)
-    register Char **v;
-    register int c;
+    Char **v;
+    int c;
 {
-    register Char **u;
+    Char **u;
 
     for (u = v; *u && --c >= 0; u++)
 	xfree((ptr_t) *u);
@@ -363,7 +363,7 @@ number(cp)
 
 Char  **
 copyblk(v)
-    register Char **v;
+    Char **v;
 {
     Char  **nv = (Char **) xcalloc((size_t) (blklen(v) + 1), sizeof(Char **));
 
@@ -373,7 +373,7 @@ copyblk(v)
 #ifndef SHORT_STRINGS
 char   *
 strend(cp)
-    register char *cp;
+    char *cp;
 {
     if (!cp)
 	return (cp);
@@ -388,7 +388,7 @@ Char   *
 strip(cp)
     Char   *cp;
 {
-    register Char *dp = cp;
+    Char *dp = cp;
 
     if (!cp)
 	return (cp);
@@ -408,7 +408,7 @@ udvar(name)
 
 int
 prefix(sub, str)
-    register Char *sub, *str;
+    Char *sub, *str;
 {
 
     for (;;) {

bin/csh/parse.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: parse.c,v 1.2 1994/09/24 02:54:11 davidg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -79,7 +79,7 @@ static int aleft;
 extern int hleft;
 void
 alias(lex)
-    register struct wordent *lex;
+    struct wordent *lex;
 {
     jmp_buf osetexit;
 
@@ -99,7 +99,7 @@ alias(lex)
 
 static void
 asyntax(p1, p2)
-    register struct wordent *p1, *p2;
+    struct wordent *p1, *p2;
 {
     while (p1 != p2)
 	if (any(";&\n", p1->word[0]))
@@ -113,10 +113,10 @@ asyntax(p1, p2)
 static void
 asyn0(p1, p2)
     struct wordent *p1;
-    register struct wordent *p2;
+    struct wordent *p2;
 {
-    register struct wordent *p;
-    register int l = 0;
+    struct wordent *p;
+    int l = 0;
 
     for (p = p1; p != p2; p = p->next)
 	switch (p->word[0]) {
@@ -153,11 +153,11 @@ asyn0(p1, p2)
 static void
 asyn3(p1, p2)
     struct wordent *p1;
-    register struct wordent *p2;
+    struct wordent *p2;
 {
-    register struct varent *ap;
+    struct varent *ap;
     struct wordent alout;
-    register bool redid;
+    bool redid;
 
     if (p1 == p2)
 	return;
@@ -203,9 +203,9 @@ asyn3(p1, p2)
 
 static struct wordent *
 freenod(p1, p2)
-    register struct wordent *p1, *p2;
+    struct wordent *p1, *p2;
 {
-    register struct wordent *retp = p1->prev;
+    struct wordent *retp = p1->prev;
 
     while (p1 != p2) {
 	xfree((ptr_t) p1->word);
@@ -229,7 +229,7 @@ freenod(p1, p2)
  */
 struct command *
 syntax(p1, p2, flags)
-    register struct wordent *p1, *p2;
+    struct wordent *p1, *p2;
     int     flags;
 {
 
@@ -251,8 +251,8 @@ syn0(p1, p2, flags)
     struct wordent *p1, *p2;
     int     flags;
 {
-    register struct wordent *p;
-    register struct command *t, *t1;
+    struct wordent *p;
+    struct command *t, *t1;
     int     l;
 
     l = 0;
@@ -319,8 +319,8 @@ syn1(p1, p2, flags)
     struct wordent *p1, *p2;
     int     flags;
 {
-    register struct wordent *p;
-    register struct command *t;
+    struct wordent *p;
+    struct command *t;
     int     l;
 
     l = 0;
@@ -360,9 +360,9 @@ syn1a(p1, p2, flags)
     struct wordent *p1, *p2;
     int     flags;
 {
-    register struct wordent *p;
-    register struct command *t;
-    register int l = 0;
+    struct wordent *p;
+    struct command *t;
+    int l = 0;
 
     for (p = p1; p != p2; p = p->next)
 	switch (p->word[0]) {
@@ -401,9 +401,9 @@ syn1b(p1, p2, flags)
     struct wordent *p1, *p2;
     int     flags;
 {
-    register struct wordent *p;
-    register struct command *t;
-    register int l = 0;
+    struct wordent *p;
+    struct command *t;
+    int l = 0;
 
     for (p = p1; p != p2; p = p->next)
 	switch (p->word[0]) {
@@ -441,9 +441,9 @@ syn2(p1, p2, flags)
     struct wordent *p1, *p2;
     int     flags;
 {
-    register struct wordent *p, *pn;
-    register struct command *t;
-    register int l = 0;
+    struct wordent *p, *pn;
+    struct command *t;
+    int l = 0;
     int     f;
 
     for (p = p1; p != p2; p = p->next)
@@ -492,10 +492,10 @@ syn3(p1, p2, flags)
     struct wordent *p1, *p2;
     int     flags;
 {
-    register struct wordent *p;
+    struct wordent *p;
     struct wordent *lp, *rp;
-    register struct command *t;
-    register int l;
+    struct command *t;
+    int l;
     Char  **av;
     int     n, c;
     bool    specp = 0;
@@ -668,9 +668,9 @@ again:
 
 void
 freesyn(t)
-    register struct command *t;
+    struct command *t;
 {
-    register Char **v;
+    Char **v;
 
     if (t == 0)
 	return;

bin/csh/pathnames.h

@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #define	_PATH_BIN		"/bin"

bin/csh/proc.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -82,10 +82,11 @@ void
 pchild(notused)
 	int notused;
 {
-    register struct process *pp;
-    register struct process *fp;
-    register int pid;
+    struct process *pp;
+    struct process *fp;
+    int pid;
     extern int insource;
+    int save_errno = errno;
     union wait w;
     int     jobflags;
     struct rusage ru;
@@ -101,6 +102,7 @@ loop:
 	    goto loop;
 	}
 	pnoprocesses = pid == -1;
+	errno = save_errno;
 	return;
     }
     for (pp = proclist.p_next; pp != NULL; pp = pp->p_next)
@@ -201,9 +203,9 @@ found:
 void
 pnote()
 {
-    register struct process *pp;
+    struct process *pp;
     int     flags;
-    sigset_t omask;
+    int	omask;
 
     neednote = 0;
     for (pp = proclist.p_next; pp != NULL; pp = pp->p_next) {
@@ -225,8 +227,8 @@ pnote()
 void
 pwait()
 {
-    register struct process *fp, *pp;
-    sigset_t omask;
+    struct process *fp, *pp;
+    int	omask;
 
     /*
      * Here's where dead procs get flushed.
@@ -253,11 +255,11 @@ pwait()
  */
 void
 pjwait(pp)
-    register struct process *pp;
+    struct process *pp;
 {
-    register struct process *fp;
+    struct process *fp;
     int     jobflags, reason;
-    sigset_t omask;
+    int	omask;
 
     while (pp->p_pid != pp->p_jobid)
 	pp = pp->p_friends;
@@ -345,8 +347,8 @@ dowait(v, t)
     Char **v;
     struct command *t;
 {
-    register struct process *pp;
-    sigset_t omask;
+    struct process *pp;
+    int	omask;
 
     pjobs++;
     omask = sigblock(sigmask(SIGCHLD));
@@ -354,7 +356,7 @@ loop:
     for (pp = proclist.p_next; pp; pp = pp->p_next)
 	if (pp->p_pid &&	/* pp->p_pid == pp->p_jobid && */
 	    pp->p_flags & PRUNNING) {
-	    (void) sigpause((sigset_t) 0);
+	    (void) sigpause(0);
 	    goto loop;
 	}
     (void) sigsetmask(omask);
@@ -367,7 +369,7 @@ loop:
 static void
 pflushall()
 {
-    register struct process *pp;
+    struct process *pp;
 
     for (pp = proclist.p_next; pp != NULL; pp = pp->p_next)
 	if (pp->p_pid)
@@ -381,10 +383,10 @@ pflushall()
  */
 static void
 pflush(pp)
-    register struct process *pp;
+    struct process *pp;
 {
-    register struct process *np;
-    register int idx;
+    struct process *np;
+    int idx;
 
     if (pp->p_pid == 0) {
 	(void) fprintf(csherr, "BUG: process flushed twice");
@@ -415,7 +417,7 @@ pflush(pp)
  */
 static void
 pclrcurr(pp)
-    register struct process *pp;
+    struct process *pp;
 {
 
     if (pp == pcurrent)
@@ -443,9 +445,9 @@ static Char *cmdp;
 void
 palloc(pid, t)
     int     pid;
-    register struct command *t;
+    struct command *t;
 {
-    register struct process *pp;
+    struct process *pp;
     int     i;
 
     pp = (struct process *) xcalloc(1, (size_t) sizeof(struct process));
@@ -509,7 +511,7 @@ palloc(pid, t)
 
 static void
 padd(t)
-    register struct command *t;
+    struct command *t;
 {
     Char  **argp;
 
@@ -570,7 +572,7 @@ static void
 pads(cp)
     Char   *cp;
 {
-    register int i;
+    int i;
 
     /*
      * Avoid the Quoted Space alias hack! Reported by:
@@ -626,7 +628,7 @@ prestjob()
 void
 pendjob()
 {
-    register struct process *pp, *tp;
+    struct process *pp, *tp;
 
     if (pcurrjob && (pcurrjob->p_flags & (PFOREGND | PSTOPPED)) == 0) {
 	pp = pcurrjob;
@@ -648,10 +650,10 @@ pendjob()
  */
 static int
 pprint(pp, flag)
-    register struct process *pp;
+    struct process *pp;
     bool    flag;
 {
-    register status, reason;
+    int status, reason;
     struct process *tp;
     int     jobflags, pstatus;
     bool hadnl = 1;	/* did we just have a newline */
@@ -814,13 +816,13 @@ prcomd:
 
 static void
 ptprint(tp)
-    register struct process *tp;
+    struct process *tp;
 {
     struct timeval tetime, diff;
     static struct timeval ztime;
     struct rusage ru;
     static struct rusage zru;
-    register struct process *pp = tp;
+    struct process *pp = tp;
 
     ru = zru;
     tetime = ztime;
@@ -842,8 +844,8 @@ dojobs(v, t)
     Char **v;
     struct command *t;
 {
-    register struct process *pp;
-    register int flag = NUMBER | NAME | REASON;
+    struct process *pp;
+    int flag = NUMBER | NAME | REASON;
     int     i;
 
     if (chkstop)
@@ -872,7 +874,7 @@ dofg(v, t)
     Char **v;
     struct command *t;
 {
-    register struct process *pp;
+    struct process *pp;
 
     okpcntl();
     ++v;
@@ -892,7 +894,7 @@ dofg1(v, t)
     Char **v;
     struct command *t;
 {
-    register struct process *pp;
+    struct process *pp;
 
     okpcntl();
     pp = pfind(v[0]);
@@ -909,7 +911,7 @@ dobg(v, t)
     Char **v;
     struct command *t;
 {
-    register struct process *pp;
+    struct process *pp;
 
     okpcntl();
     ++v;
@@ -928,7 +930,7 @@ dobg1(v, t)
     Char **v;
     struct command *t;
 {
-    register struct process *pp;
+    struct process *pp;
 
     pp = pfind(v[0]);
     pstart(pp, 0);
@@ -955,8 +957,8 @@ dokill(v, t)
     Char **v;
     struct command *t;
 {
-    register int signum = SIGTERM;
-    register char *name;
+    int signum = SIGTERM;
+    char *name;
 
     v++;
     if (v[0] && v[0][0] == '-') {
@@ -998,10 +1000,10 @@ pkill(v, signum)
     Char  **v;
     int     signum;
 {
-    register struct process *pp, *np;
-    register int jobflags = 0;
+    struct process *pp, *np;
+    int jobflags = 0;
     int     pid, err1 = 0;
-    sigset_t omask;
+    int omask;
     Char   *cp;
 
     omask = sigmask(SIGCHLD);
@@ -1081,11 +1083,11 @@ cont:
  */
 void
 pstart(pp, foregnd)
-    register struct process *pp;
+    struct process *pp;
     int     foregnd;
 {
-    register struct process *np;
-    sigset_t omask;
+    struct process *np;
+    int omask;
     long    jobflags = 0;
 
     omask = sigblock(sigmask(SIGCHLD));
@@ -1115,7 +1117,7 @@ void
 panystop(neednl)
     bool    neednl;
 {
-    register struct process *pp;
+    struct process *pp;
 
     chkstop = 2;
     for (pp = proclist.p_next; pp; pp = pp->p_next)
@@ -1127,7 +1129,7 @@ struct process *
 pfind(cp)
     Char   *cp;
 {
-    register struct process *pp, *np;
+    struct process *pp, *np;
 
     if (cp == 0 || cp[1] == 0 || eq(cp, STRcent2) || eq(cp, STRcentplus)) {
 	if (pcurrent == NULL)
@@ -1151,7 +1153,7 @@ pfind(cp)
     for (pp = proclist.p_next; pp; pp = pp->p_next)
 	if (pp->p_pid == pp->p_jobid) {
 	    if (cp[1] == '?') {
-		register Char *dp;
+		Char *dp;
 
 		for (dp = pp->p_command; *dp; dp++) {
 		    if (*dp != cp[2])
@@ -1169,7 +1171,7 @@ pfind(cp)
 	}
     if (np)
 	return (np);
-    stderror(ERR_NAME | cp[1] == '?' ? ERR_JOBPAT : ERR_NOSUCHJOB);
+    stderror(ERR_NAME | (cp[1] == '?' ? ERR_JOBPAT : ERR_NOSUCHJOB));
     /* NOTREACHED */
     return (0);
 }
@@ -1180,10 +1182,10 @@ pfind(cp)
  */
 static struct process *
 pgetcurr(pp)
-    register struct process *pp;
+    struct process *pp;
 {
-    register struct process *np;
-    register struct process *xp = NULL;
+    struct process *np;
+    struct process *xp = NULL;
 
     for (np = proclist.p_next; np; np = np->p_next)
 	if (np != pcurrent && np != pp && np->p_pid &&
@@ -1205,7 +1207,7 @@ donotify(v, t)
     Char **v;
     struct command *t;
 {
-    register struct process *pp;
+    struct process *pp;
 
     pp = pfind(*++v);
     pp->p_flags |= PNOTIFY;
@@ -1228,10 +1230,10 @@ pfork(t, wanttty)
     struct command *t;		/* command we are forking for */
     int     wanttty;
 {
-    register int pid;
+    int pid;
     bool    ignint = 0;
     int     pgrp;
-    sigset_t omask;
+    int	omask;
 
     /*
      * A child will be uninterruptible only under very special conditions.
@@ -1328,7 +1330,7 @@ void
 pgetty(wanttty, pgrp)
     int     wanttty, pgrp;
 {
-    sigset_t omask = 0;
+    int omask = 0;
 
     /*
      * christos: I am blocking the tty signals till I've set things

bin/csh/proc.h

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

bin/csh/sem.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sem.c,v 1.2 1994/09/24 02:54:15 davidg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -62,7 +62,7 @@ static void	 chkclob __P((char *));
 
 void
 execute(t, wanttty, pipein, pipeout)
-    register struct command *t;
+    struct command *t;
     int     wanttty, *pipein, *pipeout;
 {
     bool    forked = 0;
@@ -70,9 +70,9 @@ execute(t, wanttty, pipein, pipeout)
     int     pid = 0;
     int     pv[2];
 
-    static sigset_t csigmask;
+    static int csigmask;
 
-    static sigset_t ocsigmask;
+    static int ocsigmask;
     static int onosigchld = 0;
     static int nosigchld = 0;
 
@@ -226,7 +226,7 @@ execute(t, wanttty, pipein, pipeout)
 	    else {
 		int     ochild, osetintr, ohaderr, odidfds;
 		int     oSHIN, oSHOUT, oSHERR, oOLDSTD, otpgrp;
-		sigset_t omask;
+		int	omask;
 
 		/*
 		 * Prepare for the vfork by saving everything that the child
@@ -451,7 +451,7 @@ static void
 vffree(i)
 int i;
 {
-    register Char **v;
+    Char **v;
 
     if ((v = gargv) != NULL) {
 	gargv = 0;
@@ -481,7 +481,7 @@ int i;
  */
 static Char *
 splicepipe(t, cp)
-    register struct command *t;
+    struct command *t;
     Char *cp;	/* word after < or > */
 {
     Char *blk[2];
@@ -524,12 +524,12 @@ splicepipe(t, cp)
  */
 static void
 doio(t, pipein, pipeout)
-    register struct command *t;
+    struct command *t;
     int    *pipein, *pipeout;
 {
-    register int fd;
-    register Char *cp;
-    register int flags = t->t_dflg;
+    int fd;
+    Char *cp;
+    int flags = t->t_dflg;
 
     if (didfds || (flags & F_REPEAT))
 	return;
@@ -620,7 +620,7 @@ doio(t, pipein, pipeout)
 
 void
 mypipe(pv)
-    register int *pv;
+    int *pv;
 {
 
     if (pipe(pv) < 0)
@@ -635,7 +635,7 @@ oops:
 
 static void
 chkclob(cp)
-    register char *cp;
+    char *cp;
 {
     struct stat stb;
 

bin/csh/set.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: set.c,v 1.3 1995/05/30 00:06:38 rgrimes Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -47,6 +47,7 @@ static char sccsid[] = "@(#)set.c	8.1 (Berkeley) 5/31/93";
 #else
 # include <varargs.h>
 #endif
+#include <unistd.h>
 
 #include "csh.h"
 #include "extern.h"
@@ -75,7 +76,7 @@ doset(v, t)
     Char **v;
     struct command *t;
 {
-    register Char *p;
+    Char *p;
     Char   *vp, op;
     Char  **vecp;
     bool    hadsub;
@@ -116,7 +117,7 @@ doset(v, t)
 	if (op && op != '=')
 	    stderror(ERR_NAME | ERR_SYNTAX);
 	if (eq(p, STRLparen)) {
-	    register Char **e = v;
+	    Char **e = v;
 
 	    if (hadsub)
 		stderror(ERR_NAME | ERR_SYNTAX);
@@ -143,7 +144,7 @@ doset(v, t)
 	    dohash(NULL, NULL);
 	}
 	else if (eq(vp, STRhistchars)) {
-	    register Char *pn = value(STRhistchars);
+	    Char *pn = value(STRhistchars);
 
 	    HIST = *pn++;
 	    HISTSUB = *pn;
@@ -158,7 +159,7 @@ doset(v, t)
 	else if (eq(vp, STRterm))
 	    Setenv(STRTERM, value(vp));
 	else if (eq(vp, STRhome)) {
-	    register Char *cp;
+	    Char *cp;
 
 	    cp = Strsave(value(vp));	/* get the old value back */
 
@@ -184,8 +185,8 @@ doset(v, t)
 
 static Char *
 getinx(cp, ip)
-    register Char *cp;
-    register int *ip;
+    Char *cp;
+    int *ip;
 {
 
     *ip = 0;
@@ -203,7 +204,7 @@ asx(vp, subscr, p)
     int     subscr;
     Char   *p;
 {
-    register struct varent *v = getvx(vp, subscr);
+    struct varent *v = getvx(vp, subscr);
 
     xfree((ptr_t) v->vec[subscr - 1]);
     v->vec[subscr - 1] = globone(p, G_APPEND);
@@ -214,7 +215,7 @@ getvx(vp, subscr)
     Char   *vp;
     int     subscr;
 {
-    register struct varent *v = adrof(vp);
+    struct varent *v = adrof(vp);
 
     if (v == 0)
 	udvar(vp);
@@ -229,7 +230,7 @@ dolet(v, t)
     Char **v;
     struct command *t;
 {
-    register Char *p;
+    Char *p;
     Char   *vp, c, op;
     bool    hadsub;
     int     subscr;
@@ -314,7 +315,7 @@ static Char *
 xset(cp, vp)
     Char   *cp, ***vp;
 {
-    register Char *dp;
+    Char *dp;
 
     if (*cp) {
 	dp = Strsave(cp);
@@ -332,9 +333,9 @@ operate(op, vp, p)
 {
     Char    opr[2];
     Char   *vec[5];
-    register Char **v = vec;
+    Char **v = vec;
     Char  **vecp = v;
-    register int i;
+    int i;
 
     if (op != '=') {
 	if (*vp)
@@ -357,7 +358,7 @@ static Char *putp;
 
 Char   *
 putn(n)
-    register int n;
+    int n;
 {
     int     num;
     static Char number[15];
@@ -390,7 +391,7 @@ putn(n)
 
 static void
 putn1(n)
-    register int n;
+    int n;
 {
     if (n > 9)
 	putn1(n / 10);
@@ -399,9 +400,9 @@ putn1(n)
 
 int
 getn(cp)
-    register Char *cp;
+    Char *cp;
 {
-    register int n;
+    int n;
     int     sign;
 
     sign = 0;
@@ -426,7 +427,7 @@ value1(var, head)
     Char   *var;
     struct varent *head;
 {
-    register struct varent *vp;
+    struct varent *vp;
 
     vp = adrof1(var, head);
     return (vp == 0 || vp->vec[0] == 0 ? STRNULL : vp->vec[0]);
@@ -435,9 +436,9 @@ value1(var, head)
 static struct varent *
 madrof(pat, vp)
     Char   *pat;
-    register struct varent *vp;
+    struct varent *vp;
 {
-    register struct varent *vp1;
+    struct varent *vp1;
 
     for (; vp; vp = vp->v_right) {
 	if (vp->v_left && (vp1 = madrof(pat, vp->v_left)))
@@ -450,10 +451,10 @@ madrof(pat, vp)
 
 struct varent *
 adrof1(name, v)
-    register Char *name;
-    register struct varent *v;
+    Char *name;
+    struct varent *v;
 {
-    register cmp;
+    int cmp;
 
     v = v->v_left;
     while (v && ((cmp = *name - *v->v_name) ||
@@ -472,7 +473,7 @@ void
 set(var, val)
     Char   *var, *val;
 {
-    register Char **vec = (Char **) xmalloc((size_t) (2 * sizeof(Char **)));
+    Char **vec = (Char **) xmalloc((size_t) (2 * sizeof(Char **)));
 
     vec[0] = val;
     vec[1] = 0;
@@ -484,7 +485,7 @@ set1(var, vec, head)
     Char   *var, **vec;
     struct varent *head;
 {
-    register Char **oldv = vec;
+    Char **oldv = vec;
 
     gflag = 0;
     tglob(oldv);
@@ -505,10 +506,10 @@ set1(var, vec, head)
 void
 setq(name, vec, p)
     Char   *name, **vec;
-    register struct varent *p;
+    struct varent *p;
 {
-    register struct varent *c;
-    register f;
+    struct varent *c;
+    int f;
 
     f = 0;			/* tree hangs off the header's left link */
     while ((c = p->v_link[f]) != NULL) {
@@ -551,11 +552,11 @@ unset(v, t)
 
 void
 unset1(v, head)
-    register Char *v[];
+    Char *v[];
     struct varent *head;
 {
-    register struct varent *vp;
-    register int cnt;
+    struct varent *vp;
+    int cnt;
 
     while (*++v) {
 	cnt = 0;
@@ -570,7 +571,7 @@ void
 unsetv(var)
     Char   *var;
 {
-    register struct varent *vp;
+    struct varent *vp;
 
     if ((vp = adrof1(var, &shvhed)) == 0)
 	udvar(var);
@@ -579,10 +580,10 @@ unsetv(var)
 
 static void
 unsetv1(p)
-    register struct varent *p;
+    struct varent *p;
 {
-    register struct varent *c, *pp;
-    register f;
+    struct varent *c, *pp;
+    int f;
 
     /*
      * Free associated memory first to avoid complications.
@@ -633,8 +634,8 @@ shift(v, t)
     Char **v;
     struct command *t;
 {
-    register struct varent *argv;
-    register Char *name;
+    struct varent *argv;
+    Char *name;
 
     v++;
     name = *v;
@@ -665,7 +666,7 @@ exportpath(val)
 		break;
 	    }
 	    if (**val != '/' && (euid == 0 || uid == 0) &&
-		    (intact || intty && isatty(SHOUT)))
+		    (intact || (intty && isatty(SHOUT))))
 		    (void) fprintf(csherr,
 		    "Warning: exported path contains relative components.\n");
 	    (void) Strcat(exppath, *val++);
@@ -717,16 +718,16 @@ rright(p)
  */
 static void
 balance(p, f, d)
-    register struct varent *p;
-    register int f, d;
+    struct varent *p;
+    int f, d;
 {
-    register struct varent *pp;
+    struct varent *pp;
 
 #ifndef lint
-    register struct varent *t;	/* used by the rotate macros */
+    struct varent *t;	/* used by the rotate macros */
 
 #endif
-    register ff;
+    int ff;
 
     /*
      * Ok, from here on, p is the node we're operating on; pp is it's parent; f
@@ -812,13 +813,13 @@ balance(p, f, d)
 
 void
 plist(p)
-    register struct varent *p;
+    struct varent *p;
 {
-    register struct varent *c;
-    register len;
+    struct varent *c;
+    int len;
 
     if (setintr)
-	(void) sigsetmask(sigblock((sigset_t) 0) & ~sigmask(SIGINT));
+	(void) sigsetmask(sigblock(0) & ~sigmask(SIGINT));
 
     for (;;) {
 	while (p->v_left)

bin/csh/str.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: str.c,v 1.2 1994/09/24 02:54:18 davidg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -59,10 +59,10 @@ static char sccsid[] = "@(#)str.c	8.1 (Berkeley) 5/31/93";
 
 Char  **
 blk2short(src)
-    register char **src;
+    char **src;
 {
     size_t     n;
-    register Char **sdst, **dst;
+    Char **sdst, **dst;
 
     /*
      * Count
@@ -79,10 +79,10 @@ blk2short(src)
 
 char  **
 short2blk(src)
-    register Char **src;
+    Char **src;
 {
     size_t     n;
-    register char **sdst, **dst;
+    char **sdst, **dst;
 
     /*
      * Count
@@ -99,11 +99,11 @@ short2blk(src)
 
 Char   *
 str2short(src)
-    register char *src;
+    char *src;
 {
     static Char *sdst;
     static size_t dstsize = 0;
-    register Char *dst, *edst;
+    Char *dst, *edst;
 
     if (src == NULL)
 	return (NULL);
@@ -131,11 +131,11 @@ str2short(src)
 
 char   *
 short2str(src)
-    register Char *src;
+    Char *src;
 {
     static char *sdst = NULL;
     static size_t dstsize = 0;
-    register char *dst, *edst;
+    char *dst, *edst;
 
     if (src == NULL)
 	return (NULL);
@@ -162,9 +162,9 @@ short2str(src)
 
 Char   *
 s_strcpy(dst, src)
-    register Char *dst, *src;
+    Char *dst, *src;
 {
-    register Char *sdst;
+    Char *sdst;
 
     sdst = dst;
     while ((*dst++ = *src++) != '\0')
@@ -174,10 +174,10 @@ s_strcpy(dst, src)
 
 Char   *
 s_strncpy(dst, src, n)
-    register Char *dst, *src;
-    register size_t n;
+    Char *dst, *src;
+    size_t n;
 {
-    register Char *sdst;
+    Char *sdst;
 
     if (n == 0)
 	return(dst);
@@ -195,9 +195,9 @@ s_strncpy(dst, src, n)
 
 Char   *
 s_strcat(dst, src)
-    register Char *dst, *src;
+    Char *dst, *src;
 {
-    register short *sdst;
+    short *sdst;
 
     sdst = dst;
     while (*dst++)
@@ -211,10 +211,10 @@ s_strcat(dst, src)
 #ifdef NOTUSED
 Char   *
 s_strncat(dst, src, n)
-    register Char *dst, *src;
-    register size_t n;
+    Char *dst, *src;
+    size_t n;
 {
-    register Char *sdst;
+    Char *sdst;
 
     if (n == 0)
 	return (dst);
@@ -239,7 +239,7 @@ s_strncat(dst, src, n)
 
 Char   *
 s_strchr(str, ch)
-    register Char *str;
+    Char *str;
     int ch;
 {
     do
@@ -251,10 +251,10 @@ s_strchr(str, ch)
 
 Char   *
 s_strrchr(str, ch)
-    register Char *str;
+    Char *str;
     int ch;
 {
-    register Char *rstr;
+    Char *rstr;
 
     rstr = NULL;
     do
@@ -266,9 +266,9 @@ s_strrchr(str, ch)
 
 size_t
 s_strlen(str)
-    register Char *str;
+    Char *str;
 {
-    register size_t n;
+    size_t n;
 
     for (n = 0; *str++; n++)
 	continue;
@@ -277,7 +277,7 @@ s_strlen(str)
 
 int
 s_strcmp(str1, str2)
-    register Char *str1, *str2;
+    Char *str1, *str2;
 {
     for (; *str1 && *str1 == *str2; str1++, str2++)
 	continue;
@@ -298,8 +298,8 @@ s_strcmp(str1, str2)
 
 int
 s_strncmp(str1, str2, n)
-    register Char *str1, *str2;
-    register size_t n;
+    Char *str1, *str2;
+    size_t n;
 {
     if (n == 0)
 	return (0);
@@ -327,10 +327,10 @@ s_strncmp(str1, str2, n)
 
 Char   *
 s_strsave(s)
-    register Char *s;
+    Char *s;
 {
     Char   *n;
-    register Char *p;
+    Char *p;
 
     if (s == 0)
 	s = STRNULL;
@@ -347,7 +347,7 @@ s_strspl(cp, dp)
     Char   *cp, *dp;
 {
     Char   *ep;
-    register Char *p, *q;
+    Char *p, *q;
 
     if (!cp)
 	cp = STRNULL;
@@ -368,7 +368,7 @@ s_strspl(cp, dp)
 
 Char   *
 s_strend(cp)
-    register Char *cp;
+    Char *cp;
 {
     if (!cp)
 	return (cp);
@@ -379,11 +379,11 @@ s_strend(cp)
 
 Char   *
 s_strstr(s, t)
-    register Char *s, *t;
+    Char *s, *t;
 {
     do {
-	register Char *ss = s;
-	register Char *tt = t;
+	Char *ss = s;
+	Char *tt = t;
 
 	do
 	    if (*tt == '\0')
@@ -396,11 +396,11 @@ s_strstr(s, t)
 
 char   *
 short2qstr(src)
-    register Char *src;
+    Char *src;
 {
     static char *sdst = NULL;
     static size_t dstsize = 0;
-    register char *dst, *edst;
+    char *dst, *edst;
 
     if (src == NULL)
 	return (NULL);

bin/csh/time.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: time.c,v 1.4 1995/03/19 13:28:12 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -92,7 +92,7 @@ donice(v, t)
     Char **v;
     struct command *t;
 {
-    register Char *cp;
+    Char *cp;
     int     nval = 0;
 
     v++, cp = *v++;
@@ -105,7 +105,7 @@ donice(v, t)
 
 void
 ruadd(ru, ru2)
-    register struct rusage *ru, *ru2;
+    struct rusage *ru, *ru2;
 {
     tvadd(&ru->ru_utime, &ru2->ru_utime);
     tvadd(&ru->ru_stime, &ru2->ru_stime);
@@ -129,17 +129,17 @@ ruadd(ru, ru2)
 
 void
 prusage(r0, r1, e, b)
-    register struct rusage *r0, *r1;
+    struct rusage *r0, *r1;
     struct timeval *e, *b;
 {
-    register time_t t =
+    time_t t =
     (r1->ru_utime.tv_sec - r0->ru_utime.tv_sec) * 100 +
     (r1->ru_utime.tv_usec - r0->ru_utime.tv_usec) / 10000 +
     (r1->ru_stime.tv_sec - r0->ru_stime.tv_sec) * 100 +
     (r1->ru_stime.tv_usec - r0->ru_stime.tv_usec) / 10000;
-    register char *cp;
-    register long i;
-    register struct varent *vp = adrof(STRtime);
+    char *cp;
+    long i;
+    struct varent *vp = adrof(STRtime);
 
     int     ms =
     (e->tv_sec - b->tv_sec) * 100 + (e->tv_usec - b->tv_usec) / 10000;
@@ -277,7 +277,7 @@ void
 psecs(l)
     long    l;
 {
-    register int i;
+    int i;
 
     i = l / 3600;
     if (i) {
@@ -298,7 +298,7 @@ void
 pcsecs(l)			/* PWP: print mm:ss.dd, l is in sec*100 */
     long    l;
 {
-    register int i;
+    int i;
 
     i = l / 360000;
     if (i) {

bin/date/Makefile

@@ -1,8 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	date
-SRCS=	date.c netdate.c
+SRCS=	date.c netdate.c vary.c
+CFLAGS+=-Wall
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 

bin/date/date.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\"	$Id: date.1,v 1.11 1997/02/22 14:02:31 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -43,14 +43,16 @@
 .Nd display or set date and time
 .Sh SYNOPSIS
 .Nm date
+.Op Fl nu
 .Op Fl d Ar dst
 .Op Fl r Ar seconds
 .Op Fl t Ar minutes_west
-.Op Fl nu
+.Op Fl v Ns Ar [+|-]val Ns Op ymwdHM
+.Ar ...
+.Op Fl f Ar fmt Ar date | [[[[yy]mm]dd]HH]MM[\&.ss]
 .Op Cm + Ns Ar format
-.Op [yy[mm[dd[hh]]]]mm[\&.ss]
 .Sh DESCRIPTION
-.Nm
+.Nm Date
 displays the current date and time when invoked without arguments.
 Providing arguments will format the date and time in a user-defined
 way or set the date.
@@ -67,6 +69,14 @@ to
 .Xr gettimeofday 2
 will return a non-zero
 .Ql tz_dsttime  .
+.It Fl f
+Use
+.Ar fmt
+as the format string to parse the date provided rather than using
+the default
+.Ar [[[[yy]mm]dd]HH]MM[.ss]
+format.  Parsing is done using
+.Xr strptime 3 .
 .It Fl n
 The utility
 .Xr timed 8
@@ -74,12 +84,12 @@ is used to synchronize the clocks on groups of machines.
 By default, if
 .Xr timed
 is running,
-.Nm date
+.Nm
 will set the time on all of the machines in the local group.
 The
 .Fl n
 option stops
-.Nm date
+.Nm
 from setting the time for other than the current machine.
 .It Fl r
 Print out the date and time in
@@ -97,6 +107,40 @@ by future calls to
 Display or set the date in
 .Tn UCT
 (universal) time.
+.It Fl v
+Adjust the minute, hour, month day, week day, month or year according to
+.Ar val .
+If
+.Ar val
+is preceded with a plus or minus sign, the date is adjusted forwards
+or backwards according to the remaining string, otherwise the relevant
+part of the date is set.  The date can be adjusted as many times as
+required using these flags.  Flags are processed in the order given.
+.Pp
+Minutes are in the range 0-59, hours are in the range 1-12, month days
+are in the range 1-31, week days are in the range 0-6 (Sun-Sat), months
+are in the range 1-12 (Jan-Dec) and years are in the range 80-38 or
+1980-2038.
+.Pp
+If
+.Ar val
+is numeric, one of either
+.Ar y ,
+.Ar m ,
+.Ar w ,
+.Ar d ,
+.Ar H
+or
+.Ar M
+must be used to specify which part of the date is to be adjusted.
+.Pp
+The week day or month may be specified using a name rather than a
+number.  If a name is used with the plus (or minus) sign, the date
+will be put forwards (or backwards) to the next (previous) date that
+matches the given week day or month.  This will not adjust the date
+if the given week day or month is the same as the current one.
+.Pp
+Refer to the examples below for further details.
 .El
 .Pp
 An operand with a leading plus (``+'') sign signals a user-defined format
@@ -118,15 +162,15 @@ The canonical representation for setting the date and time is:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
 .It Ar yy
-Year in abbreviated form (.e.g 89 for 1989).
+Year in abbreviated form (e.g. 89 for 1989, 06 for 2006).
 .It Ar mm
 Numeric month.
 A number from 1 to 12.
 .It Ar dd
 Day, a number from 1 to 31.
-.It Ar hh
+.It Ar HH
 Hour, a number from 0 to 23.
-.It Ar mm
+.It Ar MM
 Minutes, a number from 0 to 59.
 .It Ar .ss
 Seconds, a number from 0 to 61 (59 plus a maximum of two leap seconds).
@@ -139,17 +183,51 @@ and years are handled automatically.
 .Sh EXAMPLES
 The command:
 .Bd -literal -offset indent
-date ``+DATE: %m/%d/%y%nTIME: %H:%M:%S''
+date "+DATE: %Y-%m-%d%nTIME: %H:%M:%S"
 .Ed
 .Pp
 will display:
 .Bd -literal -offset indent
-DATE: 11/21/87
+DATE: 1987-11-21
 TIME: 13:36:16
 .Ed
 .Pp
 The command:
 .Bd -literal -offset indent
+date -v1m -v+1y
+.Ed
+.Pp
+will display:
+.Bd -literal -offset indent
+Sun Jan  4 03:15:24 GMT 1998
+.Ed
+.Pp
+(where it is currently Mon Aug  4 04:15:24 BST 1997).
+.Pp
+The command:
+.Bd -literal -offset indent
+date -v1d -v3m -v0y -v-1d
+.Ed
+.Pp
+will display the last day of February in the year 2000:
+.Bd -literal -offset indent
+Tue Feb 29 03:18:00 GMT 2000
+.Ed
+.Pp
+The command:
+.Bd -literal -offset indent
+date -v1d -v+1m -v-1d -v-fri
+.Ed
+.Pp
+will display the last Friday of the month:
+.Bd -literal -offset indent
+Fri Aug 29 04:31:11 BST 1997
+.Ed
+.Pp
+(where it is currently Mon Aug  4 04:31:11 BST 1997).
+.Pp
+The command:
+.Bd -literal -offset indent
 date 8506131627
 .Ed
 .Pp
@@ -164,13 +242,18 @@ date 1432
 sets the time to
 .Li "2:32 PM" ,
 without modifying the date.
-.Sh ENVIRONMENT VARIABLES
+.Sh ENVIRONMENT
 The execution of
 .Nm
-is affected by the following evironment variables:
+is affected by the following environment variables:
 .Bl -tag -width Ds
 .It Ev TZ
 The timezone to use when displaying dates.
+The normal format is a pathname relative to
+.Pa /usr/share/zoneinfo .
+For example, the command
+.Dq TZ=America/Los_Angeles date
+displays the current time in California.
 See
 .Xr environ 7
 for more information.
@@ -178,13 +261,14 @@ for more information.
 .Sh FILES
 .Bl -tag -width /var/log/messages -compact
 .It Pa /var/log/wtmp
-A record of date resets and time changes.
+a record of date resets and time changes
 .It Pa /var/log/messages
-A record of the user setting the time.
+a record of the user setting the time
 .El
 .Sh SEE ALSO
 .Xr gettimeofday 2 ,
 .Xr strftime 3 ,
+.Xr strptime 3 ,
 .Xr utmp 5 ,
 .Xr timed 8
 .Rs
@@ -201,14 +285,14 @@ Occasionally, when
 synchronizes the time on many hosts, the setting of a new time value may
 require more than a few seconds.
 On these occasions,
-.Nm date
+.Nm
 prints:
 .Ql Network time being set .
 The message
 .Ql Communication error with timed
 occurs when the communication
 between
-.Nm date
+.Nm
 and
 .Xr timed
 fails.
@@ -229,7 +313,7 @@ will be running on
 .Tn GMT .
 .Sh STANDARDS
 The
-.Nm date
+.Nm
 command is expected to be compatible with
 .St -p1003.2 .
 .Sh HISTORY

bin/date/date.c

@@ -30,17 +30,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: date.c,v 1.6 1995/10/23 20:26:53 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1985, 1987, 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)date.c	8.1 (Berkeley) 5/31/93";
+static char const sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -57,11 +57,12 @@ static char sccsid[] = "@(#)date.c	8.1 (Berkeley) 5/31/93";
 #include <locale.h>
 
 #include "extern.h"
+#include "vary.h"
 
 time_t tval;
 int retval, nflag;
 
-static void setthetime __P((char *));
+static void setthetime __P((const char *, const char *));
 static void badformat __P((void));
 static void usage __P((void));
 
@@ -77,14 +78,19 @@ main(argc, argv)
 	struct timezone tz;
 	int ch, rflag;
 	char *format, buf[1024];
-	char *endptr;
+	char *endptr, *fmt;
 	int set_timezone;
+	struct vary *v;
+	const struct vary *badv;
+	struct tm lt;
 
+	v = NULL;
+	fmt = NULL;
 	(void) setlocale(LC_TIME, "");
 	tz.tz_dsttime = tz.tz_minuteswest = 0;
 	rflag = 0;
 	set_timezone = 0;
-	while ((ch = getopt(argc, argv, "d:nr:ut:")) != EOF)
+	while ((ch = getopt(argc, argv, "d:f:nr:t:uv:")) != -1)
 		switch((char)ch) {
 		case 'd':		/* daylight savings time */
 			tz.tz_dsttime = strtol(optarg, &endptr, 10) ? 1 : 0;
@@ -92,6 +98,9 @@ main(argc, argv)
 				usage();
 			set_timezone = 1;
 			break;
+		case 'f':
+			fmt = optarg;
+			break;
 		case 'n':		/* don't set network */
 			nflag = 1;
 			break;
@@ -99,9 +108,6 @@ main(argc, argv)
 			rflag = 1;
 			tval = atol(optarg);
 			break;
-		case 'u':		/* do everything in GMT */
-			(void)setenv("TZ", "GMT0", 1);
-			break;
 		case 't':		/* minutes west of GMT */
 					/* error check; don't allow "PST" */
 			tz.tz_minuteswest = strtol(optarg, &endptr, 10);
@@ -109,6 +115,12 @@ main(argc, argv)
 				usage();
 			set_timezone = 1;
 			break;
+		case 'u':		/* do everything in GMT */
+			(void)setenv("TZ", "GMT0", 1);
+			break;
+		case 'v':
+			v = vary_append(v, optarg);
+			break;
 		default:
 			usage();
 		}
@@ -117,7 +129,7 @@ main(argc, argv)
 
 	/*
 	 * If -d or -t, set the timezone or daylight savings time; this
-	 * doesn't belong here, there kernel should not know about either.
+	 * doesn't belong here; the kernel should not know about either.
 	 */
 	if (set_timezone && settimeofday((struct timeval *)NULL, &tz))
 		err(1, "settimeofday (timezone)");
@@ -134,78 +146,104 @@ main(argc, argv)
 	}
 
 	if (*argv) {
-		setthetime(*argv);
+		setthetime(fmt, *argv);
 		++argv;
-	}
+	} else if (fmt != NULL)
+		usage();
 
 	if (*argv && **argv == '+')
 		format = *argv + 1;
 
-	(void)strftime(buf, sizeof(buf), format, localtime(&tval));
+	lt = *localtime(&tval);
+	badv = vary_apply(v, &lt);
+	if (badv) {
+		fprintf(stderr, "%s: Cannot apply date adjustment\n",
+			badv->arg);
+		vary_destroy(v);
+		usage();
+	}
+	vary_destroy(v);
+	(void)strftime(buf, sizeof(buf), format, &lt);
 	(void)printf("%s\n", buf);
 	exit(retval);
 }
 
 #define	ATOI2(ar)	((ar)[0] - '0') * 10 + ((ar)[1] - '0'); (ar) += 2;
 void
-setthetime(p)
-	register char *p;
+setthetime(fmt, p)
+	const char *fmt;
+	register const char *p;
 {
 	register struct tm *lt;
 	struct timeval tv;
-	char *dot, *t;
+	const char *dot, *t;
 
-	for (t = p, dot = NULL; *t; ++t) {
-		if (isdigit(*t))
-			continue;
-		if (*t == '.' && dot == NULL) {
-			dot = t;
-			continue;
+	if (fmt != NULL) {
+		lt = localtime(&tval);
+		t = strptime(p, fmt, lt);
+		if (t == NULL) {
+			fprintf(stderr, "Failed conversion of ``%s''"
+				" using format ``%s''\n", p, fmt);
+			lt = localtime(&tval);
+			return;
+		} else if (*t != '\0')
+			fprintf(stderr, "Warning: Ignoring %ld extraneous"
+				" characters in date string (%s)\n",
+				(long) strlen(t), t);
+	} else {
+		for (t = p, dot = NULL; *t; ++t) {
+			if (isdigit(*t))
+				continue;
+			if (*t == '.' && dot == NULL) {
+				dot = t;
+				continue;
+			}
+			badformat();
 		}
-		badformat();
-	}
 
-	lt = localtime(&tval);
+		lt = localtime(&tval);
 
-	if (dot != NULL) {			/* .ss */
-		*dot++ = '\0';
-		if (strlen(dot) != 2)
-			badformat();
-		lt->tm_sec = ATOI2(dot);
-		if (lt->tm_sec > 61)
-			badformat();
-	} else
-		lt->tm_sec = 0;
+		if (dot != NULL) {			/* .ss */
+			dot++; /* *dot++ = '\0'; */
+			if (strlen(dot) != 2)
+				badformat();
+			lt->tm_sec = ATOI2(dot);
+			if (lt->tm_sec > 61)
+				badformat();
+		} else
+			lt->tm_sec = 0;
 
-	switch (strlen(p)) {
-	case 10:				/* yy */
-		lt->tm_year = ATOI2(p);
-		if (lt->tm_year < 69)		/* hack for 2000 ;-} */
-			lt->tm_year += 100;
-		/* FALLTHROUGH */
-	case 8:					/* mm */
-		lt->tm_mon = ATOI2(p);
-		if (lt->tm_mon > 12)
+		/* if p has a ".ss" field then let's pretend it's not there */
+		switch (strlen(p) - ((dot != NULL) ? 3 : 0)) {
+		case 10:				/* yy */
+			lt->tm_year = ATOI2(p);
+			if (lt->tm_year < 69)		/* hack for 2000 ;-} */
+				lt->tm_year += 100;
+			/* FALLTHROUGH */
+		case 8:					/* mm */
+			lt->tm_mon = ATOI2(p);
+			if (lt->tm_mon > 12)
+				badformat();
+			--lt->tm_mon;		/* time struct is 0 - 11 */
+			/* FALLTHROUGH */
+		case 6:					/* dd */
+			lt->tm_mday = ATOI2(p);
+			if (lt->tm_mday > 31)
+				badformat();
+			/* FALLTHROUGH */
+		case 4:					/* HH */
+			lt->tm_hour = ATOI2(p);
+			if (lt->tm_hour > 23)
+				badformat();
+			/* FALLTHROUGH */
+		case 2:					/* MM */
+			lt->tm_min = ATOI2(p);
+			if (lt->tm_min > 59)
+				badformat();
+			break;
+		default:
 			badformat();
-		--lt->tm_mon;			/* time struct is 0 - 11 */
-		/* FALLTHROUGH */
-	case 6:					/* dd */
-		lt->tm_mday = ATOI2(p);
-		if (lt->tm_mday > 31)
-			badformat();
-		/* FALLTHROUGH */
-	case 4:					/* hh */
-		lt->tm_hour = ATOI2(p);
-		if (lt->tm_hour > 23)
-			badformat();
-		/* FALLTHROUGH */
-	case 2:					/* mm */
-		lt->tm_min = ATOI2(p);
-		if (lt->tm_min > 59)
-			badformat();
-		break;
-	default:
-		badformat();
+		}
 	}
 
 	/* convert broken-down time to GMT clock time */
@@ -237,8 +275,9 @@ badformat()
 static void
 usage()
 {
-	(void)fprintf(stderr,
-	    "usage: date [-nu] [-d dst] [-r seconds] [-t west] [+format]\n");
-	(void)fprintf(stderr, "            [yy[mm[dd[hh]]]]mm[.ss]]\n");
+	(void)fprintf(stderr, "%s\n%s\n",
+	    "usage: date [-nu] [-d dst] [-r seconds] [-t west] "
+	    "[-v[+|-]val[ymwdHM]] ... ",
+	    "            [-f fmt date | [[[[yy]mm]dd]HH]MM[.ss]] [+format]");
 	exit(1);
 }

bin/date/extern.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 int	netsettime __P((time_t));

bin/date/netdate.c

@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: netdate.c,v 1.3 1995/05/30 00:06:41 rgrimes Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)netdate.c	8.1 (Berkeley) 5/31/93";
+static char const sccsid[] = "@(#)netdate.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -116,7 +116,7 @@ netsettime(tval)
 		warn("gethostname");
 		goto bad;
 	}
-	(void)strncpy(msg.tsp_name, hostname, sizeof(msg.tsp_name));
+	(void)strncpy(msg.tsp_name, hostname, sizeof(msg.tsp_name) - 1);
 	msg.tsp_name[sizeof(msg.tsp_name) - 1] = '\0';
 	msg.tsp_seq = htons((u_short)0);
 	msg.tsp_time.tv_sec = htonl((u_long)tval);

bin/date/vary.c

@@ -0,0 +1,412 @@
+/*-
+ * Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <time.h>
+#include <string.h>
+#include <stdlib.h>
+#include "vary.h"
+
+struct trans {
+  int val;
+  char *str;
+};
+
+static struct trans trans_mon[] = {
+  { 1, "january" }, { 2, "february" }, { 3, "march" }, { 4, "april" },
+  { 5, "may" }, { 6, "june" }, { 7, "july" }, { 8, "august" },
+  { 9, "september" }, { 10, "october" }, { 11, "november" }, { 12, "december" },
+  { -1, NULL }
+};
+
+static struct trans trans_wday[] = {
+  { 0, "sunday" }, { 1, "monday" }, { 2, "tuesday" }, { 3, "wednesday" },
+  { 4, "thursday" }, { 5, "friday" }, { 6, "saturday" },
+  { -1, NULL }
+};
+
+static char digits[] = "0123456789";
+
+static int
+trans(const struct trans t[], const char *arg)
+{
+  int f;
+
+  for (f = 0; t[f].val != -1; f++)
+    if (!strncasecmp(t[f].str, arg, 3) ||
+        !strncasecmp(t[f].str, arg, strlen(t[f].str)))
+      return t[f].val;
+
+  return -1;
+}
+
+struct vary *
+vary_append(struct vary *v, char *arg)
+{
+  struct vary *result, **nextp;
+
+  if (v) {
+    result = v;
+    while (v->next)
+      v = v->next;
+    nextp = &v->next;
+  } else
+    nextp = &result;
+
+  *nextp = (struct vary *)malloc(sizeof(struct vary));
+  (*nextp)->arg = arg;
+  (*nextp)->next = NULL;
+  return result;
+}
+
+static int mdays[12] = { 31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+
+static int
+daysinmonth(const struct tm *t)
+{
+  int year;
+
+  year = t->tm_year + 1900;
+
+  if (t->tm_mon == 1)
+    if (!(year % 400))
+      return 29;
+    else if (!(year % 100))
+      return 28;
+    else if (!(year % 4))
+      return 29;
+    else
+      return 28;
+  else if (t->tm_mon >= 0 && t->tm_mon < 12)
+    return mdays[t->tm_mon];
+
+  return 0;
+}
+
+
+static int
+adjyear(struct tm *t, char type, int val)
+{
+  switch (type) {
+    case '+':
+      t->tm_year += val;
+      break;
+    case '-':
+      t->tm_year -= val;
+      break;
+    default:
+      t->tm_year = val;
+      if (t->tm_year < 69)
+      	t->tm_year += 100;		/* as per date.c */
+      else if (t->tm_year > 1900)
+        t->tm_year -= 1900;             /* struct tm holds years since 1900 */
+      break;
+  }
+  return mktime(t) != -1;
+}
+
+static int
+adjmon(struct tm *t, char type, int val, int istext)
+{
+  if (val < 0)
+    return 0;
+
+  switch (type) {
+    case '+':
+      if (istext)
+        if (val <= t->tm_mon)
+          val += 11 - t->tm_mon;	/* early next year */
+        else
+          val -= t->tm_mon + 1;		/* later this year */
+      if (!adjyear(t, '+', (t->tm_mon + val) / 12))
+        return 0;
+      val %= 12;
+      t->tm_mon += val;
+      if (t->tm_mon > 11)
+        t->tm_mon -= 12;
+      break;
+
+    case '-':
+      if (istext)
+        if (val-1 > t->tm_mon)
+          val = 13 - val + t->tm_mon;	/* later last year */
+        else
+          val = t->tm_mon - val + 1;	/* early this year */
+      if (!adjyear(t, '-', val / 12))
+        return 0;
+      val %= 12;
+      if (val > t->tm_mon) {
+        if (!adjyear(t, '-', 1))
+          return 0;
+        val -= 12;
+      }
+      t->tm_mon -= val;
+      break;
+
+    default:
+      if (val > 12 || val < 1)
+        return 0;
+      t->tm_mon = --val;
+  }
+
+  return mktime(t) != -1;
+}
+
+static int
+adjday(struct tm *t, char type, int val)
+{
+  int mdays;
+  switch (type) {
+    case '+':
+      while (val) {
+        mdays = daysinmonth(t);
+        if (val > mdays - t->tm_mday) {
+          val -= mdays - t->tm_mday + 1;
+          t->tm_mday = 1;
+          if (!adjmon(t, '+', 1, 0))
+            return 0;
+        } else {
+          t->tm_mday += val;
+          val = 0;
+        }
+      }
+      break;
+    case '-':
+      while (val)
+        if (val >= t->tm_mday) {
+          val -= t->tm_mday;
+          t->tm_mday = 1;
+          if (!adjmon(t, '-', 1, 0))
+            return 0;
+          t->tm_mday = daysinmonth(t);
+        } else {
+          t->tm_mday -= val;
+          val = 0;
+        }
+      break;
+    default:
+      if (val > 0 && val <= daysinmonth(t))
+        t->tm_mday = val;
+      else
+        return 0;
+      break;
+  }
+
+  return mktime(t) != -1;
+}
+
+static int
+adjwday(struct tm *t, char type, int val, int istext)
+{
+  if (val < 0)
+    return 0;
+
+  switch (type) {
+    case '+':
+      if (istext)
+        if (val < t->tm_wday)
+          val = 7 - t->tm_wday + val;  /* early next week */
+        else
+          val -= t->tm_wday;           /* later this week */
+      else
+        val *= 7;                      /* "-W +5" == "5 weeks in the future" */
+      return adjday(t, '+', val);
+    case '-':
+      if (istext)
+        if (val > t->tm_wday)
+          val = 7 - val + t->tm_wday;  /* later last week */
+        else
+          val = t->tm_wday - val;      /* early this week */
+      else
+        val *= 7;                      /* "-W -5" == "5 weeks ago" */
+      return adjday(t, '-', val);
+    default:
+      if (val < t->tm_wday)
+        return adjday(t, '-', t->tm_wday - val);
+      else if (val > 6)
+        return 0;
+      else if (val > t->tm_wday)
+        return adjday(t, '+', val - t->tm_wday);
+  }
+  return 1;
+}
+
+static int
+adjhour(struct tm *t, char type, int val)
+{
+  if (val < 0)
+    return 0;
+
+  switch (type) {
+    case '+':
+      if (!adjday(t, '+', (t->tm_hour + val) / 24))
+        return 0;
+      val %= 24;
+      t->tm_hour += val;
+      if (t->tm_hour > 23)
+        t->tm_hour -= 24;
+      break;
+
+    case '-':
+      if (!adjday(t, '-', val / 24))
+        return 0;
+      val %= 24;
+      if (val > t->tm_hour) {
+        if (!adjday(t, '-', 1))
+          return 0;
+        val -= 24;
+      }
+      t->tm_hour -= val;
+      break;
+
+    default:
+      if (val > 23)
+        return 0;
+      t->tm_hour = val;
+  }
+
+  return mktime(t) != -1;
+}
+
+static int
+adjmin(struct tm *t, char type, int val)
+{
+  if (val < 0)
+    return 0;
+
+  switch (type) {
+    case '+':
+      if (!adjhour(t, '+', (t->tm_min + val) / 60))
+        return 0;
+      val %= 60;
+      t->tm_min += val;
+      if (t->tm_min > 59)
+        t->tm_min -= 60;
+      break;
+
+    case '-':
+      if (!adjhour(t, '-', val / 60))
+        return 0;
+      val %= 60;
+      if (val > t->tm_min) {
+        if (!adjhour(t, '-', 1))
+          return 0;
+        val -= 60;
+      }
+      t->tm_min -= val;
+      break;
+
+    default:
+      if (val > 59)
+        return 0;
+      t->tm_min = val;
+  }
+
+  return mktime(t) != -1;
+}
+
+const struct vary *
+vary_apply(const struct vary *v, struct tm *t)
+{
+  char type;
+  char which;
+  char *arg;
+  int len;
+  int val;
+
+  for (; v; v = v->next) {
+    type = *v->arg;
+    arg = v->arg;
+    if (type == '+' || type == '-')
+      arg++;
+    else
+      type = '\0';
+    len = strlen(arg);
+    if (len < 2)
+      return v;
+
+    if (strspn(arg, digits) != len-1) {
+      val = trans(trans_wday, arg);
+      if (val != -1) {
+          if (!adjwday(t, type, val, 1))
+            return v;
+      } else {
+        val = trans(trans_mon, arg);
+        if (val != -1) {
+          if (!adjmon(t, type, val, 1))
+            return v;
+        } else
+          return v;
+      }
+    } else {
+      val = atoi(arg);
+      which = arg[len-1];
+      
+      switch (which) {
+        case 'M':
+          if (!adjmin(t, type, val))
+            return v;
+          break;
+        case 'H':
+          if (!adjhour(t, type, val))
+            return v;
+          break;
+        case 'd':
+          if (!adjday(t, type, val))
+            return v;
+          break;
+        case 'w':
+          if (!adjwday(t, type, val, 0))
+            return v;
+          break;
+        case 'm':
+          if (!adjmon(t, type, val, 0))
+            return v;
+          break;
+        case 'y':
+          if (!adjyear(t, type, val))
+            return v;
+          break;
+        default:
+          return v;
+      }
+    }
+  }
+  return 0;
+}
+
+void
+vary_destroy(struct vary *v)
+{
+  struct vary *n;
+
+  while (v) {
+    n = v->next;
+    free(v);
+    v = n;
+  }
+}

bin/date/vary.h

@@ -0,0 +1,36 @@
+/*-
+ * Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+struct vary {
+  char *arg;
+  struct vary *next;
+};
+
+extern struct vary *vary_append(struct vary *v, char *arg);
+extern const struct vary *vary_apply(const struct vary *v, struct tm *t);
+extern void vary_destroy(struct vary *v);

bin/dd/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c

bin/dd/args.c

@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: args.c,v 1.3 1994/09/24 02:54:42 davidg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -101,6 +101,8 @@ jcl(argv)
 	in.dbsz = out.dbsz = 512;
 
 	while ((oper = *++argv) != NULL) {
+		if ((oper = strdup(oper)) == NULL)
+			errx(1, "unable to allocate space for the argument \"%s\"", *argv);
 		if ((arg = strchr(oper, '=')) == NULL)
 			errx(1, "unknown operand %s", oper);
 		*arg++ = '\0';
@@ -282,6 +284,7 @@ static struct conv {
 	{ "oldebcdic",	C_EBCDIC,	C_ASCII,	a2e_32V },
 	{ "oldibm",	C_EBCDIC,	C_ASCII,	a2ibm_32V },
 	{ "osync",	C_OSYNC,	C_BS,		NULL },
+	{ "sparse",	C_SPARSE,	0,		NULL },
 	{ "swab",	C_SWAB,		0,		NULL },
 	{ "sync",	C_SYNC,		0,		NULL },
 	{ "ucase",	C_UCASE,	C_LCASE,	NULL },

bin/dd/conv.c

@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: conv.c,v 1.3 1994/09/24 02:54:44 davidg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -129,7 +129,7 @@ block()
 	 * Copy records (max cbsz size chunks) into the output buffer.  The
 	 * translation is done as we copy into the output buffer.
 	 */
-	ch = 0;			/* Help the compiler. */
+	ch = 0;
 	for (inp = in.dbp - in.dbcnt, outp = out.dbp; in.dbcnt;) {
 		maxlen = MIN(cbsz, in.dbcnt);
 		if ((t = ctab) != NULL)

bin/dd/conv_tab.c

@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: conv_tab.c,v 1.2 1994/09/24 02:54:47 davidg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
+static char const sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
 #include <sys/types.h>

bin/dd/dd.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\"	$Id: dd.1,v 1.4 1997/02/22 14:02:43 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 13, 1994
 .Dt DD 1
@@ -52,7 +52,7 @@ Input data is read and written in 512-byte blocks.
 If input reads are short, input from multiple reads are aggregated
 to form the output block.
 When finished,
-.Nm dd
+.Nm
 displays the number of complete and partial input and output blocks
 and truncated input records to the standard error output.
 .Pp
@@ -148,7 +148,7 @@ is one of the symbols from the following list.
 The same as the
 .Cm unblock
 value except that characters are translated from
-.Tn ECBDIC
+.Tn EBCDIC
 to
 .Tn ASCII
 before the
@@ -237,7 +237,7 @@ will be positioned past the block in which the error occurred using
 Do not truncate the output file.
 This will preserve any blocks in the output file not explicitly written
 by
-.Nm dd .
+.Nm Ns .
 The
 .Cm notrunc
 value is not supported for tapes.
@@ -250,6 +250,13 @@ regularly sized blocks to be written.
 This option is incompatible with use of the
 .Cm bs= Ns Ar n
 block size specification.
+.It Cm sparse
+If one or more output blocks would consist solely of
+.Tn NUL
+bytes, try to seek the output file by the required space instead of
+filling them with
+.Tn NULs ,
+resulting in a sparse file.
 .It Cm swab
 Swap every pair of input bytes.
 If an input buffer has an odd number of bytes, the last byte will be
@@ -280,7 +287,7 @@ in an integer, respectively.
 Two or more numbers may be separated by an ``x'' to indicate a product.
 .Pp
 When finished,
-.Nm dd
+.Nm
 displays the number of complete and partial input and output blocks,
 truncated input records and odd-length byte-swapping blocks to the
 standard error output.
@@ -303,7 +310,7 @@ This means that the final output block may be shorter than the output
 block size.
 .Pp
 If
-.Nm dd
+.Nm
 receives a
 .Dv SIGINFO
 (see the ``status'' argument for
@@ -312,17 +319,17 @@ signal, the current input and output block counts will
 be written to the standard error output
 in the same format as the standard completion message.
 If
-.Nm dd
+.Nm
 receives a
 .Dv SIGINT
 signal, the current input and output block counts will
 be written to the standard error output
 in the same format as the standard completion message and
-.Nm dd
+.Nm
 will exit.
 .Pp
 The
-.Nm dd
+.Nm
 utility exits 0 on success and >0 if an error occurred.
 .Sh SEE ALSO
 .Xr cp 1 ,
@@ -330,7 +337,7 @@ utility exits 0 on success and >0 if an error occurred.
 .Xr tr 1
 .Sh STANDARDS
 The
-.Nm dd
+.Nm
 utility is expected to be a superset of the
 .St -p1003.2
 standard.

bin/dd/dd.c

@@ -34,17 +34,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dd.c,v 1.5 1995/10/23 21:31:48 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1991, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -75,6 +75,7 @@ IO	in, out;		/* input/output state */
 STAT	st;			/* statistics */
 void	(*cfunc) __P((void));	/* conversion function */
 u_long	cpy_cnt;		/* # of blocks to copy */
+u_long	pending = 0;		/* pending seek if sparse */
 u_int	ddflags;		/* conversion options */
 u_int	cbsz;			/* conversion block size */
 u_int	files_cnt = 1;		/* # of files to copy */
@@ -169,7 +170,7 @@ setup()
 	 * Truncate the output file; ignore errors because it fails on some
 	 * kinds of output files, tapes, for example.
 	 */
-	if (ddflags & (C_OF | C_SEEK | C_NOTRUNC) == (C_OF | C_SEEK))
+	if ((ddflags & (C_OF | C_SEEK | C_NOTRUNC)) == (C_OF | C_SEEK))
 		(void)ftruncate(out.fd, (off_t)out.offset * out.dbsz);
 
 	/*
@@ -236,19 +237,18 @@ getfdtype(io)
 static void
 dd_in()
 {
-	int flags, n;
+	int n;
 
-	for (flags = ddflags;;) {
+	for (;;) {
 		if (cpy_cnt && (st.in_full + st.in_part) >= cpy_cnt)
 			return;
 
 		/*
-		 * Zero the buffer first if trying to recover from errors so
-		 * lose the minimum amount of data.  If doing block operations
+		 * Zero the buffer first if sync; If doing block operations
 		 * use spaces.
 		 */
-		if ((flags & (C_NOERROR|C_SYNC)) == (C_NOERROR|C_SYNC))
-			if (flags & (C_BLOCK|C_UNBLOCK))
+		if (ddflags & C_SYNC)
+			if (ddflags & (C_BLOCK|C_UNBLOCK))
 				memset(in.dbp, ' ', in.dbsz);
 			else
 				memset(in.dbp, 0, in.dbsz);
@@ -265,7 +265,7 @@ dd_in()
 			 * If noerror not specified, die.  POSIX requires that
 			 * the warning message be followed by an I/O display.
 			 */
-			if (!(flags & C_NOERROR))
+			if (!(ddflags & C_NOERROR))
 				err(1, "%s", in.name);
 			warn("%s", in.name);
 			summary();
@@ -316,7 +316,7 @@ dd_in()
 		}
 
 		if (ddflags & C_SWAB) {
-			if ((n = in.dbcnt) & 1) {
+			if ((n = in.dbrcnt) & 1) {
 				++st.swab;
 				--n;
 			}
@@ -341,11 +341,14 @@ dd_close()
 		block_close();
 	else if (cfunc == unblock)
 		unblock_close();
-	if (ddflags & C_OSYNC && out.dbcnt < out.dbsz) {
-		memset(out.dbp, 0, out.dbsz - out.dbcnt);
+	if (ddflags & C_OSYNC && out.dbcnt && out.dbcnt < out.dbsz) {
+		if (ddflags & (C_BLOCK|C_UNBLOCK))
+			memset(out.dbp, ' ', out.dbsz - out.dbcnt);
+		else
+			memset(out.dbp, 0, out.dbsz - out.dbcnt);
 		out.dbcnt = out.dbsz;
 	}
-	if (out.dbcnt)
+	if (out.dbcnt || pending)
 		dd_out(1);
 }
 
@@ -354,7 +357,7 @@ dd_out(force)
 	int force;
 {
 	static int warned;
-	int cnt, n, nw;
+	int cnt, n, nw, i, sparse;
 	u_char *outp;
 
 	/*
@@ -376,7 +379,35 @@ dd_out(force)
 	outp = out.db;
 	for (n = force ? out.dbcnt : out.dbsz;; n = out.dbsz) {
 		for (cnt = n;; cnt -= nw) {
-			nw = write(out.fd, outp, cnt);
+			sparse = 0;
+			if (ddflags & C_SPARSE) {
+				sparse = 1;	/* Is buffer sparse? */
+				for (i = 0; i < cnt; i++)
+					if (outp[i] != 0) {
+						sparse = 0;
+						break;
+					}
+			}
+			if (sparse && !force) {
+				pending += cnt;
+				nw = cnt;
+			} else {
+				if (pending != 0) {
+					if (force)
+						pending--;
+					if (lseek (out.fd, pending, SEEK_CUR) == -1)
+						err(2, "%s: seek error creating sparse file",
+						    out.name);
+					if (force)
+						write(out.fd, outp, 1);
+					pending = 0;
+				}
+				if (cnt)
+					nw = write(out.fd, outp, cnt);
+				else
+					return;
+			}
+
 			if (nw <= 0) {
 				if (nw == 0)
 					errx(1, "%s: end of device", out.name);

bin/dd/dd.h

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- *	$Id: dd.h,v 1.2 1994/09/24 02:54:54 davidg Exp $
+ * $FreeBSD$
  */
 
 /* Input/output stream state. */
@@ -69,7 +69,7 @@ typedef struct {
 	u_long	out_part;		/* # of partial output blocks */
 	u_long	trunc;			/* # of truncated records */
 	u_long	swab;			/* # of odd-length swab blocks */
-	u_long	bytes;			/* # of bytes written */
+	u_int64_t	bytes;		/* # of bytes written */
 	double	start; 			/* start time of dd */
 } STAT;
 
@@ -95,3 +95,4 @@ typedef struct {
 #define	C_UCASE		0x40000
 #define	C_UNBLOCK	0x80000
 #define	C_OSYNC		0x100000
+#define	C_SPARSE	0x200000

bin/dd/extern.h

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>

bin/dd/misc.c

@@ -34,17 +34,18 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: misc.c,v 1.2 1994/09/24 02:55:01 davidg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/time.h>
 
 #include <err.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -81,7 +82,7 @@ summary()
 		(void)write(STDERR_FILENO, buf, strlen(buf));
 	}
 	(void)snprintf(buf, sizeof(buf),
-	    "%u bytes transferred in %.6f secs (%.0f bytes/sec)\n",
+	    "%qu bytes transferred in %.6f secs (%.0f bytes/sec)\n",
 	    st.bytes, secs, st.bytes / secs);
 	(void)write(STDERR_FILENO, buf, strlen(buf));
 }
@@ -91,15 +92,18 @@ void
 summaryx(notused)
 	int notused;
 {
+	int save_errno = errno;
 
 	summary();
+	errno = save_errno;
 }
 
 /* ARGSUSED */
 void
-terminate(notused)
-	int notused;
+terminate(sig)
+	int sig;
 {
 
-	exit(0);
+	/* XXX exit() shouldn't call exit() from a signal handler. */
+	exit(sig == 0 ? 0 : 1);
 }

bin/dd/position.c

@@ -34,11 +34,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -67,7 +67,7 @@ pos_in()
 
 	/* If not a character, pipe or tape device, try to seek on it. */
 	if (!(in.flags & (ISCHR|ISPIPE|ISTAPE))) {
-		if (lseek(in.fd, (off_t)(in.offset * in.dbsz), SEEK_CUR) == -1)
+		if (lseek(in.fd, (off_t)in.offset * in.dbsz, SEEK_CUR) == -1)
 			err(1, "%s", in.name);
 		return;
 	}

bin/df/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/1/94
-#	$Id$
+# $FreeBSD$
 
 PROG=	df
 BINGRP=	operator

bin/df/df.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.2 (Berkeley) 1/13/94
-.\"	$Id: df.1,v 1.4 1996/08/29 18:05:48 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 13, 1994
 .Dt DF 1
@@ -40,7 +40,7 @@
 .Nd display free disk space
 .Sh SYNOPSIS
 .Nm df
-.Op Fl ink
+.Op Fl ikn
 .Op Fl t Ar type
 .Op Ar file | Ar filesystem ...
 .Sh DESCRIPTION
@@ -72,34 +72,40 @@ This option should be used if it is possible that one or more
 filesystems are in a state such that they will not be able to provide
 statistics without a long delay.
 When this option is specified,
-.Nm df
+.Nm
 will not request new statistics from the filesystems, but will respond
 with the possibly stale statistics that were previously obtained.
 .It Fl t
 Only print out statistics for filesystems of the specified types.
-The recognized types are:
-ufs, nfs, mfs, lfs, msdos, fdesc, portal, kernfs, procfs, afs, isofs,
-iso9660fs, cdfs, and cd9660,
-along with the aggregates:
-all (the default),
-local (ufs, mfs, lfs, msdos, cd9660),
-and misc (fdesc, portal, kernfs, procfs).
-The names isofs, iso9660fs, cdfs, and cd9660 are aliases to each other
-all of them refering to the same type of file system.
-The string ``no'' may be prepending to a type to get its complement
-(e.g. ``nonfs'' to get non-NFS filesystems).  The first
-.Fl t
-option overrides the default, additional such options will add to
-(or subtract from) the current set of types; e.g. either
-``df -t ufs -t lfs''
-or
-``df -t local -t nomfs''
-will display statistics for UFS and LFS filesystems.
+More than one type may be specified in a comma separated list.
+The list of filesystem types can be prefixed with
+.Dq no
+to specify the filesystem types for which action should
+.Em not
+be taken.
+For example, the
+.Nm
+command:
+.Bd -literal -offset indent
+df -t nonfs,mfs
+.Ed
+.Pp
+lists all filesystems except those of type
+.Tn NFS
+and
+.Tn MFS .
+The
+.Xr sysctl 8
+command can be used to find out the types of filesystems
+that are available on the system:
+.Bd -literal -offset indent
+sysctl vfs
+.Ed
 .El
-.Sh ENVIRONMENTAL VARIABLES
+.Sh ENVIRONMENT
 .Bl -tag -width BLOCKSIZE
 .It Ev BLOCKSIZE
-If the environmental variable
+If the environment variable
 .Ev BLOCKSIZE
 is set, the block counts will be displayed in units of that size block.
 .El
@@ -111,15 +117,16 @@ and
 flags are ignored if a file or filesystem is specified.
 .Sh SEE ALSO
 .Xr quota 1 ,
-.Xr statfs 2 ,
 .Xr fstatfs 2 ,
 .Xr getfsstat 2 ,
+.Xr statfs 2 ,
 .Xr getmntinfo 3 ,
 .Xr fstab 5 ,
 .Xr mount 8 ,
-.Xr quot 8
+.Xr quot 8 ,
+.Xr sysctl 8
 .Sh HISTORY
 A
-.Nm df
+.Nm
 command appeared in
 .At v1 .

bin/df/df.c

@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: df.c,v 1.8 1996/01/14 18:55:09 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -129,7 +129,7 @@ main(argc, argv)
 	iflag = nflag = tflag = 0;
 	fsmask = MT_NONE;
 
-	while ((ch = getopt(argc, argv, "iknt:")) != EOF)
+	while ((ch = getopt(argc, argv, "iknt:")) != -1)
 		switch (ch) {
 		case 'i':
 			iflag = 1;

bin/domainname/Makefile

@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	domainname
 

bin/domainname/domainname.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: domainname.1,v 1.1 1994/09/18 21:23:36 wollman Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
@@ -42,11 +42,11 @@
 .Nm domainname
 .Op Ar ypdomain
 .Sh DESCRIPTION
-.Nm domainname
+.Nm Domainname
 prints the name of the current YP/NIS domain.  The super-user can
 set the domain name by supplying an argument; this is usually done in the
 network initialization script
-.Pa /etc/netstart ,
+.Pa /etc/rc.network ,
 normally run at boot
 time.
 .Sh NOTA BENE

bin/domainname/domainname.c

@@ -40,7 +40,7 @@ static char copyright[] =
 #ifndef lint
 /*static char sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93"; */
 static const char rcsid[] =
-	"$Id: domainname.c,v 1.4 1994/09/26 02:14:27 wollman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -51,14 +51,26 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 
+void usage __P((void));
+
 int
 main(argc,argv)
 	int argc;
 	char *argv[];
 {
+	int ch;
 	char domainname[MAXHOSTNAMELEN];
 
-	argc--, argv++;
+	while ((ch = getopt(argc, argv, "")) != -1)
+		switch (ch) {
+		default:
+			usage();
+		}
+	argc -= optind;
+	argv += optind;
+
+	if (argc > 1)
+		usage();
 
 	if (*argv) {
 		if (setdomainname(*argv, strlen(*argv)))
@@ -70,3 +82,10 @@ main(argc,argv)
 	}
 	exit(0);
 }
+
+void
+usage()
+{
+	(void)fprintf(stderr, "usage: domainname [ypdomain]\n");
+	exit(1);
+}

bin/echo/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	echo
 

bin/echo/echo.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\"	$Id: echo.1,v 1.2 1994/09/24 02:55:17 davidg Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 22, 1993
 .Dt ECHO 1
@@ -47,7 +47,7 @@
 .Op "string ..."
 .Sh DESCRIPTION
 The
-.Nm echo
+.Nm
 utility writes any specified operands, separated by single blank (`` '')
 characters and followed by a newline (``\en'') character, to the standard
 output.
@@ -61,13 +61,13 @@ by iBCS2 compatible systems.
 .El
 .Pp
 The
-.Nm echo
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr printf 1
 .Sh STANDARDS
 The
-.Nm echo
+.Nm
 utility is expected to be
 .St -p1003.2
 compatible.

bin/echo/echo.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: echo.c,v 1.2 1994/09/24 02:55:18 davidg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/ed/Makefile

@@ -1,11 +1,11 @@
-#	$Id: Makefile,v 1.12 1995/10/03 15:44:50 markm Exp $
+# $FreeBSD$
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
-LINKS=  ${BINDIR}/ed ${BINDIR}/red
-MLINKS= ed.1 red.1
+LINKS=	${BINDIR}/ed ${BINDIR}/red
+MLINKS=	ed.1 red.1
 
-.if exists(../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
+.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
 DISTRIBUTION=des
 CFLAGS+=-DDES
 LDADD+= -L${CIPHEROBJDIR} -lcipher

bin/ed/POSIX

@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 This version of ed(1) is not strictly POSIX compliant, as described in
 the POSIX 1003.2 document.  The following is a summary of the omissions,

bin/ed/README

@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
 any regular expression package that conforms to the POSIX interface

bin/ed/buf.c

@@ -24,11 +24,15 @@
  * 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.
- *
- *	$Id: buf.c,v 1.7 1995/05/30 00:06:43 rgrimes Exp $
  */
+
 #ifndef lint
-static char *rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
+#if 0
+static char * const rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
+#else
+static char * const rcsid =
+  "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 #include <sys/file.h>
@@ -264,6 +268,10 @@ init_buffers()
 	   hello, world
 	   EOF */
 	setbuffer(stdin, stdinbuf, 1);
+
+	/* Ensure stdout is line buffered. This avoids bogus delays
+	   of output if stdout is piped through utilities to a terminal. */
+	setvbuf(stdout, NULL, _IOLBF, 0);
 	if (open_sbuf() < 0)
 		quit(2);
 	REQUE(&buffer_head, &buffer_head);

bin/ed/cbc.c

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)bdes.c	5.5 (Berkeley) 6/27/91
- *	$Id: cbc.c,v 1.5 1995/03/19 13:28:24 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/ed/ed.h

@@ -25,10 +25,9 @@
  * SUCH DAMAGE.
  *
  *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- *	$Id: ed.h,v 1.7 1994/09/24 02:55:25 davidg Exp $
+ * $FreeBSD$
  */
 
-#include <sys/types.h>
 #include <sys/param.h>		/* for MAXPATHLEN */
 #include <errno.h>
 #if defined(sun) || defined(__NetBSD__)

bin/ed/glbl.c

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: glbl.c,v 1.3 1995/03/19 13:28:27 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/ed/io.c

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: io.c,v 1.4 1995/03/19 13:28:32 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/ed/main.c

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.5 1995/05/30 00:06:47 rgrimes Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -57,9 +57,9 @@ static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <ctype.h>
-#include <setjmp.h>
-#include <pwd.h>
 #include <locale.h>
+#include <pwd.h>
+#include <setjmp.h>
 
 #include "ed.h"
 
@@ -100,10 +100,6 @@ char *dps = "*";		/* default command-line prompt */
 
 char *usage = "usage: %s [-] [-sx] [-p string] [name]\n";
 
-extern char errmsg[];
-extern int optind;
-extern char *optarg;
-
 /* ed: line editor */
 int
 main(argc, argv)
@@ -112,12 +108,17 @@ main(argc, argv)
 {
 	int c, n;
 	long status = 0;
+#if __GNUC__
+	/* Avoid longjmp clobbering */
+	(void) &argc;
+	(void) &argv;
+#endif
 
 	(void)setlocale(LC_ALL, "");
 
 	red = (n = strlen(argv[0])) > 2 && argv[0][n - 3] == 'r';
 top:
-	while ((c = getopt(argc, argv, "p:sx")) != EOF)
+	while ((c = getopt(argc, argv, "p:sx")) != -1)
 		switch(c) {
 		case 'p':				/* set prompt */
 			prompt = optarg;
@@ -1354,7 +1355,8 @@ signal_hup(signo)
 {
 	if (mutex)
 		sigflags |= (1 << (signo - 1));
-	else	handle_hup(signo);
+	else
+		handle_hup(signo);
 }
 
 
@@ -1364,7 +1366,8 @@ signal_int(signo)
 {
 	if (mutex)
 		sigflags |= (1 << (signo - 1));
-	else	handle_int(signo);
+	else
+		handle_int(signo);
 }
 
 
@@ -1414,6 +1417,8 @@ void
 handle_winch(signo)
 	int signo;
 {
+	int save_errno = errno;
+
 	struct winsize ws;		/* window size structure */
 
 	sigflags &= ~(1 << (signo - 1));
@@ -1421,6 +1426,7 @@ handle_winch(signo)
 		if (ws.ws_row > 2) rows = ws.ws_row - 2;
 		if (ws.ws_col > 8) cols = ws.ws_col - 8;
 	}
+	errno = save_errno;
 }
 
 

bin/ed/re.c

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: re.c,v 1.9 1995/03/19 13:28:36 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/ed/sub.c

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sub.c,v 1.5 1995/03/19 13:28:38 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/ed/test/Makefile

@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1994/09/24 02:55:35 davidg Exp $
+# $FreeBSD$
 
 SHELL=	/bin/sh
 ED=	${.OBJDIR}/ed

bin/ed/test/README

@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 The files in this directory with suffixes `.t', `.d', `.r' and `.err' are
 used for testing ed.  To run the tests, set the ED variable in the Makefile

bin/ed/test/ckscripts.sh

@@ -3,7 +3,7 @@
 # and compares their output against the .r files, which contain
 # the correct output
 #
-#	$Id$
+# $FreeBSD$
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1