This commit was manufactured by cvs2svn to create tag

'RELENG_3_0_0_RELEASE'.

Makefile

@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.221 1998/10/17 15:25:26 bde Exp $
+#	$Id: Makefile,v 1.219 1998/09/28 20:39:23 jb Exp $
 #
 # The user-driven targets are:
 #
@@ -52,8 +52,8 @@
 # this overrides /etc/objformat.
 #
 # Unless -DNOAOUT is specified, a `make world' with OBJFORMAT=elf will
-# update the legacy support for aout. This includes all libraries, ld.so
-# and boot objects. This part of build should be regarded as
+# update the legacy support for aout. This includes all libraries, ld.so,
+# lkms and boot objects. This part of build should be regarded as
 # deprecated and you should _not_ expect to be able to do this past the
 # release of 3.1. You have exactly one major release to move entirely
 # to elf.
@@ -92,10 +92,9 @@
 # Define the user-driven targets. These are listed here in alphabetical
 # order, but that's not important.
 #
-TGTS =	afterdistribute all buildworld checkdpadd clean cleandepend cleandir \
-	depend distribute everything hierarchy includes install installmost \
-	installworld lint maninstall mk most obj objlink regress rerelease \
-	tags update world
+TGTS =	afterdistribute all buildworld clean cleandepend cleandir cleanobj \
+	depend distribute everything hierarchy includes installmost install \
+	installworld mk most obj rerelease update world
 
 #
 # Handle the user-driven targets, using the source relative mk files.

Makefile.inc0

@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.inc0,v 1.13 1998/12/20 14:30:08 jhay Exp $
+#	$Id: Makefile.inc0,v 1.9 1998/09/28 20:41:31 jb Exp $
 #
 # This makefile ensures that the object directory is set according to the
 # object format to avoid mixing aout and elf formatted files during the
@@ -18,9 +18,7 @@ MAKEOBJDIRPREFIX?=/usr/obj
 # Variables passed to make work better if they are set as environment
 # variables instead of command line options.
 #
-.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "aout"
 MK_ENV=	MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${OBJFORMAT}
-.endif
 
 #
 # We should always use the current set of mk files, not the installed ones.
@@ -31,29 +29,20 @@ MAKE=	make -m ${.CURDIR}/share/mk -f Makefile.inc1
 #
 # These are the backend targets.
 #
-BKTGTS=	all checkdpadd clean cleandepend cleandir \
-	depend everything hierarchy includes install installmost \
-	lint maninstall mk most obj objlink regress rerelease \
-	tags update
+BKTGTS=	afterdistribute all clean cleandepend cleandir cleanobj depend \
+	distribute everything hierarchy includes installmost install mk \
+	most obj rerelease update
 
 #
 # A generic rule for the backend targets.
 #
 ${BKTGTS} :
-	@cd ${.CURDIR}; ${MAKE} ${.TARGET}
-
-# These targets are used during a make release, which is done after a
-# make world, so they should use the same OBJDIRPREFIX that was used
-# during the make world.
-RELTGTS= afterdistribute distribute
-
-${RELTGTS} :
 	@cd ${.CURDIR}; ${MK_ENV} ${MAKE} ${.TARGET}
 
 #
 # Temporary path and environment for the legacy build.
 #
-ELFTMP=		${MAKEOBJDIRPREFIX}${.CURDIR}/tmp
+ELFTMP=		${MAKEOBJDIRPREFIX}/elf${.CURDIR}/tmp
 ELFTMPPATH=	${ELFTMP}/sbin:${ELFTMP}/bin:${ELFTMP}/usr/sbin:${ELFTMP}/usr/bin:${ELFTMP}/usr/games
 LEGACY_ENV=	PATH=${ELFTMPPATH} OBJFORMAT=aout NOTOOLS=1 TOOLROOT=${ELFTMP} \
 		MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/aout

Makefile.inc1

@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.inc1,v 1.58 1999/01/07 13:09:15 eivind Exp $
+#	$Id: Makefile.inc1,v 1.33 1998/10/13 08:13:32 jkh Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
@@ -8,6 +8,7 @@
 #	-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
 #	-DNOPROFILE do not build profiled libraries
 #	-DNOSECURE do not go into secure subdir
 #	-DNOGAMES do not go into games subdir
@@ -81,6 +82,9 @@ SUBDIR+= usr.sbin
 .if exists(secure) && !defined(NOCRYPT) && !defined(NOSECURE)
 SUBDIR+= secure
 .endif
+.if exists(lkm) && !defined(NOLKM) && ${OBJFORMAT} == "aout"
+SUBDIR+= lkm
+.endif
 
 # etc must be last for "distribute" to work
 .if exists(etc)
@@ -166,12 +170,12 @@ WORLDTMP=	/usr/obj${.CURDIR}/tmp
 # Default root of the tool tree
 TOOLROOT?=	
 # Choose the PATH relative to the root of the tool tree
-PATH=		${TOOLROOT}/sbin:${TOOLROOT}/bin:${TOOLROOT}/usr/sbin:${TOOLROOT}/usr/bin
+PATH=		${TOOLROOT}/sbin:${TOOLROOT}/bin:${TOOLROOT}/usr/sbin:${TOOLROOT}/usr/bin:${TOOLROOT}/usr/games
 .else
 TOOLROOT=	${WORLDTMP}
 .endif
-STRICTTMPPATH=	${TOOLROOT}/sbin:${TOOLROOT}/usr/sbin:${TOOLROOT}/bin:${TOOLROOT}/usr/bin
-TMPPATH=	${STRICTTMPPATH}:${PATH}
+STRICTTMPPATH=	${TOOLROOT}/sbin:${TOOLROOT}/usr/sbin:${TOOLROOT}/bin:${TOOLROOT}/usr/bin:${TOOLROOT}/usr/games
+TMPPATH=	${STRICTTMPPATH}:${PATH}:/usr/games
 
 # XXX COMPILER_PATH is needed for finding cc1, ld and as
 # XXX GCC_EXEC_PREFIX is for *crt.o.  It is probably unnecessary now
@@ -189,7 +193,6 @@ COMPILER_ENV=	BISON_SIMPLE=${TOOLROOT}/usr/share/misc/bison.simple \
 BMAKEENV=	PATH=${TMPPATH} ${COMPILER_ENV} NOEXTRADEPEND=t \
 		OBJFORMAT_PATH=${TOOLROOT}/usr/libexec:/usr/libexec
 XMAKEENV=	PATH=${STRICTTMPPATH} ${COMPILER_ENV} \
-		PERL5LIB=${DESTDIR}/usr/libdata/perl/5.00502 \
 		OBJFORMAT_PATH=${TOOLROOT}/usr/libexec \
 		CFLAGS="-nostdinc ${CFLAGS}"	# XXX -nostdlib
 
@@ -358,7 +361,7 @@ reinstall:
 	@echo ">>> Installing everything.."
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
-.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "aout" && !defined(DESTDIR)
+.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "aout"
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Re-scanning the shared libraries.."
@@ -469,6 +472,22 @@ hierarchy:
 # 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
+.for d in net netatm netinet posix4 sys vm machine
+	if [ -h ${DESTDIR}/usr/include/$d ]; then \
+		rm -f ${DESTDIR}/usr/include/$d ; \
+	fi
+.endfor
+	cd ${.CURDIR}/sys; \
+		find -dx net netatm netinet posix4 sys vm -name '*.h' -o -type d | \
+		cpio -dump ${DESTDIR}/usr/include
+	mkdir -p ${DESTDIR}/usr/include/machine
+	cd ${.CURDIR}/sys/${MACHINE_ARCH}/include; find -dx . -name '*.h' -o -type d | \
+		cpio -dump ${DESTDIR}/usr/include/machine
+.endif
 	cd ${.CURDIR}/usr.bin/make; ${MAKE} ${MK_FLAGS} ${_DEPEND}; \
 		${MAKE} ${MK_FLAGS} all; \
 		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
@@ -486,6 +505,9 @@ bootstrap:
 	cd ${.CURDIR}/usr.sbin/mtree; ${MAKE} ${MK_FLAGS} ${_DEPEND}; \
 		${MAKE} ${MK_FLAGS} all; \
 		${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR}
+.if defined(DESTDIR)
+	cd ${.CURDIR}/include && ${MAKE} copies
+.endif
 
 #
 # include-tools - generally the same as 'bootstrap', except that it's for
@@ -555,13 +577,10 @@ includes:
 	cd ${.CURDIR}/lib/msun;			${MAKE} beforeinstall
 .endif
 	cd ${.CURDIR}/lib/libopie;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libpam/libpam;	${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libpcap;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libradius;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/librpcsvc;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libskey;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libstand;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libtacplus;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libtermcap;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcom_err;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libss;		${MAKE} -B hdrs beforeinstall
@@ -609,6 +628,7 @@ lib-tools:
 		${_aout_strip}		\
 		gnu/usr.bin/binutils	\
 		usr.bin/uudecode	\
+		share/info		\
 		usr.bin/objformat
 	cd ${.CURDIR}/$d; ${MAKE} ${MK_FLAGS} ${_DEPEND}; \
 		${MAKE} ${MK_FLAGS} all; \
@@ -622,19 +642,12 @@ lib-tools:
 # To satisfy shared library linkage when only the libraries being built
 # are visible:
 #
-# csu must be built before all shared libaries for ELF.
 # libcom_err must be built before libss.
-# libcrypt must be built before libskey and libkrb.
-# libdes must be built before libpam.
-# libkrb must be built before libpam.
-# libm must be built before libf2c, libg++ and libstdc++.
-# libmd must be built before libatm, libopie, libradius, libskey,
-# and libtacplus.
+# libcrypt and libmd must be built before libskey.
+# libm must be built before libf2c, libg++ and libstdc++
+# libmd must be built before libatm and libopie
 # libmytinfo must be built before libdialog and libncurses.
 # libncurses must be built before libdialog.
-# libradius must be built before libpam.
-# libskey must be built before libpam.
-# libtacplus must be built before libpam.
 # libtermcap must be built before libcurses, libedit and libreadline.
 #
 # Some libraries are built conditionally and/or are in inconsistently
@@ -650,15 +663,10 @@ _csu=lib/csu/${MACHINE_ARCH}
 
 .if !defined(NOSECURE) && !defined(NOCRYPT)
 _libcrypt=	secure/lib/libcrypt lib/libcrypt
-_secure_lib=	secure/lib
 .else
 _libcrypt=	lib/libcrypt
 .endif
 
-.if !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
-_kerberosIV_lib=kerberosIV/lib
-.endif
-
 .if defined(WANT_CSRG_LIBM)
 _libm=	lib/libm
 .else
@@ -706,16 +714,21 @@ bootstrap-libraries:
 # alphabetical order.
 #
 libraries:
-.for _lib in ${_csu} lib/libcom_err ${_libcrypt} ${_libm} lib/libmd \
-    lib/libmytinfo lib/libncurses lib/libtermcap \
-    lib/libradius lib/libskey lib/libtacplus \
-    ${_secure_lib} ${_kerberosIV_lib} \
+.for _lib in lib/libcom_err ${_libcrypt} ${_libm} lib/libmytinfo \
+    lib/libncurses lib/libtermcap \
     gnu/lib gnu/usr.bin/cc/libgcc ${_libperl} lib usr.bin/lex/lib \
     usr.sbin/pcvt/keycap
 .if exists(${.CURDIR}/${_lib})
 	cd ${.CURDIR}/${_lib}; ${MAKE} all; ${MAKE} -B install
 .endif
 .endfor
+.if exists(${.CURDIR}/secure/lib) && !defined(NOCRYPT) && !defined(NOSECURE)
+	cd ${.CURDIR}/secure/lib; ${MAKE} all; ${MAKE} -B install
+.endif
+.if exists(${.CURDIR}/kerberosIV/lib) && !defined(NOCRYPT) && \
+    defined(MAKE_KERBEROS4)
+	cd ${.CURDIR}/kerberosIV/lib; ${MAKE} all; ${MAKE} -B install
+.endif
 
 #
 # Exclude unused tools from build-tools.
@@ -733,8 +746,8 @@ _perl=		gnu/usr.bin/perl/miniperl
 .if !defined(NOSHARE) && exists(${.CURDIR}/share)
 _scrnmaps=	share/syscons/scrnmaps
 .endif
-.if ${MACHINE_ARCH} == i386
-_kldlinux=	sys/modules/linux
+.if !defined(NOLKM) && exists(${.CURDIR}/lkm) && ${OBJFORMAT} == "aout"
+_linux=		lkm/linux
 .endif
 .if ${OBJFORMAT} == "aout"
 _netboot=	sys/${MACHINE}/boot/netboot
@@ -791,7 +804,6 @@ build-tools:
 		usr.bin/file2c		\
 		usr.bin/find		\
 		usr.bin/gencat		\
-		usr.bin/gensetdefs	\
 		usr.bin/id		\
 		usr.bin/join		\
 		usr.bin/lorder		\
@@ -834,7 +846,6 @@ build-tools:
 		gnu/usr.bin/cc/cc_tools	\
 		lib/libmytinfo		\
 		${_linux}		\
-		${_kldlinux}		\
 		${_scrnmaps}		\
 		${_netboot}
 	cd ${.CURDIR}/$d; ${MAKE} ${BTMAKEFLAGS} build-tools
@@ -878,6 +889,14 @@ legacy-build:
 	cd ${.CURDIR}/libexec/rtld-aout; \
 		${XMAKE} -DNOMAN depend; ${XMAKE} -DNOMAN all;
 	@echo
+.if exists(${.CURDIR}/lkm) && !defined(NOLKM)
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Building legacy lkms"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR}/lkm; \
+		${XMAKE} -DNOMAN depend; ${XMAKE} -DNOMAN all;
+	@echo
+.endif
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Building legacy boot"
 	@echo "--------------------------------------------------------------"
@@ -916,6 +935,13 @@ legacy-install:
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}/libexec/rtld-aout; ${MAKE} -DNOMAN install
 	@echo
+.if exists(${.CURDIR}/lkm) && !defined(NOLKM)
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Installing legacy lkms"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR}/lkm; ${MAKE} -DNOMAN install
+	@echo
+.endif
 .if ${MACHINE_ARCH} != "alpha"
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Installing legacy boot"
@@ -946,16 +972,6 @@ check-objformat	:
 	@/bin/sh -c "echo \"in your environment.\" "
 	@exit 1
 .endif
-.if	!defined(REALLY_WANT_DEPRECIATED_AOUT) && ${OBJFORMAT} == "aout"
-	@echo "==== NOTICE: a.out buildworld is depreciated and disabled! ====="
-	@echo "Read: http://www.freebsd.org/~peter/elfday.html for information."
-	@echo "You need to complete a 'make aout-to-elf' to bring your system"
-	@echo "up to date with ELF tools.  This requires a fair amount of disk"
-	@echo "space to complete.  Alternatively, you can do a binary upgrade"
-	@echo "using the 3.0-RELEASE binaries from CD or ftp.freebsd.org in"
-	@echo "/pub/FreeBSD/3.0-RELEASE/bin/ to convert your userland to ELF."
-	@exit 1
-.endif
 
 
 .for __target in clean cleandepend cleandir depend obj

Makefile.upgrade

@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.upgrade,v 1.8 1999/01/07 06:30:14 peter Exp $
+#	$Id: Makefile.upgrade,v 1.5 1998/09/09 06:02:31 jb Exp $
 #
 # This makefile contains rules for preforming upgrades that are outside
 # the scope of the normal build world process.
@@ -15,8 +15,7 @@ MAKEOBJDIRPREFIX?=/usr/obj
 # The installed operating system release gives us the hint as to whether
 # we need to build a kernel too.
 #
-INSTALLEDVERSION!=sh ${.CURDIR}/tools/tools/upgrade/getosreldate.sh
-INSTALLEDNAME!=uname -r
+INSTALLEDVERSION!=uname -r
 
 #
 # Upgrade the installed make to the current version using the installed
@@ -67,7 +66,7 @@ ${MAKEOBJDIRPREFIX}/do_aout_buildworld :
 	@echo " Doing an aout buildworld to get an up-to-date set of tools"
 	@echo "--------------------------------------------------------------"
 	@cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/aout \
-		OBJFORMAT=aout REALLY_WANT_DEPRECIATED_AOUT=yes \
+		OBJFORMAT=aout \
 		make -f Makefile.inc1 -m ${.CURDIR}/share/mk buildworld
 	@touch ${MAKEOBJDIRPREFIX}/do_aout_buildworld
 
@@ -166,7 +165,7 @@ ${MAKEOBJDIRPREFIX}/do_aout_installworld :
 	@echo "--------------------------------------------------------------"
 	@/bin/sh -c "read -p \"Return to continue or Ctrl-C to abort: \" _e"
 .endif
-.if	${INSTALLEDVERSION} < 300003
+.if	${INSTALLEDVERSION} != "3.0-BETA"
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo " Saving a copy of programs required to shut the system down"
@@ -192,10 +191,10 @@ ${MAKEOBJDIRPREFIX}/do_aout_installworld :
 # directory as an obscure name just in case a reboot is required?
 #
 ${MAKEOBJDIRPREFIX}/do_aout_kernel :
-.if	${INSTALLEDVERSION} >= 300003
+.if	${INSTALLEDVERSION} == "3.0-BETA"
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo " You are already running 3.0, so a kernel build"
+	@echo " You are already running 3.0-BETA, so a kernel build"
 	@echo " is probably not required."
 	@echo "--------------------------------------------------------------"
 .else
@@ -205,18 +204,12 @@ ${MAKEOBJDIRPREFIX}/do_aout_kernel :
 	@echo "--------------------------------------------------------------"
 .if	exists(${.CURDIR}/sys/compile/GENERICupgrade)
 	@rm -rf ${.CURDIR}/sys/compile/GENERICupgrade
-.endif
-.if	!exists(${.CURDIR}/sys/${MACHINE}/conf/GENERICupgrade)
-	-cp ${.CURDIR}/sys/${MACHINE}/conf/GENERIC \
-		${.CURDIR}/sys/${MACHINE}/conf/GENERICupgrade
 .endif
 	@cd ${.CURDIR}/sys/${MACHINE}/conf; config GENERICupgrade
 	@-cd ${.CURDIR}/sys/compile/GENERICupgrade; \
-		OBJFORMAT=aout make KERNFORMAT=aout depend && \
-		OBJFORMAT=aout make KERNFORMAT=aout all
+		OBJFORMAT=aout make depend && make all
 	@cd ${.CURDIR}/sys/compile/GENERICupgrade; \
-		OBJFORMAT=aout make KERNFORMAT=aout depend && \
-		OBJFORMAT=aout make KERNFORMAT=aout all
+		OBJFORMAT=aout make depend && make all
 .endif
 	@touch ${MAKEOBJDIRPREFIX}/do_aout_kernel
 
@@ -265,7 +258,7 @@ ${MAKEOBJDIRPREFIX}/do_set_objformat	:
 # and reboot.
 #
 ${MAKEOBJDIRPREFIX}/do_install_kernel_reboot	:
-.if	${INSTALLEDVERSION} >= 300003
+.if	${INSTALLEDVERSION} == "3.0-BETA"
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo " Your system has been updated to run elf by default!"
@@ -279,7 +272,7 @@ ${MAKEOBJDIRPREFIX}/do_install_kernel_reboot	:
 	@echo "--------------------------------------------------------------"
 	@echo " Your system has been updated to run elf by default!"
 	@echo
-	@echo " Since you are running ${INSTALLEDNAME}, the kernel must"
+	@echo " Since you are running ${INSTALLEDVERSION}, the kernel must"
 	@echo " be installed before the system is rebooted. You can type"
 	@echo " Ctrl-C to abort the kernel installation (at your own risk),"
 	@echo " or press return for the kernel to be installed and the"

README

@@ -1,5 +1,5 @@
 This is the top level of the FreeBSD source directory.  This file
-was last revised on: $Id: README,v 1.13 1998/09/13 09:38:34 markm Exp $
+was last revised on: $Id: README,v 1.12 1998/06/30 08:08:05 jkh Exp $
 
 For copyright information, please see the file COPYRIGHT in this
 directory (additional copyright information also exists for some
@@ -51,6 +51,8 @@ lib		System libraries.
 
 libexec		System daemons.
 
+lkm		Loadable Kernel Modules.
+
 release		Release building Makefile & associated tools.
 
 sbin		System commands.

UPDATING

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

bin/Makefile.inc

@@ -1,8 +1,7 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile.inc,v 1.9 1997/02/22 14:01:23 peter Exp $
+#	$Id$
 
 BINDIR?=	/bin
-CFLAGS+=	-Wall -Wformat
 NOSHARED?=	YES
 
 .if exists (${.CURDIR}/../../secure)

bin/chio/chio.1

@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: chio.1,v 1.7 1998/09/15 07:48:51 gibbs Exp $
+.\"	$Id: chio.1,v 1.6 1998/06/04 21:05:19 steve Exp $
 .\"
 .Dd May 14, 1998
 .Dt CHIO 1
@@ -185,7 +185,7 @@ If the
 flag is specified, the volume tag of the specified element is
 cleared.  If the
 .Fl f
-flag is specified, the volume tag is superseded with the specified
+flag is specified, the volume tag is superceded with the specified
 volume tag even if a volume tag is already defined for the element.
 It is an error to not specify the
 .Fl f

bin/chio/chio.c

@@ -389,7 +389,7 @@ do_params(char *cname, int argc, char **argv)
 	++argv; --argc;
 
 	if (argc) {
-		warnx("%s: no arguments expected", cname);
+		warnx("%s: no arguements expected", cname);
 		goto usage;
 	}
 
@@ -520,7 +520,7 @@ do_status(char *cname, int argc, char **argv)
 			pvoltag = avoltag = source = sense = scsi = intaddr = 1;
 			break;
 		default:
-			warnx("%s: bad option", cname);
+			warnx("bad option", cname);
 			goto usage;
 		}
 	}
@@ -741,7 +741,7 @@ do_voltag(char *cname, int argc, char **argv)
 			alternate = 1;
 			break;
 		default:
-			warnx("%s: bad option", cname);
+			warnx("bad option", cname);
 			goto usage;
 		}
 	}
@@ -750,7 +750,7 @@ do_voltag(char *cname, int argc, char **argv)
 	argv += optind;
 
 	if (argc < 2) {
-		warnx("%s: missing element specification", cname);
+		warnx("missing element specification", cname);
 		goto usage;
 	}
 
@@ -759,7 +759,7 @@ do_voltag(char *cname, int argc, char **argv)
 
 	if (!clear) {
 		if (argc < 3 || argc > 4) {
-			warnx("%s: missing argument", cname);
+			warnx("missing argument", cname);
 			goto usage;
 		}
 
@@ -769,7 +769,7 @@ do_voltag(char *cname, int argc, char **argv)
 			csvr.csvr_flags = CSVR_MODE_SET;
 
 		if (strlen(argv[2]) > sizeof(csvr.csvr_voltag.cv_volid)) {
-			warnx("%s: volume label too long", cname);
+			warnx("volume label too long", cname);
 			goto usage;
 		}
 
@@ -781,7 +781,7 @@ do_voltag(char *cname, int argc, char **argv)
 		}
 	} else {
 		if (argc != 2) {
-			warnx("%s: unexpected argument", cname);
+			warnx("unexpected argument", cname);
 			goto usage;
 		}
 		csvr.csvr_flags = CSVR_MODE_CLEAR;

bin/chmod/chmod.c

@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: chmod.c,v 1.11 1998/05/13 07:22:11 charnier Exp $";
+	"$Id: chmod.c,v 1.10 1998/05/06 06:50:08 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -195,7 +195,6 @@ done:	argv += optind;
 	}
 	if (errno)
 		err(1, "fts_read");
-	free(set);
 	exit(rval);
 }
 

bin/cp/Makefile

@@ -1,8 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.4 1997/02/22 14:01:32 peter Exp $
+#	$Id$
 
 PROG=	cp
 SRCS=	cp.c utils.c
-CFLAGS+=	 -DVM_AND_BUFFER_CACHE_SYNCHRONIZED
 
 .include <bsd.prog.mk>

bin/cp/utils.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: utils.c,v 1.20 1998/06/10 06:29:23 peter Exp $";
+	"$Id: utils.c,v 1.19 1998/06/09 03:38:26 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -124,7 +124,7 @@ copy_file(entp, dne)
 	 * wins some CPU back.
 	 */
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
-	if (S_ISREG(fs->st_mode) && fs->st_size <= 8 * 1048576) {
+	if (fs->st_size <= 8 * 1048576) {
 		if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
 		    MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
 			warn("%s", entp->fts_path);

bin/csh/dir.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dir.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: dir.c,v 1.8 1998/06/09 03:38:37 imp Exp $";
+	"$Id: dir.c,v 1.7 1997/08/07 21:42:05 steve Exp $";
 #endif
 #endif /* not lint */
 
@@ -85,7 +85,7 @@ dinit(hp)
     static char *emsg = "csh: Trying to start from \"%s\"\n";
 
     /* Don't believe the login shell home, because it may be a symlink */
-    tcp = getcwd(path, MAXPATHLEN);	/* see ngetwd.c for System V version */
+    tcp = getwd(path);		/* see ngetwd.c for System V version */
     if (tcp == NULL || *tcp == '\0') {
 	(void) fprintf(csherr, "csh: %s: %s\n", path, strerror(errno));
 	if (hp && *hp) {

bin/date/Makefile

@@ -1,8 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.6 1997/08/09 22:34:01 brian Exp $
+#	$Id: Makefile,v 1.5 1997/08/04 03:37:05 brian Exp $
 
 PROG=	date
 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.25 1998/05/13 07:56:44 phk Exp $
+.\"	$Id: date.1,v 1.24 1998/05/06 06:51:13 charnier Exp $
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -183,7 +183,7 @@ and years are handled automatically.
 .Sh EXAMPLES
 The command:
 .Bd -literal -offset indent
-date "+DATE: %Y-%m-%d%nTIME: %H:%M:%S"
+date "+DATE: 19%y-%m-%d%nTIME: %H:%M:%S"
 .Ed
 .Pp
 will display:

bin/dd/dd.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\"	$Id: dd.1,v 1.7 1998/05/06 06:51:35 charnier Exp $
+.\"	$Id: dd.1,v 1.6 1997/10/11 20:09:04 joerg Exp $
 .\"
 .Dd January 13, 1994
 .Dt DD 1
@@ -59,9 +59,7 @@ and truncated input records to the standard error output.
 The following operands are available:
 .Bl -tag -width of=file
 .It Cm bs= Ns Ar n
-Set both input and output block size to
-.Va n
-bytes, superseding the
+Set both input and output block size, superseding the
 .Cm ibs
 and
 .Cm obs
@@ -109,13 +107,13 @@ Any regular output file is truncated unless the
 conversion value is specified.
 If an initial portion of the output file is skipped (see the
 .Cm seek
-operand),
+operand)
 the output file is truncated at that point.
 .It Cm seek= Ns Ar n
 Seek
 .Va n
 blocks from the beginning of the output before copying.
-On non-tape devices, an
+On non-tape devices, a
 .Xr lseek 2
 operation is used.
 Otherwise, existing blocks are read and the data discarded.
@@ -131,7 +129,7 @@ bytes.
 Skip
 .Va n
 blocks from the beginning of the input before copying.
-On input which supports seeks, an
+On input which supports seeks, a
 .Xr lseek 2
 operation is used.
 Otherwise, input data is read and discarded.
@@ -332,7 +330,7 @@ will exit.
 .Pp
 The
 .Nm
-utility exits 0 on success or >0 if an error occurred.
+utility exits 0 on success and >0 if an error occurred.
 .Sh SEE ALSO
 .Xr cp 1 ,
 .Xr mt 1 ,

bin/dd/misc.c

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

bin/df/df.c

@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)df.c	8.9 (Berkeley) 5/8/95";
 #else
 static const char rcsid[] =
-	"$Id: df.c,v 1.19 1997/10/13 09:36:05 joerg Exp $";
+	"$Id: df.c,v 1.18 1997/10/12 13:55:43 joerg Exp $";
 #endif
 #endif /* not lint */
 
@@ -85,7 +85,7 @@ main(argc, argv)
 	struct statfs statfsbuf, *mntbuf;
 	long mntsize;
 	int ch, err, i, maxwidth, rv, width;
-	char *mntpt, *mntpath, **vfslist;
+	char *mntpt, **vfslist;
 
 	vfslist = NULL;
 	while ((ch = getopt(argc, argv, "iknt:")) != -1)
@@ -148,25 +148,17 @@ main(argc, argv)
 			continue;
 		} else if ((stbuf.st_mode & S_IFMT) == S_IFBLK) {
 			if ((mntpt = getmntpt(*argv)) == 0) {
+				mntpt = mktemp(strdup("/tmp/df.XXXXXX"));
 				mdev.fspec = *argv;
-				mntpath = strdup("/tmp/df.XXXXXX");
-				if (mntpath == NULL) {
-					warn("strdup failed");
+				if (mkdir(mntpt, DEFFILEMODE) != 0) {
+					warn("%s", mntpt);
 					rv = 1;
 					continue;
 				}
-				mntpt = mkdtemp(mntpath);
-				if (mntpt == NULL) {
-					warn("mkdtemp(\"%s\") failed", mntpath);
-					rv = 1;
-					free(mntpath);
-					continue;
-				}
 				if (mount("ufs", mntpt, MNT_RDONLY,
 				    &mdev) != 0) {
 					rv = ufs_df(*argv, maxwidth) || rv;
 					(void)rmdir(mntpt);
-					free(mntpath);
 					continue;
 				} else if (statfs(mntpt, &statfsbuf) == 0) {
 					statfsbuf.f_mntonname[0] = '\0';
@@ -177,7 +169,6 @@ main(argc, argv)
 				}
 				(void)unmount(mntpt, 0);
 				(void)rmdir(mntpt);
-				free(mntpath);
 				continue;
 			}
 		} else

bin/expr/expr.1

@@ -28,7 +28,7 @@
 .\" (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: expr.1,v 1.7 1998/05/13 07:43:56 charnier Exp $
+.\"	$Id: expr.1,v 1.6 1997/02/22 14:03:37 peter Exp $
 .\"
 .Dd July 3, 1993
 .Dt EXPR 1
@@ -125,9 +125,6 @@ the expression is an empty string or 0.
 .It 2
 the expression is invalid.
 .El
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr test 1
 .Sh STANDARDS
 The
 .Nm

bin/ls/ls.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\"	$Id: ls.1,v 1.25 1998/10/04 00:41:08 jkh Exp $
+.\"	$Id: ls.1,v 1.24 1998/07/29 00:46:08 hoek Exp $
 .\"
 .Dd July 29, 1994
 .Dt LS 1
@@ -378,7 +378,7 @@ If this variable is set, it is considered to be a
 colon-delimited list of minimum column widths.  Unreasonable
 and insufficient widths are ignored (thus zero signifies
 a dynamically sized column).  Not all
-columns have changeable widths.  The fields are,
+columns have changable widths.  The fields are,
 in order: inode, block count, number of links, user name,
 group name, flags, file size, file name.
 .El

bin/mkdir/mkdir.c

@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)mkdir.c	8.2 (Berkeley) 1/25/94";
 #endif
 static const char rcsid[] =
-	"$Id: mkdir.c,v 1.15 1998/10/23 06:28:40 msmith Exp $";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -63,7 +63,7 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	int ch, exitval, success, omode, pflag;
+	int ch, exitval, omode, pflag;
 	mode_t *set = (mode_t *)NULL;
 	char *mode;
 
@@ -93,28 +93,15 @@ main(argc, argv)
 		if ((set = setmode(mode)) == NULL)
 			errx(1, "invalid file mode: %s", mode);
 		omode = getmode(set, S_IRWXU | S_IRWXG | S_IRWXO);
-		free(set);
 	}
 
 	for (exitval = 0; *argv != NULL; ++argv) {
-		success = 1;
 		if (pflag) {
 			if (build(*argv, omode))
-				success = 0;
-		} else if (mkdir(*argv, omode) < 0) {
-			warn("%s", *argv);
-			success = 0;
+				exitval = 1;
+			continue;
 		}
-		if (!success)
-			exitval = 1;
-		/*
-		 * The mkdir() and umask() calls both honor only the low
-		 * nine bits, so if you try to set a mode including the
-		 * sticky, setuid, setgid bits you lose them.  Don't do
-		 * this unless the user has specifically requested a mode,
-		 * as chmod will (obviously) ignore the umask.
-		 */
-		if (success && mode != NULL && chmod(*argv, omode) == -1) {
+		if (mkdir(*argv, omode) < 0) {
 			warn("%s", *argv);
 			exitval = 1;
 		}
@@ -183,8 +170,7 @@ build(path, omode)
 			retval = 1;
 			break;
 		}
-		if (!last)
-		    *p = '/';
+		*p = '/';
 	}
 	if (!first && !last)
 		(void)umask(oumask);

bin/pax/pat_rep.c

@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)pat_rep.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id: pat_rep.c,v 1.13 1998/12/05 10:29:10 obrien Exp $";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -1002,7 +1002,7 @@ rep_name(name, nlen, prnt)
 #			ifdef NET2_REGEX
 			inpt = pt->rcmp->endp[0];
 #			else
-			inpt += pm[0].rm_eo - pm[0].rm_so;
+			inpt += pm[0].rm_eo;
 #			endif
 
 			if ((outpt == endpt) || (*inpt == '\0'))

bin/pax/tar.c

@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id: tar.c,v 1.10 1998/05/15 06:27:47 charnier Exp $";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -977,7 +977,7 @@ ustar_wr(arcn)
 	 * check the length of the linkname
 	 */
 	if (((arcn->type == PAX_SLK) || (arcn->type == PAX_HLK) ||
-	    (arcn->type == PAX_HRG)) && (arcn->ln_nlen >= sizeof(hd->linkname))){
+	    (arcn->type == PAX_HRG)) && (arcn->ln_nlen > sizeof(hd->linkname))){
 		pax_warn(1, "Link name too long for ustar %s", arcn->ln_name);
 		return(1);
 	}
@@ -1156,16 +1156,17 @@ name_split(name, len)
 	 */
 	if (len <= TNMSZ)
 		return(name);
-	if (len > (TPFSZ + TNMSZ))
+	if (len > (TPFSZ + TNMSZ + 1))
 		return(NULL);
 
 	/*
 	 * we start looking at the biggest sized piece that fits in the name
 	 * field. We walk foward looking for a slash to split at. The idea is
 	 * to find the biggest piece to fit in the name field (or the smallest
-	 * prefix we can find)
+	 * prefix we can find) (the -1 is correct the biggest piece would
+	 * include the slash between the two parts that gets thrown away)
 	 */
-	start = name + len - TNMSZ;
+	start = name + len - TNMSZ - 1;
 	while ((*start != '\0') && (*start != '/'))
 		++start;
 
@@ -1183,7 +1184,7 @@ name_split(name, len)
 	 * the file would then expand on extract to //str. The len == 0 below
 	 * makes this special case follow the spec to the letter.
 	 */
-	if ((len >= TPFSZ) || (len == 0))
+	if ((len > TPFSZ) || (len == 0))
 		return(NULL);
 
 	/*

bin/ps/fmt.c

@@ -36,13 +36,13 @@
 static char sccsid[] = "@(#)fmt.c	8.4 (Berkeley) 4/15/94";
 #endif
 static const char rcsid[] =
-	"$Id: fmt.c,v 1.12 1998/06/17 11:33:10 jkoshy Exp $";
+	"$Id: fmt.c,v 1.11 1998/05/15 06:29:15 charnier Exp $";
 #endif /* not lint */
 
-#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/syslimits.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

bin/ps/keyword.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-	"$Id: keyword.c,v 1.21 1998/12/19 02:55:32 julian Exp $";
+	"$Id: keyword.c,v 1.19 1998/05/25 05:07:17 steve Exp $";
 #endif
 #endif /* not lint */
 
@@ -157,17 +157,10 @@ VAR var[] = {
 	{"ruser", "RUSER", NULL, LJUST|DSIZ, runame, s_runame, USERLEN},
 	{"sess", "SESS", NULL, 0, evar, NULL, 6, EOFF(e_sess), KPTR, "lx"},
 	{"sig", "PENDING", NULL, 0, pvar, NULL, 8, POFF(p_siglist), INT, "x"},
-#ifndef COMPAT_LINUX_THREADS
 	{"sigcatch", "CAUGHT",
 		NULL, 0, pvar, NULL, 8, POFF(p_sigcatch), UINT, "x"},
 	{"sigignore", "IGNORED",
 		NULL, 0, pvar, NULL, 8, POFF(p_sigignore), UINT, "x"},
-#else
-	{"sigcatch", "CAUGHT",
-		NULL, 0, evar, NULL, 8, EOFF(e_procsig.ps_sigcatch), UINT, "x"},
-	{"sigignore", "IGNORED",
-		NULL, 0, evar, NULL, 8, EOFF(e_procsig.ps_sigignore), UINT, "x"},
-#endif /* COMPAT_LINUX_THREADS */
 	{"sigmask", "BLOCKED",
 		NULL, 0, pvar, NULL, 8, POFF(p_sigmask), UINT, "x"},
 	{"sl", "SL", NULL, 0, pvar, NULL, 3, POFF(p_slptime), UINT, "d"},

bin/ps/print.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-	"$Id: print.c,v 1.32 1998/09/14 08:32:20 dfr Exp $";
+	"$Id: print.c,v 1.31 1998/06/28 21:05:48 bde Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -503,8 +503,8 @@ getpcpu(k)
 	if (p->p_swtime == 0 || (p->p_flag & P_INMEM) == 0)
 		return (0.0);
 	if (rawcpu)
-		return (100.0 * fxtofl(p->p_pctcpu));
-	return (100.0 * fxtofl(p->p_pctcpu) /
+		return (10000.0 / sysconf(_SC_CLK_TCK) * fxtofl(p->p_pctcpu));
+	return (10000.0 / sysconf(_SC_CLK_TCK) * fxtofl(p->p_pctcpu) /
 		(1.0 - exp(p->p_swtime * log(fxtofl(ccpu)))));
 }
 

bin/pwd/pwd.c

@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)pwd.c	8.3 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: pwd.c,v 1.7 1998/05/15 06:30:58 charnier Exp $";
+	"$Id$";
 #endif /* not lint */
 
 #include <err.h>
@@ -82,7 +82,7 @@ main(argc, argv)
 		usage();
 
 	if ((p = getcwd(NULL, 0)) == NULL)
-		err(1, ".");
+		err(1, NULL);
 	(void)printf("%s\n", p);
 	exit(0);
 }

bin/rcp/Makefile

@@ -1,8 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.12 1998/10/09 06:31:45 markm Exp $
+#	$Id: Makefile,v 1.11 1998/08/06 21:35:04 markm Exp $
 
 PROG=	rcp
 SRCS=	rcp.c util.c
+CFLAGS+=-Wall
 
 .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
 SRCS+=	krcmd.c kcmd.c rcmd_util.c encrypt.c

bin/sh/bltin/bltin.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bltin.h	8.2 (Berkeley) 5/4/95
- *	$Id: bltin.h,v 1.8 1997/02/22 13:58:58 peter Exp $
+ *	$Id$
  */
 
 /*
@@ -60,17 +60,7 @@
 #define fputs outstr
 #define fflush flushout
 #define INITARGS(argv)
-#define warnx1(a, b, c) {				\
-	char buf[64];					\
-	(void)snprintf(buf, sizeof(buf), a);		\
-	error("%s", buf);				\
-}
-#define warnx2(a, b, c) {				\
-	char buf[64];					\
-	(void)snprintf(buf, sizeof(buf), a, b);		\
-	error("%s", buf);				\
-}
-#define warnx3(a, b, c) {				\
+#define warnx(a, b, c) {				\
 	char buf[64];					\
 	(void)snprintf(buf, sizeof(buf), a, b, c);	\
 	error("%s", buf);				\

bin/sh/miscbltin.c

@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)miscbltin.c	8.4 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: miscbltin.c,v 1.17 1998/08/25 09:33:34 cracauer Exp $";
+	"$Id: miscbltin.c,v 1.16 1998/08/24 10:20:36 cracauer Exp $";
 #endif /* not lint */
 
 /*
@@ -285,11 +285,10 @@ umaskcmd(argc, argv)
 		} else {
 			void *set;
 			if ((set = setmode (ap)) == 0)
-				error("Illegal number: %s", ap);
+					error("Illegal number: %s", ap);
 
 			mask = getmode (set, ~mask & 0777);
 			umask(~mask & 0777);
-			free(set);
 		}
 	}
 	return 0;

bin/sh/sh.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\"	$Id: sh.1,v 1.22 1998/12/02 23:20:11 billf Exp $
+.\"	$Id: sh.1,v 1.20 1998/05/18 06:44:17 charnier Exp $
 .\"
 .Dd May 5, 1995
 .Dt SH 1
@@ -1003,7 +1003,7 @@ have a shell function with the same name
 as a builtin command.)
 .It cd [ directory ]
 Switch to the specified directory (default $HOME).
-If an entry for CDPATH appears in the environment
+If the an entry for CDPATH appears in the environment
 of the cd command or the shell variable CDPATH is set
 and the directory name does not begin with a slash,
 then the directories listed in CDPATH will be
@@ -1306,9 +1306,6 @@ Hitting <return> while in command mode will pass the line to the shell.
 .Pp
 Similarly, the 'set -o emacs' command can be used to enable a subset of
 emacs-style commandline editing features.
-.Sh SEE ALSO
-.Xr expr 1 ,
-.Xr test 1
 .Sh HISTORY
 A
 .Nm

bin/test/test.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: test.1,v 1.7 1998/09/07 16:59:05 cracauer Exp $
+.\"	$Id: test.1,v 1.6 1998/05/18 06:51:56 charnier Exp $
 .\"
 .Dd May 31, 1993
 .Dt TEST 1
@@ -253,9 +253,6 @@ missing.
 .It >1
 An error occurred.
 .El
-.Sh SEE ALSO
-.Xr expr 1 ,
-.Xr sh 1
 .Sh STANDARDS
 The
 .Nm

contrib/amd/AUTHORS

@@ -30,8 +30,6 @@ files.
 January 27, 1998: support pid files in the amd.conf file.  Provide base name
 for hesiod zone files.  Always use /etc/amd.conf if exists.
 
-August 8, 1998: add detection support for NFS V.3 for NetBSD 1.3F.
-
 * Hannes Reinecke <[email protected]>
 
 Back in 1995, contributed code for linux.  A new parser for file system
@@ -91,9 +89,6 @@ options.  Minor type wrt "ro" option in libamu/mount_fs.c.  Added more
 fillers of mnttab options, for acdirmax, acdirmin, acregmax, acregmin, noac,
 grpid, nosuid, and actimo.
 
-August 15, 1998: fix memory leak in processing of /defaults, and avoid
-accessing uninitialized memory in osf1.
-
 * Roman Hodek <[email protected]>
 
 July 23, 1997: Got lots of patches from the Debian Linux folks, who fixed
@@ -176,9 +171,6 @@ January 12, 1998: minor bug in output of amd -H.
 January 13, 1998: use case insensitive comparisons for variables that need
 it (such as all hostname related ones, and more).
 
-July 20, 1998: don't leak memory in the private version of yp_all (when
-vendor yp_all is bad).
-
 * Fred Korz <[email protected]>
 
 January 30, 1998: minor typo fixed to tftp example in am-utils.texi.
@@ -194,24 +186,5 @@ allow startup script to redirect it.  Set a temporary secure umask(0022)
 before writing log file and restore it afterwards.
 
 * Matthew Crosby <[email protected]>
-
 April 20, 1998: allow arbitrary number of interfaces in wire listing.
 
-* David O'Brien <[email protected]>
-
-September 4, 1998: bug fix to avoid overrunning hostname buffer, and minor
-amd.conf man page typo correction.
-
-* Danny Rathjens <[email protected]>
-
-October 29, 1998: swap arguments to kill(2) in amd.c.
-
-* Mike Mitchell <[email protected]>
-
-November 3, 1998: amd/nfs_subr.c (nfsproc_lookup_2_svc): try to avoid a race
-condition between unmounting and re-mounting an entry, by increasing the ttl
-of a looked up entry before unmounting it.
-
-* Douglas K. Rand" <[email protected]>
-
-December 3, 1998: case insensitive host name match for nfsl.

contrib/amd/BUGS

@@ -71,22 +71,3 @@ that nfsd is running.  Normally these are not required.
 [4B] "Stefan Vogel" <[email protected]> reports that if your amq
 executable dump core unexpectedly, then it may be a bug in gcc 2.7.x.
 Upgrade to gcc 2.8.x or use IBM's xlC compiler.
-
-[C] Do not link amd with libnsl.  It is buggy and causes amd to core dump
-in strlen inside strdup inside svc_register().
-
-
-(5) *-linux-gnu (RedHat Linux 5.1)
-
-There's a UDP file descriptor leak in libnsl in RedHat Linux 5.1.  This
-library part of glibc2.  Am-utils currently declares redhat 5.1 systems as
-having a "broken yp_all" and using an internal, slower, leak-free version.
-The leak is known to the glibc maintainers and a fix from them is due soon,
-but it is not yet in the glibc-2.0.7-19 RPM.
-
-
-(6) rs6000-ibm-aix4.1.x
-
-A bug in libc results in an amq binary that doesn't work; amq -v dumps core
-in xdr_string.  There is no known fix (source code or vendor patch) at this
-time.  (Please let amd-dev know if you know of a fix.)

contrib/amd/ChangeLog

@@ -1,315 +1,3 @@
-1999-01-01  Erez Zadok  <[email protected]>
-
-	*******************************************************************
-	*** Released am-utils-6.0					***
-	*******************************************************************
-
-1998-12-28  Erez Zadok  <[email protected]>
-
-	* conf/nfs_prot/nfs_prot_sunos5_7.h: support ldap in solaris 2.7.
-
-1998-12-27  Erez Zadok  <[email protected]>
-
-	* conf/nfs_prot/nfs_prot_bsdi3.h: don't use reserved ports on
-	bsdi4 for NFS V3/nfs mounts.
-
-1998-12-26  Erez Zadok  <[email protected]>
-
-	* using latest libtool (1.2e + patches), now supporting shared
-	libraries on many more systems.  Also using latest autoconf and
-	automake (unreleased GNU CVS'd versions.)
-
-	* minor new ports: hppa2.0w-hp-hpux11.00,
-	i386-unknown-netbsd1.3.3, mips-sgi-irix6.5.
-
-	* fsinfo/fsinfo.h (yywrap): define it for systems (osf4) that
-	have /usr/bin/flex but not libfl.
-
-1998-12-24  Erez Zadok  <[email protected]>
-
-	* lots of code cleanup, to make sure libamu.so does not use
-	undefined symbols.  Some system's shared libraries cannot handle
-	that.
-
-1998-12-23  Erez Zadok  <[email protected]>
-
-	* include/am_defs.h: only defined seteuid extern if function also
-	exists and is not superceded by setresuid (hpux).
-
-	* amd/ops_autofs.c (autofs_bgmount, autofs_lookuppn): put explicit
-	braces to avoid confusion with nested if-then-else clauses.
-
-	* aux/config.{sub,status}, aux/{ltmain.sh,ltconfig,mkinstalldirs:
-	updated from latest versions.
-
-1998-12-22  Erez Zadok  <[email protected]>
-
-	* minor new port: i386-pc-bsdi4.0
-
-	* conf/nfs_prot/nfs_prot_bsdi3.h: add missing hesiod header
-	definitions for bsdi4.
-
-	* {amd,fsinfo}/Makefile.am: force path to .y/.l files, because
-	some make programs (bsdi4) do not support VPATH correctly.
-
-1998-12-16  Erez Zadok  <[email protected]>
-
-	* conf/mount/mount_aix.c: minor code cleanup
-
-	* aux/configure.in: check for extern definition to xdr_groups.
-
-1998-12-15  Erez Zadok  <[email protected]>
-
-	* minor new port: powerpc-ibm-aix4.3.1.0
-
-	* aux/macros/*.m4: updates for aix 4.3
-
-1998-12-14  Erez Zadok  <[email protected]>
-
-	* minor new port: i386-unknown-openbsd2.4
-
-	* aux/configure.in: don't check for xfs on openbsd because
-	openbsd-2.4 introduces a new file system named xfs, but different
-	than Irix's XFS.  Sigh.
-
-	* minor new port: i386-unknown-freebsd2.2.8
-
-1998-12-03  Erez Zadok  <[email protected]>
-
-	* amd/amfs_nfsl.c (amfs_nfsl_ffserver): use case insensitive host
-	name match.  Bug fix from Douglas K. Rand" <[email protected]>.
-
-1998-11-20  Erez Zadok  <[email protected]>
-
-	* scripts/ctl-amd.in: wait4amd2die runs in the stop action, to
-	avoid race conditions when shutting down systems running amd.
-
-	* Makefile.am: add a dist-hook to change modes of the directories
-	in the tar file so they are not world writable.
-
-	* conf/nfs_prot/nfs_prot_freebsd3.h: turned on NFSv3 support,
-	since it is now finally defined in the header files and
-	(hopefully) stable.
-
-	* amd/srvr_nfs.c (find_nfs_srvr): allow overriding if nfsv2 option
-	is specified in mount options.  freebsd patches from David
-	O'Brien.
-
-	* amq/amq.c (main), fixmount/fixmount.c (main), hlfsd/hlfsd.c
-	(main), fsinfo/fsinfo.c (fsi_get_args), hlfsd/hlfsd.c (main),
-	amd/get_args.c (get_args): posix: use -1 to check for return from
-	getopt() (not EOF), as per posix.
-
-	* amd/amq_subr.c (xdr_amq_mount_tree_node): patches from "David
-	O'Brien" <[email protected]>, from the FreeBSD source tree.  Use
-	real variable whose pointer is on the stack for decoding a long
-	int.
-
-1998-11-11  Erez Zadok  <[email protected]>
-
-	* scripts/ctl-{amd,hlfsd}.in: include comments useful for redhat's
-	chkconfig utility.
-
-1998-11-10  Erez Zadok  <[email protected]>
-
-	* released snapshot am-utils-6.0b2s3
-
-	* conf/transp/transp_sockets.c (create_nfs_service): remove C++
-	style comments.
-
-1998-11-04  Erez Zadok  <[email protected]>
-
-	* released snapshot am-utils-6.0b2s2
-
-	* created CVS package
-
-	* amd/nfs_subr.c (nfsproc_lookup_2_svc): try to avoid a race
-	condition between unmounting and re-mounting an entry, by
-	increasing the ttl of a looked up entry before unmounting it.
-	Patch from Mike Mitchell <[email protected]>.
-
-	* All files: spell comments and strings.
-
-1998-11-03  Erez Zadok  <[email protected]>
-
-	* aux/configure.in: look for yp_all in libnsl only if yp_all not
-	already found elsewhere (in libc or other default libraries).
-	This is so RedHat 5.1 systems could find yp functions in libnsl,
-	but also so AIX 4.2.1 will NOT include libnsl, because the latter
-	has broken nis functionality that also exists and works ok in libc.
-
-1998-10-29  Erez Zadok  <[email protected]>
-
-	* amd/amd.c (main): bug fix: swapped arguments to kill(2).  Fix
-	from Danny Rathjens <[email protected]>.
-
-1998-10-28  Erez Zadok  <[email protected]>
-
-	* released snapshot am-utils-6.0b2s1
-
-1998-10-27  Erez Zadok  <[email protected]>
-
-	* aux/macros/*.m4: support bsdi4 as bsdi3.
-
-	* aux/macros/os_ldflags.m4: enable detection of LDAP on solaris
-	2.7 (libraries located in /usr/lib/fn).  This is off until Sun
-	includes LDAP header information.
-
-1998-10-20  Erez Zadok  <[email protected]>
-
-	*******************************************************************
-	*** Released am-utils-6.0b1					***
-	*******************************************************************
-
-1998-10-18  Erez Zadok  <[email protected]>
-
-	* mk-amd-map/mk-amd-map.c (main): use perror not strerror.
-	(main): set return type to int if no ndbm maps.
-
-	* include/am_defs.h: avoid conflicts with <sys/mount.h> in 2.1
-	kernels.
-
-1998-10-18  Erez Zadok  <[email protected]>
-
-	* A.i386-unknown-netbsd1.3.2/amu_nfs_prot.h: trim down and cleanup
-	for netbsd 1.3.2.
-
-1998-10-17  Erez Zadok  <[email protected]>
-
-	* aux/configure.in: check for yp_all in libnsl, b/c redhat 5.1
-	systems put NIS functions there.
-
-	* mk-amd-map/mk-amd-map.c: patch from "David O'Brien"
-	<[email protected]> merged in.  Use POSIX -1 return code from
-	getopt(), not EOF.  Use .db extentions for systems that use it,
-	instead of .{pag,dir}.
-
-1998-10-15  Erez Zadok  <[email protected]>
-
-	* wire-test/wire-test.c, hlfsd/hlfsd.c, fixmount/fixmount.c,
-	amd/amd.c (main): avoid overrunning hostname buffer.  Bug fix from
-	"David O'Brien" <[email protected]>.
-
-	* scripts/amd.conf.5: minor typo reported by "David O'Brien"
-	<[email protected]> in .TH section of man page.
-
-	* amd/info_nis.c (am_yp_all): don't leak key-val entries.  Patch
-	from Thomas Richter <[email protected]>.
-
-1998-10-12  Erez Zadok  <[email protected]>
-
-	* doc/am-utils.texi (Program Filesystem): minor typo fixed as per
-	Andreas Stolcke <[email protected]>.
-
-	* minor new ports: sparc64-unknown-linux-gnu, i386-pc-solaris2.7,
-	and sparc-sun-solaris2.7.
-
-	* conf/mount/mount_freebsd3.c (mount_freebsd3): freebsd 3.0 is now
-	a 4.4lite kernel, and somethings were removed, such as
-	INITMOUNTNAMES.
-
-	* amd/ops_autofs.c (autofs_lookuppn): don't leak memory while
-	processing /defaults.  Free temporary opts.  Patch from
-	[email protected] (Daniel S. Riley)
-
-	* amd/amfs_auto.c (amfs_auto_lookuppn): don't leak memory while
-	processing /defaults.  Free temporary opts.  Patch from
-	[email protected] (Daniel S. Riley)
-
-	* conf/mtab/mtab_osf.c (read_mtab): patch from
-	 [email protected] (Daniel S. Riley) not to access
-	 uninitialized memory on Digital Unix.
-
-1998-10-09  Erez Zadok  <[email protected]>
-
-	* aux/macros/{check_mtype_type,check_mtype_printf_type}.m4: most
-	systems now use "char *" as their mount type.
-
-1998-10-08  Erez Zadok  <[email protected]>
-
-	* amd/conf.c (gopt_map_type, ropt_map_type): check if map type
-	exists.
-
-	* amd/mapc.c (mapc_type_exists): function to test if a map of
-	certain type exists.
-
-1998-10-08  Erez Zadok  <[email protected]>
-
-	* aux/macros/{mount_headers,try_compile_anyfs,try_compile_nfs}.m4,
-	include/am_defs.h: Avoid a conflict in definitions of ntohl/htonl
-	in RH-5.1 sparc64 between <netinet/in.h> and
-	<linux/byteorder/generic.h> (2.1 kernels).
-
-1998-09-28  Erez Zadok  <[email protected]>
-
-	* aux/macros/func_bad_yp_all.m4 (ac_cv_func_yp_all_clean): RedHat
-	5.1 systems with glibc glibc-2.0.7-19 or below leak a UDP socket
-	from yp_all().
-
-1998-09-25  Erez Zadok  <[email protected]>
-
-	* conf/mount/mount_linux.c (parse_opts): check for pcfs support
-	only if autoconfigured.
-
-1998-09-18  Erez Zadok  <[email protected]>
-
-	* Makefile.am (EXTRA_DIST): distribute README.yk2 file.
-
-	* README.y2k: explain y2k compliance status of am-utils.
-
-1998-09-16  Erez Zadok  <[email protected]>
-
-	* amd/amfs_host.c (fetch_fhandle, amfs_host_fmount,
-	amfs_host_umounted): clnt_sperrno() may return a const.
-
-Sat Aug  8 23:28:32 1998  Erez Zadok  <[email protected]>
-
-	* aux/configure.in: check for <nfs/nfsmount.h>, as per Christos
-	Zoulas. Turned on checking for mount options: async, synchronous,
-	deadthresh, leasterm, nqnfs, and readahead.
-
-	* amd/info_nis.c: patch from [email protected] (Christos Zoulas)
-	to include prototype definition for nis_isup().
-
-Sun Jul 19 18:50:10 1998  Erez Zadok  <[email protected]>
-
-	* hlfsd/stubs.c (getcreds): force sscanf arg to u_long.
-
-Tue Jul 14 20:34:25 1998  Erez Zadok  <[email protected]>
-
-	* released snapshot am-utils-6.0a17s1
-
-Wed Jul  8 21:49:15 1998  Erez Zadok  <[email protected]>
-
-	* aux/macros/host_macros.m4: all x86 hosts should have $arch be
-	i386, not i[456]86.
-
-Tue Jul  7 18:55:09 1998  Erez Zadok  <[email protected]>
-
-	* aux/macros/{mount_headers,try_compile_anyfs,try_compile_nfs}.m4,
-	include/am_defs.h: include <linux/posix_types.h> before
-	<linux/fs.h> because on redhat 5.1, there is a bug (misuse) of
-	headers in <socketbits.h> (it defines _LINUX_TYPES_H instead of
-	__KERNEL_STRICT_NAMES).
-
-	* aux/configure.in: check for <linux/posix_types.h> because it is
-	need for RedHat 5.1.
-
-Wed Jun 17 00:05:33 1998  Erez Zadok  <[email protected]>
-
-	* scripts/Makefile.am (EXTRA_DIST): have fixrmtab generated from
-	.in as well, so it doesn't get removed by make clean.
-
-Tue Jun 16 22:00:15 1998  Erez Zadok  <[email protected]>
-
-	* aux/macros/{check_fs_mntent.m4, check_mnttab_type.m4,
-	check_mount_type.m4}: redhat 5.1 puts some modules in
-	/lib/modules/preferred/.
-
-Wed May 13 16:33:57 1998  Erez Zadok  <[email protected]>
-
-	* amd/ops_autofs.c (mount_autofs): cast pid to long.
-
 Thu Apr 23 00:22:17 1998  Erez Zadok  <[email protected]>
 
 	*******************************************************************

contrib/amd/FREEBSD-upgrade

@@ -1,6 +1,6 @@
 # ex:ts=8
 
-AMD (am-utils) 6.0b1
+AMD (am-utils) 6.0a16
 	originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils
 
 
@@ -14,7 +14,7 @@ For the import of AMD the following files were removed:
 	amq/
 	Makefile.am     Makefile.in
 
-	conf/checkmount/
+	checkmount/
 	checkmount_aix.c	checkmount_osf.c	checkmount_ultrix.c
 	checkmount_default.c	checkmount_svr4.c
 
@@ -31,8 +31,8 @@ For the import of AMD the following files were removed:
 	conf/mount/
 	mount_aix.c		mount_irix6.c		mount_stellix.c
 	mount_bsdi3.c		mount_isc3.c		mount_svr4.c
-	mount_hpux.c		mount_linux.c		mount_freebsd3.c
-	mount_irix5.c		mount_mach3.c		(was for pre-3.0-R)
+	mount_hpux.c		mount_linux.c
+	mount_irix5.c		mount_mach3.c
 
 	conf/mtab/
 	mtab_aix.c	mtab_isc3.c	mtab_osf.c	mtab_ultrix.c
@@ -61,8 +61,7 @@ For the import of AMD the following files were removed:
 	trap_aix3.h     trap_hpux.h     trap_linux.h    trap_stellix.h
 	trap_aux.h      trap_hpux11.h   trap_mach3.h    trap_svr4.h
 	trap_dgux.h     trap_irix.h     trap_news4.h    trap_ultrix.h
-	trap_hcx.h      trap_isc3.h     trap_rtu6.h	trap_freebsd3.h
-							(was for pre-3.0-R)
+	trap_hcx.h      trap_isc3.h     trap_rtu6.h
 
 	conf/umount/
 	umount_default.c	umount_osf.c
@@ -95,8 +94,8 @@ For the import of AMD the following files were removed:
 
 Imported by:
 
-	cvs import -ko -m 'Virgin import of AMD (am-utils) v6.0b1' \
-		src/contrib/amd COLUMBIA amd_6_0b1
+	cvs import -m 'Virgin import of AMD (am-utils) v6.0a16' \
+		src/contrib/amd COLUMBIA amd_6_0a16
 
 
 To make local changes to amd, simply patch and commit to the main
@@ -106,4 +105,4 @@ All local changes should be submitted to "[email protected]"
 for inclusion in the next vendor release.
 
 [email protected]
-14-November-1998
+23-August-1998

contrib/amd/INSTALL

@@ -3,73 +3,53 @@
 
 For each system, list if it autoconfigures, compiles, or runs.  Fill in
 email id of person who confirms the fact.  A missing entry means unverified.
-A 'no' or '!' means verified broken or nonexistent (static library).
+A 'no' means verified broken.
 
 SYSTEM				AUTOCONF  COMPILE    RUN      SHLIB
 =========================	========  =========  =======  =====
-alpha-dec-osf2.1		ezk       ezk        ezk     !ezk
-alpha-dec-osf4.0		ezk       ezk        dsr[3]   ezk
+alpha-dec-osf2.1		ezk       ezk        ezk
+alpha-dec-osf4.0		ezk       ezk        dsr[3]
 alphaev5-unknown-linux-gnu	ezk       ezk        finkel   ezk
 hppa1.0-hp-hpux11.00		ezk       ezk        ezk
-hppa1.1-hp-hpux10.10		ezk       ezk        ezk      ezk
-hppa1.1-hp-hpux10.20		ezk       ezk        ezk      ezk
-hppa1.1-hp-hpux9.01		ezk[4]    ezk[4]     nrh/ezk  ezk
-hppa1.1-hp-hpux9.05		ezk[4]    ezk[4]     nrh/ezk  ezk
-hppa1.1-hp-hpux9.07		ezk[4]    ezk[4]     nrh/ezk  ezk
-hppa2.0w-hp-hpux11.00		ezk       ezk        ezk      ezk
-i386-pc-bsdi2.1			ezk       ezk        ezk     !ezk
-i386-pc-bsdi3.0			ezk       ezk        ezk     !ezk
-i386-pc-bsdi3.1			ezk       ezk        ezk     !ezk
-i386-pc-bsdi4.0			ezk       ezk        ezk      ezk
+hppa1.1-hp-hpux10.10		ezk       ezk        ezk     -ezk (!rpcsvc.so)
+hppa1.1-hp-hpux10.20		ezk       ezk        ezk     -ezk (!rpcsvc.so)
+hppa1.1-hp-hpux9.01		ezk[4]    ezk[4]     nrh/ezk
+hppa1.1-hp-hpux9.05		ezk[4]    ezk[4]     nrh/ezk
+hppa1.1-hp-hpux9.07		ezk[4]    ezk[4]     nrh/ezk
+i386-pc-bsdi2.1			ezk       ezk        ezk
+i386-pc-bsdi3.0			ezk       ezk        ezk
+i386-pc-bsdi3.1			ezk       ezk        ezk
 i386-pc-solaris2.5.1		ezk       ezk        ezk      ezk
 i386-pc-solaris2.6		ezk       ezk        ezk      ezk
-i386-pc-solaris2.7		ezk       ezk        ezk      ezk
 i386-unknown-freebsd2.1.0	ezk       ezk        ezk
 i386-unknown-freebsd2.2.1	ezk       ezk        ezk      ezk
-i386-unknown-freebsd2.2.6	ezk       ezk        ezk      ezk
-i386-unknown-freebsd2.2.7	ezk       ezk        ezk      ezk
-i386-unknown-freebsd2.2.8	ezk       ezk        ezk      ezk
 i386-unknown-freebsd3.0		ezk       ezk        ezk      ezk
 i386-unknown-netbsd1.2.1	ezk       ezk        ezk      ezk
 i386-unknown-netbsd1.3		ezk       ezk        ezk      ezk
 i386-unknown-netbsd1.3.1	ezk       ezk        ezk      ezk
-i386-unknown-netbsd1.3.2	ezk       ezk        ezk      ezk
-i386-unknown-netbsd1.3.3	ezk       ezk        ezk      ezk
 i386-unknown-openbsd2.1		ezk       ezk        ezk      ezk
-i386-unknown-openbsd2.2		ezk       ezk        ezk      ezk
-i386-unknown-openbsd2.3		ezk       ezk        ezk      ezk
-i386-unknown-openbsd2.4		ezk       ezk        ezk      ezk
-i486-ncr-sysv4.3.03		ezk       ezk                 ezk
+i486-ncr-sysv4.3.03		ezk       ezk       
 i486-pc-linux-gnulibc1		ezk       ezk        ezk      ezk
-i486-pc-linux-gnuoldld		ezk       ezk        ezk      ezk
-i586-pc-linux-gnu		ezk       ezk        ezk      ezk
 i586-pc-linux-gnulibc1		ezk       ezk        ezk      ezk
 i686-pc-linux-gnu		ezk       ezk        ezk      ezk
-i686-pc-linux-gnulibc		ezk       ezk        ezk      ezk
-i686-pc-linux-gnulibc1		ezk       ezk        ezk      ezk
 m68k-hp-hpux9.00		ezk[4]    ezk[4]     nrh/ezk
-m68k-next-nextstep3		ezk       ezk        ezk     !ezk
-m68k-sun-sunos4.1.1		ezk       ezk                !ezk
+m68k-next-nextstep3		ezk       ezk        ezk
+m68k-sun-sunos4.1.1		ezk       ezk
 mips-dec-ultrix4.3		ro        ro         ro
 mips-sgi-irix5.2
-mips-sgi-irix5.3		ezk       ezk        ezk     ezk
-mips-sgi-irix6.2		ezk[1]    ezk[1]     ezk[1]  ezk
-mips-sgi-irix6.4		ezk       ezk        ezk     ezk
-mips-sgi-irix6.5		ezk       ezk                ezk
-powerpc-ibm-aix4.1.5.0		ezk       ezk        wpaul  !ezk
-powerpc-ibm-aix4.2.1.0		ezk       ezk        ezk    !ezk
-powerpc-ibm-aix4.3.1.0		ezk       ezk               !ezk
-powerpc-unknown-linux-gnu	jose      jose       jose
+mips-sgi-irix5.3		ezk       ezk        ezk
+mips-sgi-irix6.2		ezk[1]    ezk[1]     ezk[1]
+mips-sgi-irix6.4		ezk       ezk        ezk     ezk (!gcc)
+powerpc-ibm-aix4.1.5.0		ezk       ezk        wpaul
+powerpc-ibm-aix4.2.1.0		ezk       ezk        ezk
 rs6000-ibm-aix3.2		ezk       ezk        ezk
 rs6000-ibm-aix3.2.5		ezk       ezk        ezk
-rs6000-ibm-aix4.1.4.0		ezk       ezk               !ezk
-rs6000-ibm-aix4.1.5.0		ezk       ezk               !ezk
-sparc-sun-solaris2.3		ezk       ezk        ezk     ezk
+rs6000-ibm-aix4.1.4.0		ezk       ezk       
+sparc-sun-solaris2.3		ezk       ezk        ezk
 sparc-sun-solaris2.4		ezk       ezk        ezk     ezk
 sparc-sun-solaris2.5		ezk       ezk        ezk     ezk
 sparc-sun-solaris2.5.1		ezk       ezk        ezk     ezk
 sparc-sun-solaris2.6		ezk       ezk[2]     ezk     ezk
-sparc-sun-solaris2.7		ezk       ezk[2]     ezk     ezk
 sparc-sun-sunos4.1.1		ezk       ezk        ezk     ezk
 sparc-sun-sunos4.1.3		ezk       ezk        ezk     ezk
 sparc-sun-sunos4.1.3C		ezk       ezk        ezk     ezk
@@ -77,20 +57,17 @@ sparc-sun-sunos4.1.3_U1		ezk       ezk        ezk     ezk
 sparc-sun-sunos4.1.4		ezk       ezk        ezk     ezk
 sparc-unknown-linux-gnulibc1	ezk       ezk        ezk     ezk
 sparc-unknown-netbsd1.2E	ezk       ezk        ezk
-sparc-unknown-netbsd1.2G	ezk       ezk        ezk
-sparc64-unknown-linux-gnu	ezk	  ezk	     ezk     ezk
 
 EMAIL ID LEGEND:
 
 bking:	Bevis R W King <[email protected]>                
 dsr:	Dan Riley <[email protected]>
 ezk:	Erez Zadok <[email protected]>
-finkel:	Raphael Finkel <[email protected]>
-jose:	Jose Nazario <[email protected]>
 nrh:	Nick Hall <[email protected]>
-ro:	Rainer Orth <[email protected]>
 stolke:	Andreas Stolcke <[email protected]>
 wpaul:	Bill Paul <[email protected]>
+finkel:	Raphael Finkel <[email protected]>
+ro:	Rainer Orth <[email protected]>
 
 
 FOOTNOTES:

contrib/amd/LSM.am-utils

@@ -1,20 +0,0 @@
-Begin3
-Title:		am-utils
-Version:	6.0
-Entered-date:	01JAN99
-Description:	BSD Automounter Utilities
-		Replaces the old amd-upl102.  Offers NFS V3 support, many
-		new features, and numerous ports.  The home page for
-		am-utils is in http://www.cs.columbia.edu/~ezk/am-utils/
-Keywords:	amd amq hlfsd fsinfo wire-test fixmount mk-amd-map automount
-Author:		[email protected] (Erez Zadok)
-Maintained-by:	[email protected] (Erez Zadok)
-Primary-site:	shekel.mcl.cs.columbia.edu /pub/am-utils
-		1.6MB am-utils-6.0.tar.gz
-		1.6MB am-utils.tar.gz
-		1.6MB am-utils-snapshot.tar.gz
-Alternate-site:	http://www.cs.columbia.edu/~ezk/am-utils/mirrors.html
-Original-site:	ftp.cs.columbia.edu /pub/amd
-Platforms:	all modern Unix systems
-Copying-policy:	BSD
-End

contrib/amd/MIRRORS

@@ -11,15 +11,12 @@ U.S.A:
 	New York (Primary Site):
 		ftp://shekel.mcl.cs.columbia.edu/pub/am-utils
 		Maintainer: [email protected]
-	Minnesota:
+	Maryland:
 		ftp://ftp.cs.umn.edu/pub/AMD
 		Maintainer: [email protected]
 	Virginia (Newport News):
-		ftp://www.ferginc.com/pub/unix/am-utils
+*		ftp://www.ferginc.com/pub/unix/am-utils
 		Maintainer: [email protected]
-	Ohio (Kent State University):
-		ftp://info.mcs.kent.edu/pub/am-utils
-		Maintainer: [email protected]
 
 Europe:
 	Germany:
@@ -30,7 +27,7 @@ Europe:
 		Maintainer: [email protected]
 	Sweden:
 		ftp://ftp.matematik.su.se/pub/mirrors/shekel.mcl.cs.columbia.edu/pub/am-utils
-		Maintainer: le[email protected]
+		Maintainer: [email protected]
 	UK:
 		ftp://sunsite.org.uk/packages/am-utils
 		Maintainer: [email protected]

contrib/amd/NEWS

@@ -1,51 +1,3 @@
-*** Notes specific to am-utils version 6.0:
-
-- updated or minor new ports:
-	hppa2.0w-hp-hpux11.00,
-	i386-pc-bsdi4.0
-	i386-unknown-freebsd2.2.8
-	i386-unknown-netbsd1.3.3
-	i386-unknown-openbsd2.4
-	mips-sgi-irix6.5
-	powerpc-ibm-aix4.3.1.0
-	i386-unknown-freebsd3.0 now supports nfs v.3
-
-- ctl-amd and ctl-hlfsd now compatible with RedHat's chkconfig utility
-
-- ctl-amd stop will now wait until amd is down
-
-- libamu.so completely self contained --- does not export any symbols which
-  must be defined by the process linking with it.  This is so shared
-  libraries could be supported on systems that have restrictive shared
-  libraries.
-
-- use latest autoconf, automake, and libtool (off of cygnus' CVS server) to
-  support shared libraries on many more platforms.
-
-- posix code cleanups
-
-- bugs fixed:
-	case insensitive host match in type:=nfsl
-	correct swapped args to kill(2)
-	try to avoid a race condition b/t mounting and unmounting
-	yp_all support is found in libnsl in RH-5.1 systems
-
-*** Notes specific to am-utils version 6.0b1:
-
-- updated or minor new ports:
-	- *-pc-linux-gnu (glibc2 systems such as RedHat 5.1)
-	- sparc-sun-solaris2.7
-	- i386-pc-solaris2.7
-	- i386-unknown-freebsd3.0 (official release, post 4.4lite port)
-	- sparc64-unknown-linux-gnu (RH 5.1 on Sun Sparc Ultra)
-
-- bugs fixed:
-	- major memory leak in processing of /defaults
-	- core dump if map_type given in amd.conf doesn't exist
-	- memory leak in replacement yp_all
-	- don't access uninitialized memory in DU 4.0
-	- other smaller bugs, see ChangeLog
-
 *** Notes specific to am-utils version 6.0a16:
 
 - new ports:

contrib/amd/README

@@ -1,12 +1,12 @@
 # -*- text -*-
 
-This is the official version of am-utils.
+This is an alpha version of amd.  "Buyers" beware!!!
 
 See the file NEWS for news on this and previous releases.
 
-*** General Notes to alpha/beta testers:
+*** General Notes to alpha testers:
 
-[A] as alpha/beta testers, I expect you to be able to find certain things on
+[A] an an alpha testers, I expect you to be able to find certain things on
 your own (especially look at the sources to figure out how things work).
 
 [B] if you intend to modify any files, first find out if the file you want

contrib/amd/README.y2k

@@ -1,18 +0,0 @@
-# -*- text -*-
-		       AM-UTILS YEAR-2000 COMPLIANCE
-
-Most likely am-utils is y2k compliant.
-
-I do not know for sure because I have not certified am-utils myself, nor do
-I have the time for it.  I do not think that amd will be affected by y2k at
-all, because it does not do anything with dates other than print the date on
-the log file, in whatever format is provided by your os/libc --- especially
-the ctime(3) call.
-
-However, on Friday, September 18th 1998, Matthew Crosby <[email protected]>
-reported that they evaluated 6.0a16 and found it to be compliant.
-
-Erez Zadok.
-Maintainer, am-utils package and AMD-DEV list.
-Email: [email protected]
-WWW:   http://www.cs.columbia.edu/~ezk/am-utils/

contrib/amd/TODO

@@ -67,7 +67,7 @@ correct new prototype.
 
 use HAVE_SVC_GETREQSET instead of RPC_4.
 
-replace all "jsp" in *.[hc] $Id: TODO,v 1.1.1.1 1998/11/05 02:04:19 ezk Exp $ with ezk.
+replace all "jsp" in *.[hc] $Id$ with ezk.
 
 use MNTTAB_FILE_NAME instead of MOUNTED
 

contrib/amd/amd/am_ops.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: am_ops.c,v 1.2 1998/12/27 06:24:45 ezk Exp $
+ * $Id: am_ops.c,v 5.2.2.1 1992/02/09 15:08:17 jsp beta $
  *
  */
 
@@ -315,7 +315,7 @@ reverse_option(const char *opt)
  * Caller must eventually free the string being returned.
  */
 static char *
-merge_opts(const char *opts1, const char *opts2)
+merge_opts(char *opts1, char *opts2)
 {
   mntent_t mnt2;		/* place holder for opts2 */
   char *newstr;			/* new string to return (malloc'ed) */
@@ -327,7 +327,7 @@ merge_opts(const char *opts1, const char *opts2)
   char *s1 = strdup(opts1);	/* copy of opts1 to munge */
 
   /* initialization */
-  mnt2.mnt_opts = (char *) opts2;
+  mnt2.mnt_opts = opts2;
   newstr = xmalloc(len);
   newstr[0] = '\0';
 

contrib/amd/amd/amd.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amd.c,v 1.3 1998/11/14 03:13:19 obrien Exp $
+ * $Id: amd.c,v 1.1.1.1 1998/08/23 22:07:20 obrien Exp $
  *
  */
 
@@ -55,29 +55,23 @@
 struct amu_global_options gopt;	/* where global options are stored */
 
 char pid_fsname[16 + MAXHOSTNAMELEN];	/* "kiska.southseas.nz:(pid%d)" */
-#if 0
 char *progname;			/* "amd" */
-#endif
 char *hostdomain = "unknown.domain";
-#if 0
-char hostname[MAXHOSTNAMELEN + 1] = "localhost"; /* Hostname */
-#endif
-char hostd[2 * MAXHOSTNAMELEN + 1]; /* Host+domain */
+char hostname[MAXHOSTNAMELEN + 1] = "localhost";	/* Hostname */
+char hostd[2 * MAXHOSTNAMELEN + 1];	/* Host+domain */
 char *endian = ARCH_ENDIAN;	/* Big or Little endian */
 char *cpu = HOST_CPU;		/* CPU type */
 char *PrimNetName;		/* name of primary network */
 char *PrimNetNum;		/* number of primary network */
 
+int foreground = 1;		/* This is the top-level server */
 int immediate_abort;		/* Should close-down unmounts be retried */
-int orig_umask = 022;
+int orig_umask;
 int select_intr_valid;
 
 jmp_buf select_intr;
-#if 0
 pid_t mypid;			/* Current process id */
 serv_state amd_state;
-int foreground = 1;		/* This is the top-level server */
-#endif
 struct amd_stats amd_stats;	/* Server statistics */
 struct in_addr myipaddr;	/* (An) IP address of this host */
 time_t do_mapc_reload = 0;	/* mapc_reload() call required? */
@@ -174,7 +168,7 @@ daemon_mode(void)
      */
     for (;;)
       pause();
-    /* should never reach here */
+    /* should never reache here */
   }
 #ifdef HAVE_SIGACTION
   sigaction(SIGQUIT, &osa, NULL);
@@ -187,7 +181,7 @@ daemon_mode(void)
    */
   if (gopt.flags & CFM_PRINT_PID) {
     if (STREQ(gopt.pid_file, "/dev/stdout")) {
-      printf("%ld\n", (long) am_mypid);
+      printf("%ld\n", (long) mypid);
       fflush(stdout);
       /* do not fclose stdout */
     } else {
@@ -196,7 +190,7 @@ daemon_mode(void)
 
       f = fopen(gopt.pid_file, "w");
       if (f) {
-	fprintf(f, "%ld\n", (long) am_mypid);
+	fprintf(f, "%ld\n", (long) mypid);
 	(void) fclose(f);
       } else {
 	fprintf(stderr, "cannot open %s (errno=%d)\n", gopt.pid_file, errno);
@@ -313,8 +307,6 @@ main(int argc, char *argv[])
   char *domdot, *verstr;
   int ppid = 0;
   int error;
-  char *progname = NULL;		/* "amd" */
-  char hostname[MAXHOSTNAMELEN + 1] = "localhost"; /* Hostname */
 #ifdef HAVE_SIGACTION
   struct sigaction sa;
 #endif /* HAVE_SIGACTION */
@@ -342,14 +334,13 @@ main(int argc, char *argv[])
   }
   if (!progname)
     progname = "amd";
-  am_set_progname(progname);
 
   /*
-   * Initialize process id.  This is kept
+   * Initialise process id.  This is kept
    * cached since it is used for generating
    * and using file handles.
    */
-  am_set_mypid();
+  mypid = getpid();
 
   /*
    * Get local machine name
@@ -368,18 +359,13 @@ main(int argc, char *argv[])
     going_down(1);
   }
 
-#ifdef DEBUG
-  /* initialize debugging flags (Register AMQ, Enter daemon mode) */
-  debug_flags = D_AMQ | D_DAEMON;
-#endif /* DEBUG */
-
   /*
    * Initialize global options structure.
    */
   init_global_options();
 
   /*
-   * Partially initialize hostd[].  This
+   * Partially initialise hostd[].  This
    * is completed in get_args().
    */
   if ((domdot = strchr(hostname, '.'))) {
@@ -392,7 +378,6 @@ main(int argc, char *argv[])
     hostdomain = domdot;
   }
   strcpy(hostd, hostname);
-  am_set_hostname(hostname);
 
   /*
    * Trap interrupts for shutdowns.
@@ -534,7 +519,7 @@ main(int argc, char *argv[])
 #endif /* DEBUG */
     ppid = daemon_mode();
 
-  sprintf(pid_fsname, "%s:(pid%ld)", am_get_hostname(), (long) am_mypid);
+  sprintf(pid_fsname, "%s:(pid%ld)", hostname, (long) mypid);
 
   do_mapc_reload = clocktime() + ONE_HOUR;
 
@@ -543,7 +528,7 @@ main(int argc, char *argv[])
    */
   error = mount_automounter(ppid);
   if (error && ppid)
-    kill(ppid, SIGALRM);
+    kill(SIGALRM, ppid);
   going_down(error);
 
   abort();

contrib/amd/amd/amd.h

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amd.h,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
+ * $Id: amd.h,v 1.1 1996/01/13 23:23:39 ezk Exp ezk $
  *
  */
 
@@ -178,17 +178,18 @@ struct mnt_map {
 
 /*
  * Mounting a file system may take a significant period of time.  The
- * problem is that if this is done in the main process thread then the
- * entire automounter could be blocked, possibly hanging lots of processes
- * on the system.  Instead we use a continuation scheme to allow mounts to
- * be attempted in a sub-process.  When the sub-process exits we pick up the
- * exit status (by convention a UN*X error number) and continue in a
- * notifier.  The notifier gets handed a data structure and can then
- * determine whether the mount was successful or not.  If not, it updates
- * the data structure and tries again until there are no more ways to try
- * the mount, or some other permanent error occurs.  In the mean time no RPC
- * reply is sent, even after the mount is successful.  We rely on the RPC
- * retry mechanism to resend the lookup request which can then be handled.
+ * problem is that if this is done in the main process thread then
+ * the entire automounter could be blocked, possibly hanging lots of
+ * processes on the system.  Instead we use a continuation scheme to
+ * allow mounts to be attempted in a sub-process.  When the sub-process
+ * exits we pick up the exit status (by convention a UN*X error number)
+ * and continue in a notifier.  The notifier gets handed a data structure
+ * and can then determine whether the mount was successful or not.  If
+ * not, it updates the data structure and tries again until there are no
+ * more ways to try the mount, or some other permanent error occurs.
+ * In the mean time no RPC reply is sent, even after the mount is succesful.
+ * We rely on the RPC retry mechanism to resend the lookup request which
+ * can then be handled.
  */
 struct continuation {
   char **ivec;			/* Current mount info */

contrib/amd/amd/amfs_auto.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amfs_auto.c,v 1.1.1.1 1998/11/05 02:04:46 ezk Exp $
+ * $Id: amfs_auto.c,v 1.1 1997-1998/06/30 19:22:30 ezk Exp ezk $
  *
  */
 
@@ -477,7 +477,7 @@ try_mount(voidp mvp)
  break
  fi
  if no error on this mount then
- this_error = initialize mount point
+ this_error = initialise mount point
  fi
  if no error on this mount and mount is delayed then
  this_error = -1
@@ -496,7 +496,7 @@ try_mount(voidp mvp)
  this_error = mount in foreground
  fi
  fi
- if an error occurred on this mount then
+ if an error occured on this mount then
  update stats
  save error in mount point
  fi
@@ -657,7 +657,7 @@ amfs_auto_bgmount(struct continuation * cp, int mpe)
     /*
      * Will usually need to play around with the mount nodes
      * file attribute structure.  This must be done here.
-     * Try and get things initialized, even if the fileserver
+     * Try and get things initialised, even if the fileserver
      * is not known to be up.  In the common case this will
      * progress things faster.
      */
@@ -987,7 +987,7 @@ amfs_auto_lookuppn(am_node *mp, char *fname, int *error_return, int op)
   }
 
   /*
-   * If an error occurred then return it.
+   * If an error occured then return it.
    */
   if (error) {
 #ifdef DEBUG
@@ -1128,7 +1128,6 @@ amfs_auto_lookuppn(am_node *mp, char *fname, int *error_return, int op)
 	  memset((char *) &ap, 0, sizeof(am_opts));
 	  pt = ops_match(&ap, *sp, "", mp->am_path, "/defaults",
 			 mp->am_parent->am_mnt->mf_info);
-	  free_opts(&ap);	/* don't leak */
 	  if (pt == &amfs_error_ops) {
 	    plog(XLOG_MAP, "failed to match defaults for \"%s\"", *sp);
 	  } else {
@@ -1511,7 +1510,7 @@ amfs_auto_readdir_browsable(am_node *mp, nfscookie cookie, nfsdirlist *dp, nfsen
     if (te_next) {
       nfsentry *te_saved = te_next->ne_nextentry;
       te_next->ne_nextentry = NULL; /* terminate "te" chain */
-      te_next = te_saved;	/* save rest of "te" for next iteration */
+      te_next = te_saved;	/* save rest of "te" for next interation */
       dp->dl_eof = FALSE;	/* tell readdir there's more */
     } else {
       dp->dl_eof = TRUE;	/* tell readdir that's it */
@@ -1565,7 +1564,7 @@ amfs_auto_readdir_browsable(am_node *mp, nfscookie cookie, nfsdirlist *dp, nfsen
   if (te_next) {
     nfsentry *te_saved = te_next->ne_nextentry;
     te_next->ne_nextentry = NULL; /* terminate "te" chain */
-    te_next = te_saved;		/* save rest of "te" for next iteration */
+    te_next = te_saved;		/* save rest of "te" for next interation */
     dp->dl_eof = FALSE;		/* tell readdir there's more */
   }
   ep = te;			/* send next chunk of "te" chain */

contrib/amd/amd/amfs_direct.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amfs_direct.c,v 1.1.1.1 1998/11/05 02:04:46 ezk Exp $
+ * $Id: amfs_direct.c,v 1.1 1997-1998/06/30 19:22:30 ezk Exp ezk $
  *
  */
 

contrib/amd/amd/amfs_error.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amfs_error.c,v 1.1.1.1 1998/11/05 02:04:46 ezk Exp $
+ * $Id: amfs_error.c,v 5.2.2.1 1992/02/09 15:08:21 jsp beta $
  *
  */
 

contrib/amd/amd/amfs_host.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amfs_host.c,v 1.1.1.1 1998/11/05 02:04:46 ezk Exp $
+ * $Id: amfs_host.c,v 5.2.2.2 1992/05/31 16:36:08 jsp Exp $
  *
  */
 
@@ -256,7 +256,7 @@ fetch_fhandle(CLIENT * client, char *dir, am_nfs_handle_t *fhp, u_long nfs_versi
 			  (SVC_IN_ARG_TYPE) &fhp->v2,
 			  tv);
     if (clnt_stat != RPC_SUCCESS) {
-      const char *msg = clnt_sperrno(clnt_stat);
+      char *msg = clnt_sperrno(clnt_stat);
       plog(XLOG_ERROR, "mountd rpc failed: %s", msg);
       return EIO;
     }
@@ -347,7 +347,7 @@ amfs_host_fmount(mntfs *mf)
    * The original 10 second per try timeout is WAY too large, especially
    * if we're only waiting 10 or 20 seconds max for the response.
    * That would mean we'd try only once in 10 seconds, and we could
-   * lose the transmit or receive packet, and never try again.
+   * lose the transmitt or receive packet, and never try again.
    * A 2-second per try timeout here is much more reasonable.
    * 09/28/92 Mike Mitchell, [email protected]
    */
@@ -392,7 +392,7 @@ amfs_host_fmount(mntfs *mf)
 			(SVC_IN_ARG_TYPE) & exlist,
 			tv2);
   if (clnt_stat != RPC_SUCCESS) {
-    const char *msg = clnt_sperrno(clnt_stat);
+    char *msg = clnt_sperrno(clnt_stat);
     plog(XLOG_ERROR, "host_fmount rpc failed: %s", msg);
     /* clnt_perror(client, "rpc"); */
     error = EIO;
@@ -673,7 +673,7 @@ amfs_host_umounted(am_node *mp)
 			tv);
   if (clnt_stat != RPC_SUCCESS && clnt_stat != RPC_SYSTEMERROR) {
     /* RPC_SYSTEMERROR seems to be returned for no good reason ... */
-    const char *msg = clnt_sperrno(clnt_stat);
+    char *msg = clnt_sperrno(clnt_stat);
     plog(XLOG_ERROR, "unmount all from %s rpc failed: %s", host, msg, clnt_stat);
     goto out;
   }

contrib/amd/amd/amfs_inherit.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amfs_inherit.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
+ * $Id: amfs_inherit.c,v 5.2.2.1 1992/02/09 15:08:26 jsp beta $
  *
  */
 
@@ -119,7 +119,7 @@ amfs_inherit_init(mntfs *mf)
 
 /*
  * Take the linked mount point and
- * propagate.
+ * propogate.
  */
 static mntfs *
 amfs_inherit_inherit(mntfs *mf)

contrib/amd/amd/amfs_link.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amfs_link.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
+ * $Id: amfs_link.c,v 5.2.2.1 1992/02/09 15:09:04 jsp beta $
  *
  */
 

contrib/amd/amd/amfs_linkx.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amfs_linkx.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
+ * $Id: amfs_linkx.c,v 5.2.2.1 1992/02/09 15:09:04 jsp beta $
  *
  */
 
@@ -101,3 +101,4 @@ amfs_linkx_mount(am_node *mp)
 
   return 0;
 }
+

contrib/amd/amd/amfs_nfsl.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amfs_nfsl.c,v 1.2 1998/12/27 06:24:45 ezk Exp $
+ * $Id: amfs_nfsl.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
  *
  */
 
@@ -99,7 +99,7 @@ amfs_nfsl_match(am_opts *fo)
   struct stat stb;
 
   if (!cp || !ho) {
-    plog(XLOG_USER, "amfs_nfsl: host $fs and $rhost must be specified");
+    plog(XLOG_USER, "amfs_nfsl: nost $fs and $rhost must be specified");
     return NULL;
   }
 
@@ -109,7 +109,7 @@ amfs_nfsl_match(am_opts *fo)
    * If link value exists (or same host), then perform amfs_link_match(),
    * same as for linkx.
    */
-  if (!STRCEQ(ho, am_get_hostname())) {
+  if (!STRCEQ(ho, hostname)) {
     plog(XLOG_INFO, "amfs_nfsl: \"%s\" is not local host, using type:=nfs", ho);
     return nfs_match(fo);
   } else if (lstat(cp, &stb) < 0) {
@@ -228,7 +228,7 @@ amfs_nfsl_ffserver(mntfs *mf)
    * If link value exists (or same host), then perform
    * find_amfs_auto_srvr(), same as for linkx.
    */
-  if (!STRCEQ(ho, am_get_hostname()) || lstat(cp, &stb) < 0) {
+  if (!STREQ(ho, hostname) || lstat(cp, &stb) < 0) {
     return find_nfs_srvr(mf);
   } else {
     mf->mf_flags |= MFF_NFSLINK;

contrib/amd/amd/amfs_nfsx.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amfs_nfsx.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
+ * $Id: amfs_linxx.c,v 5.2.2.3 1992/05/31 16:13:07 jsp Exp $
  *
  */
 
@@ -463,7 +463,7 @@ amfs_nfsx_fumount(mntfs *mf)
      * If this node has not been messed with
      * and there has been no error so far
      * then try and unmount.
-     * If an error had occurred then zero
+     * If an error had occured then zero
      * the error code so that the remount
      * only tries to unmount those nodes
      * which had been successfully unmounted.

contrib/amd/amd/amfs_program.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amfs_program.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
+ * $Id: amfs_program.c,v 5.2.2.1 1992/02/09 15:08:56 jsp beta $
  *
  */
 

contrib/amd/amd/amfs_root.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amfs_root.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
+ * $Id: amfs_root.c,v 1.1 1997-1998/06/30 19:22:30 ezk Exp ezk $
  *
  */
 

contrib/amd/amd/amfs_toplvl.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amfs_toplvl.c,v 1.2 1998/12/27 06:24:45 ezk Exp $
+ * $Id: amfs_toplvl.c,v 1.1 1997-1998/06/30 19:22:30 ezk Exp ezk $
  *
  */
 
@@ -158,8 +158,8 @@ mount_amfs_toplvl(char *dir, char *opts)
    * Make a ``hostname'' string for the kernel
    */
   sprintf(fs_hostname, "pid%ld@%s:%s",
-	  (long) (foreground ? am_mypid : getppid()),
-	  am_get_hostname(),
+	  (long) (foreground ? mypid : getppid()),
+	  hostname,
 	  dir);
   /*
    * Most kernels have a name length restriction (64 bytes)...

contrib/amd/amd/amfs_union.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amfs_union.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
+ * $Id: amfs_union.c,v 1.1 1997-1998/06/30 19:22:30 ezk Exp ezk $
  *
  */
 

contrib/amd/amd/amq_subr.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,11 +38,11 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amq_subr.c,v 1.2 1998/09/04 04:42:28 obrien Exp $
+ * $Id: amq_subr.c,v 1.1.1.1 1998/08/23 22:07:20 obrien Exp $
  *
  */
 /*
- * Auxiliary routines for amq tool
+ * Auxilliary routines for amq tool
  */
 
 #ifdef HAVE_CONFIG_H
@@ -139,7 +139,7 @@ amqproc_setopt_1_svc(voidp argp, struct svc_req *rqstp)
   case AMOPT_LOGFILE:
     if (gopt.logfile && opt->as_str
 	&& STREQ(gopt.logfile, opt->as_str)) {
-      if (switch_to_logfile(opt->as_str, orig_umask))
+      if (switch_to_logfile(opt->as_str))
 	rc = EINVAL;
     } else {
       rc = EACCES;

contrib/amd/amd/amq_svc.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amq_svc.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
+ * $Id: amq_svc.c,v 5.2.2.1 1992/02/09 15:09:26 jsp beta $
  *
  */
 

contrib/amd/amd/autil.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: autil.c,v 1.2 1998/12/27 06:24:46 ezk Exp $
+ * $Id: autil.c,v 5.2.2.2 1992/03/07 17:52:06 jsp Exp $
  *
  */
 
@@ -393,7 +393,7 @@ top:
     goto top;
   }
   if (pid == 0) {		/* child process (foreground==false) */
-    am_set_mypid();
+    mypid = getpid();
     foreground = 0;
   } else {			/* parent process, has one more child */
     NumChild++;

contrib/amd/amd/clock.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,14 +38,14 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: clock.c,v 1.1.1.1 1998/11/05 02:04:47 ezk Exp $
+ * $Id: clock.c,v 5.2.2.1 1992/02/09 15:08:20 jsp beta $
  *
  */
 
 /*
  * Callouts.
  *
- * Modeled on kernel object of the same name.
+ * Modelled on kernel object of the same name.
  * See usual references.
  *
  * Use of a heap-based mechanism was rejected:

contrib/amd/amd/conf.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: conf.c,v 1.2 1998/12/27 06:24:46 ezk Exp $
+ * $Id: conf.c,v 5.2.2.1 1992/02/09 15:08:23 jsp beta $
  *
  */
 
@@ -373,7 +373,7 @@ gopt_debug_options(const char *val)
   return 0;
 #else /* not DEBUG */
   fprintf(stderr, "%s: not compiled with DEBUG option -- sorry.\n",
-	  am_get_progname());
+	  progname);
   return 1;
 #endif /* not DEBUG */
 }
@@ -534,11 +534,6 @@ gopt_map_options(const char *val)
 static int
 gopt_map_type(const char *val)
 {
-  /* check if map type exist */
-  if (!mapc_type_exists(val)) {
-    fprintf(stderr, "conf: no such map type \"%s\"\n", val);
-    return 1;
-  }
   gopt.map_type = strdup((char *)val);
   return 0;
 }
@@ -851,11 +846,6 @@ ropt_map_options(const char *val, cf_map_t *cfm)
 static int
 ropt_map_type(const char *val, cf_map_t *cfm)
 {
-  /* check if map type exist */
-  if (!mapc_type_exists(val)) {
-    fprintf(stderr, "conf: no such map type \"%s\"\n", val);
-    return 1;
-  }
   cfm->cfm_type = strdup((char *)val);
   return 0;
 }

contrib/amd/amd/conf_parse.y

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *	%W% (Berkeley) %G%
  *
- * $Id: conf_parse.y,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
+ * $Id: conf_parse.y,v 5.2.2.1 1992/02/09 15:09:35 jsp beta $
  *
  */
 

contrib/amd/amd/conf_tok.l

@@ -18,7 +18,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -39,7 +39,7 @@
  *
  *	%W% (Berkeley) %G%
  *
- * $Id: conf_tok.l,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
+ * $Id: conf_tok.l,v 5.2.2.1 1992/02/09 15:09:36 jsp beta $
  *
  */
 
@@ -70,7 +70,7 @@
 #endif /* ECHO */
 
 /*
- * There are some things that need to be defined only if using GNU flex.
+ * There are some things that need to be defined only if useing GNU flex.
  * These must not be defined if using standard lex
  */
 #ifdef FLEX_SCANNER

contrib/amd/amd/get_args.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: get_args.c,v 1.2 1998/09/05 06:06:00 obrien Exp $
+ * $Id: get_args.c,v 1.1.1.1 1998/08/23 22:07:20 obrien Exp $
  *
  */
 
@@ -60,12 +60,11 @@ char *conf_tag = NULL;		/* default conf file tags to use */
 int usage = 0;
 int use_conf_file = 0;		/* default don't use amd.conf file */
 char *mnttab_file_name = NULL;	/* symbol must be available always */
-#if 0
 #ifdef DEBUG
 int debug_flags = D_AMQ		/* Register AMQ */
 		| D_DAEMON;	/* Enter daemon mode */
 #endif /* DEBUG */
-#endif
+
 
 /*
  * Return the version string (dynamic buffer)
@@ -138,7 +137,7 @@ get_args(int argc, char *argv[])
     case 'a':
       if (*optarg != '/') {
 	fprintf(stderr, "%s: -a option must begin with a '/'\n",
-		am_get_progname());
+		progname);
 	exit(1);
       }
       gopt.auto_dir = optarg;
@@ -225,8 +224,7 @@ get_args(int argc, char *argv[])
 #ifdef DEBUG
       usage += debug_option(optarg);
 #else /* not DEBUG */
-      fprintf(stderr, "%s: not compiled with DEBUG option -- sorry.\n",
-	      am_get_progname());
+      fprintf(stderr, "%s: not compiled with DEBUG option -- sorry.\n", progname);
 #endif /* not DEBUG */
       break;
 
@@ -336,7 +334,7 @@ get_args(int argc, char *argv[])
 # endif /* DEBUG */
 #endif /* not MOUNT_TABLE_ON_FILE */
 
-    if (switch_to_logfile(gopt.logfile, orig_umask) != 0)
+    if (switch_to_logfile(gopt.logfile) != 0)
       plog(XLOG_USER, "Cannot switch logfile");
 
     /*
@@ -364,7 +362,7 @@ show_usage:
 \t[-k kernel_arch] [-l logfile%s\n\
 \t[-t timeout.retrans] [-w wait_timeout] [-C cluster_name]\n\
 \t[-o op_sys_ver] [-O op_sys_name]\n\
-\t[-F conf_file] [-T conf_tag]", am_get_progname(),
+\t[-F conf_file] [-T conf_tag]", progname,
 #ifdef HAVE_SYSLOG
 # ifdef LOG_DAEMON
 	  "|\"syslog[:facility]\"]"

contrib/amd/amd/info_file.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: info_file.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
+ * $Id: info_file.c,v 5.2.2.1 1992/02/09 15:08:28 jsp beta $
  *
  */
 

contrib/amd/amd/info_hesiod.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: info_hesiod.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
+ * $Id: info_hesiod.c,v 1.1 1997-1998/07/11 08:34:52 danny Exp danny $
  *
  */
 

contrib/amd/amd/info_ldap.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: info_ldap.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
+ * $Id: info_ldap.c,v 5.2.2.1 1992/02/09 15:08:29 jsp beta $
  *
  */
 
@@ -263,7 +263,7 @@ amu_ldap_rebind(ALD *a)
 	return (0);
       }
     }
-    plog(XLOG_WARNING, "Exhausted list of ldap servers, looping.\n");
+    plog(XLOG_WARNING, "Exausted list of ldap servers, looping.\n");
   }
 
   plog(XLOG_USER, "Unable to (re)bind to any ldap hosts\n");

contrib/amd/amd/info_ndbm.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: info_ndbm.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
+ * $Id: info_ndbm.c,v 5.2.2.1 1992/02/09 15:08:31 jsp beta $
  *
  */
 

contrib/amd/amd/info_nis.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: info_nis.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
+ * $Id: info_nis.c,v 5.2.2.1 1992/02/09 15:08:32 jsp beta $
  *
  */
 
@@ -52,7 +52,6 @@
 #include <am_defs.h>
 #include <amd.h>
 
-
 /*
  * NIS+ servers in NIS compat mode don't have yp_order()
  */
@@ -62,7 +61,6 @@ static int has_yp_order = FALSE;
 int nis_reload(mnt_map *m, char *map, void (*fn) (mnt_map *, char *, char *));
 int nis_search(mnt_map *m, char *map, char *key, char **val, time_t *tp);
 int nis_init(mnt_map *m, char *map, time_t *tp);
-int nis_isup(mnt_map *m, char *map);
 int nis_mtime(mnt_map *m, char *map, time_t *tp);
 
 /* typedefs */
@@ -122,20 +120,27 @@ callback(int status, char *key, int kl, char *val, int vl, char *data)
 
   if (status == YP_TRUE) {
 
-    /* add to list of maps */
+    /*
+     * Add to list of maps
+     */
     char *kp = strnsave(key, kl);
     char *vp = strnsave(val, vl);
-
     (*ncdp->ncd_fn) (ncdp->ncd_m, kp, vp);
 
-    /* we want more ... */
+    /*
+     * We want more ...
+     */
     return FALSE;
 
   } else {
 
-    /* NOMORE means end of map - otherwise log error */
+    /*
+     * NOMORE means end of map - otherwise log error
+     */
     if (status != YP_NOMORE) {
-      /* check what went wrong */
+      /*
+       * Check what went wrong
+       */
       int e = ypprot_err(status);
 
 #ifdef DEBUG
@@ -228,7 +233,7 @@ nis_search(mnt_map *m, char *map, char *key, char **val, time_t *tp)
   YP_ORDER_OUTORDER_TYPE order;
 
   /*
-   * Make sure domain initialized
+   * Make sure domain initialised
    */
   if (!gopt.nis_domain) {
     int error = determine_nis_domain();
@@ -341,7 +346,7 @@ nis_mtime(mnt_map *m, char *map, time_t *tp)
  * alternate code which avoids a bug in yp_all().  The bug in yp_all() is
  * that it does not close a TCP connection to ypserv, and this ypserv runs
  * out of open filedescriptors, getting into an infinite loop, thus all YP
- * clients eventually unbind and hang too.
+ * clients enevtually unbind and hang too.
  *
  * Systems known to be plagued with this bug:
  *	earlier SunOS 4.x
@@ -373,25 +378,16 @@ am_yp_all(char *indomain, char *inmap, struct ypall_callback *incallback)
 			      incallback->data);
     if (j != FALSE)		/* terminate loop */
       break;
-
-    /*
-     * We have to manually free all char ** arguments to yp_first/yp_next
-     * outval must be freed *before* calling yp_next again, outkey can be
-     * freed as outkey_old *after* the call (this saves one call to
-     * strnsave).
-     */
-    XFREE(outval);
     outkey_old = outkey;
     outkeylen_old = outkeylen;
     i = yp_next(indomain,
 		inmap,
 		outkey_old,
 		outkeylen_old,
-		&outkey,
+		 &outkey,
 		&outkeylen,
 		&outval,
 		&outvallen);
-    XFREE(outkey_old);
   } while (!i);
 #ifdef DEBUG
   if (i) {

contrib/amd/amd/info_nisplus.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: info_nisplus.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
+ * $Id: info_nisplus.c,v 5.2.2.1 1992/02/09 15:08:32 jsp beta $
  *
  */
 

contrib/amd/amd/info_passwd.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: info_passwd.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
+ * $Id: info_passwd.c,v 5.2.2.1 1992/02/09 15:08:33 jsp beta $
  *
  */
 

contrib/amd/amd/info_union.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: info_union.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
+ * $Id: info_union.c,v 5.2.2.1 1992/02/09 15:08:34 jsp beta $
  *
  */
 

contrib/amd/amd/map.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: map.c,v 1.2 1998/12/27 06:24:47 ezk Exp $
+ * $Id: map.c,v 5.2.2.2 1992/08/02 10:42:21 jsp Exp $
  *
  */
 
@@ -134,7 +134,7 @@ exported_ap_realloc_map(int nsize)
  * Allocate a new mount slot and create
  * a new node.
  * Fills in the map number of the node,
- * but leaves everything else uninitialized.
+ * but leaves everything else uninitialised.
  */
 am_node *
 exported_ap_alloc(void)
@@ -297,7 +297,7 @@ mk_fattr(am_node *mp, nfsftype vntype)
 
 
 /*
- * Initialize an allocated mount node.
+ * Initialise an allocated mount node.
  * It is assumed that the mount node was b-zero'd
  * before getting here so anything that would
  * be set to zero isn't done here.
@@ -371,7 +371,7 @@ fh_to_mp3(am_nfs_fh *fhp, int *rp, int c_or_d)
    * from an old kernel cached filehandle
    * which is now out of date.
    */
-  if (fp->fhh_pid != am_mypid)
+  if (fp->fhh_pid != mypid)
     goto drop;
 
   /*
@@ -511,7 +511,7 @@ mp_to_fh(am_node *mp, am_nfs_fh *fhp)
   /*
    * Take the process id
    */
-  fp->fhh_pid = am_mypid;
+  fp->fhh_pid = mypid;
 
   /*
    * ... the map number
@@ -726,7 +726,7 @@ make_root_node(void)
   root_node->am_mnt = root_mnt;
 
   /*
-   * Initialize the root
+   * Initialise the root
    */
   if (root_mnt->mf_ops->fs_init)
     (*root_mnt->mf_ops->fs_init) (root_mnt);
@@ -893,7 +893,7 @@ free_map_if_success(int rc, int term, voidp closure)
   mf->mf_flags &= ~MFF_UNMOUNTING;
 
   /*
-   * If a timeout was deferred because the underlying filesystem
+   * If a timeout was defered because the underlying filesystem
    * was busy then arrange for a timeout as soon as possible.
    */
   if (mf->mf_flags & MFF_WANTTIMO) {

contrib/amd/amd/mapc.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: mapc.c,v 1.1.1.1 1998/11/05 02:04:48 ezk Exp $
+ * $Id: mapc.c,v 5.2.2.2 1992/08/02 10:42:21 jsp Exp $
  *
  */
 
@@ -113,7 +113,7 @@ static char wildcard[] = "*";
 typedef struct map_type map_type;
 struct map_type {
   char *name;			/* Name of this map type */
-  init_fn *init;		/* Initialization */
+  init_fn *init;		/* Initialisation */
   reload_fn *reload;		/* Reload or fill */
   isup_fn *isup;		/* Is service up or not? (1=up, 0=down) */
   search_fn *search;		/* Search for new entry */
@@ -349,33 +349,11 @@ mapc_showtypes(char *buf)
 }
 
 
-/*
- * Check if a map of a certain type exists.
- * Return 1 (true) if exists, 0 (false) if not.
- */
-int
-mapc_type_exists(const char *type)
-{
-  map_type *mt;
-
-  if (!type)
-    return 0;
-  for (mt = maptypes;
-       mt < maptypes + sizeof(maptypes) / sizeof(maptypes[0]);
-       mt++) {
-    if (STREQ(type, mt->name))
-      return 1;
-  }
-  return 0;			/* not found anywhere */
-}
-
-
 /*
  * Add key and val to the map m.
  * key and val are assumed to be safe copies
  */
-void
-mapc_add_kv(mnt_map *m, char *key, char *val)
+void mapc_add_kv(mnt_map *m, char *key, char *val)
 {
   kv **h;
   kv *n;
@@ -578,7 +556,7 @@ mapc_create(char *map, char *opt, const char *type)
   default:
     plog(XLOG_USER, "Ambiguous map cache type \"%s\"; using \"inc\"", opt);
     alloc = MAPC_INC;
-    /* fall-through... */
+    /* fallthrough... */
   case MAPC_NONE:
   case MAPC_INC:
   case MAPC_ROOT:

contrib/amd/amd/mntfs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: mntfs.c,v 1.1.1.1 1998/11/05 02:04:48 ezk Exp $
+ * $Id: mntfs.c,v 5.2.2.2 1992/08/02 10:42:21 jsp Exp $
  *
  */
 

contrib/amd/amd/nfs_prot_svc.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: nfs_prot_svc.c,v 1.1.1.1 1998/11/05 02:04:48 ezk Exp $
+ * $Id: nfs_prot_svc.c,v 5.2.2.1 1992/02/09 15:09:30 jsp beta $
  *
  */
 

contrib/amd/amd/nfs_start.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: nfs_start.c,v 1.1.1.1 1998/11/05 02:04:48 ezk Exp $
+ * $Id: nfs_start.c,v 5.2.2.1 1992/02/09 15:08:51 jsp beta $
  *
  */
 

contrib/amd/amd/nfs_subr.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: nfs_subr.c,v 1.1.1.1 1998/11/05 02:04:48 ezk Exp $
+ * $Id: nfs_subr.c,v 5.2.2.1 1992/02/09 15:08:53 jsp beta $
  *
  */
 
@@ -141,7 +141,7 @@ nfsproc_getattr_2_svc(am_nfs_fh *argp, struct svc_req *rqstp)
 #ifndef MNT2_NFS_OPT_SYMTTL
   /*
    * This code is needed to defeat Solaris 2.4's (and newer) symlink values
-   * cache.  It forces the last-modified time of the symlink to be current.
+   * cache.  It forces the last-modifed time of the symlink to be current.
    * It is not needed if the O/S has an nfs flag to turn off the
    * symlink-cache at mount time (such as Irix 5.x and 6.x). -Erez.
    */
@@ -211,13 +211,6 @@ nfsproc_lookup_2_svc(nfsdiropargs *argp, struct svc_req *rqstp)
       }
       res.dr_status = nfs_error(error);
     } else {
-      /*
-       * XXX: EXPERIMENTAL! Delay unmount of what was looked up.  This
-       * should reduce the chance for race condition between unmounting an
-       * entry synchronously, and re-mounting it asynchronously.
-       */
-      if (ap->am_ttl < mp->am_ttl)
- 	ap->am_ttl = mp->am_ttl;
       mp_to_fh(ap, &res.dr_u.dr_drok_u.drok_fhandle);
       res.dr_u.dr_drok_u.drok_attributes = ap->am_fattr;
       res.dr_status = NFS_OK;

contrib/amd/amd/ops_TEMPLATE.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_TEMPLATE.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
+ * $Id: ops_TEMPLATE.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
  *
  */
 

contrib/amd/amd/ops_autofs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_autofs.c,v 1.2 1998/12/27 06:24:47 ezk Exp $
+ * $Id: ops_autofs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
  *
  */
 
@@ -53,7 +53,7 @@
 #include <amd.h>
 
 /*
- * KLUDGE: wrap whole file in HAVE_FS_AUTOFS, because
+ * CLUDGE: wrap whole file in HAVE_FS_AUTOFS, becasue
  * not all systems with an automounter file system are supported
  * by am-utils yet...
  */
@@ -76,7 +76,7 @@ static int mount_autofs(char *dir, char *opts);
 static int autofs_mount_1_svc(struct mntrequest *mr, struct mntres *result, struct authunix_parms *cred);
 static int autofs_unmount_1_svc(struct umntrequest *ur, struct umntres *result, struct authunix_parms *cred);
 
-/* external declarations */
+/* externam declarations */
 extern bool_t xdr_mntrequest(XDR *, mntrequest *);
 extern bool_t xdr_mntres(XDR *, mntres *);
 extern bool_t xdr_umntrequest(XDR *, umntrequest *);
@@ -284,9 +284,8 @@ mount_autofs(char *dir, char *opts)
   /*
    * Make a ``hostname'' string for the kernel
    */
-  sprintf(fs_hostname, "pid%ld@%s:%s",
-	  (long) (foreground ? am_mypid : getppid()),
-	  am_get_hostname(), dir);
+  sprintf(fs_hostname, "pid%ld@%s:%s", foreground ? mypid : getppid(),
+	  hostname, dir);
 
   /*
    * Most kernels have a name length restriction.
@@ -482,7 +481,7 @@ out:
  break
  fi
  if no error on this mount then
- this_error = initialize mount point
+ this_error = initialise mount point
  fi
  if no error on this mount and mount is delayed then
  this_error = -1
@@ -501,7 +500,7 @@ out:
  this_error = mount in foreground
  fi
  fi
- if an error occurred on this mount then
+ if an error occured on this mount then
  update stats
  save error in mount point
  fi
@@ -662,7 +661,7 @@ autofs_bgmount(struct continuation * cp, int mpe)
     /*
      * Will usually need to play around with the mount nodes
      * file attribute structure.  This must be done here.
-     * Try and get things initialized, even if the fileserver
+     * Try and get things initialised, even if the fileserver
      * is not known to be up.  In the common case this will
      * progress things faster.
      */
@@ -712,7 +711,7 @@ autofs_bgmount(struct continuation * cp, int mpe)
       cp->retry = TRUE;
     }
 
-    if (!this_error) {
+    if (!this_error)
       if (p->fs_flags & FS_MBACKGROUND) {
 	mf->mf_flags |= MFF_MOUNTING;	/* XXX */
 #ifdef DEBUG
@@ -738,7 +737,6 @@ autofs_bgmount(struct continuation * cp, int mpe)
 	  cp->retry = TRUE;
 	}
       }
-    }
 
     if (this_error >= 0) {
       if (this_error > 0) {
@@ -861,7 +859,7 @@ autofs_lookuppn(am_node *mp, char *fname, int *error_return, int op)
   char *auto_opts;		/* Automount options */
   int error = 0;		/* Error so far */
   char path_name[MAXPATHLEN];	/* General path name buffer */
-  char apath[MAXPATHLEN];	/* autofs path (added space) */
+  char apath[MAXPATHLEN];	/* authofs path (added space) */
   char *pfname;			/* Path for database lookup */
   struct continuation *cp;	/* Continuation structure if need to mount */
   int in_progress = 0;		/* # of (un)mount in progress */
@@ -879,11 +877,10 @@ autofs_lookuppn(am_node *mp, char *fname, int *error_return, int op)
    */
   if (amd_state == Finishing) {
 #ifdef DEBUG
-    if ((mf = mp->am_mnt) == 0 || mf->mf_ops == &amfs_direct_ops) {
+    if ((mf = mp->am_mnt) == 0 || mf->mf_ops == &amfs_direct_ops)
       dlog("%s mount ignored - going down", fname);
-    } else {
+    else
       dlog("%s/%s mount ignored - going down", mp->am_path, fname);
-    }
 #endif /* DEBUG */
     ereturn(ENOENT);
   }
@@ -993,7 +990,7 @@ autofs_lookuppn(am_node *mp, char *fname, int *error_return, int op)
   }
 
   /*
-   * If an error occurred then return it.
+   * If an error occured then return it.
    */
   if (error) {
 #ifdef DEBUG
@@ -1134,7 +1131,6 @@ autofs_lookuppn(am_node *mp, char *fname, int *error_return, int op)
 	  memset((char *) &ap, 0, sizeof(am_opts));
 	  pt = ops_match(&ap, *sp, "", mp->am_path, "/defaults",
 			 mp->am_parent->am_mnt->mf_info);
-	  free_opts(&ap);	/* don't leak */
 	  if (pt == &amfs_error_ops) {
 	    plog(XLOG_MAP, "failed to match defaults for \"%s\"", *sp);
 	  } else {

contrib/amd/amd/ops_cachefs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_cachefs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
+ * $Id: ops_cachefs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
  *
  */
 

contrib/amd/amd/ops_cdfs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_cdfs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
+ * $Id: ops_cdfs.c,v 5.2.2.1 1992/02/09 15:09:08 jsp beta $
  *
  */
 

contrib/amd/amd/ops_efs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_efs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
+ * $Id: ops_efs.c,v 5.2.2.1 1992/02/09 15:09:08 jsp beta $
  *
  */
 

contrib/amd/amd/ops_lofs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_lofs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
+ * $Id: ops_lofs.c,v 5.2.2.1 1992/02/09 15:09:08 jsp beta $
  *
  */
 

contrib/amd/amd/ops_mfs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_mfs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
+ * $Id: ops_mfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
  *
  */
 
@@ -52,4 +52,4 @@
 #include <am_defs.h>
 #include <amd.h>
 
-/* FEEL FREE TO IMPLEMENT THIS... :-) */
+/* FEEL FREE TO INPLEMENT THIS... :-) */

contrib/amd/amd/ops_nfs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_nfs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
+ * $Id: ops_nfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
  *
  */
 

contrib/amd/amd/ops_nfs3.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_nfs3.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
+ * $Id: ops_nfs3.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
  *
  */
 
@@ -52,4 +52,4 @@
 #include <am_defs.h>
 #include <amd.h>
 
-/* FEEL FREE TO IMPLEMENT THIS... :-) */
+/* FEEL FREE TO INPLEMENT THIS... :-) */

contrib/amd/amd/ops_nullfs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_nullfs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
+ * $Id: ops_nullfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
  *
  */
 
@@ -52,4 +52,4 @@
 #include <am_defs.h>
 #include <amd.h>
 
-/* FEEL FREE TO IMPLEMENT THIS... :-) */
+/* FEEL FREE TO INPLEMENT THIS... :-) */

contrib/amd/amd/ops_pcfs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_pcfs.c,v 1.1.1.1 1998/11/05 02:04:50 ezk Exp $
+ * $Id: ops_pcfs.c,v 5.2.2.1 1992/02/09 15:09:08 jsp beta $
  *
  */
 

contrib/amd/amd/ops_tfs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_tfs.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
+ * $Id: ops_tfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
  *
  */
 
@@ -52,4 +52,4 @@
 #include <am_defs.h>
 #include <amd.h>
 
-/* FEEL FREE TO IMPLEMENT THIS... :-) */
+/* FEEL FREE TO INPLEMENT THIS... :-) */

contrib/amd/amd/ops_tmpfs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_tmpfs.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
+ * $Id: ops_tmpfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
  *
  */
 
@@ -52,4 +52,4 @@
 #include <am_defs.h>
 #include <amd.h>
 
-/* FEEL FREE TO IMPLEMENT THIS... :-) */
+/* FEEL FREE TO INPLEMENT THIS... :-) */

contrib/amd/amd/ops_ufs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_ufs.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
+ * $Id: ops_ufs.c,v 5.2.2.1 1992/02/09 15:09:08 jsp beta $
  *
  */
 

contrib/amd/amd/ops_umapfs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_umapfs.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
+ * $Id: ops_umapfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
  *
  */
 
@@ -52,4 +52,4 @@
 #include <am_defs.h>
 #include <amd.h>
 
-/* FEEL FREE TO IMPLEMENT THIS... :-) */
+/* FEEL FREE TO INPLEMENT THIS... :-) */

contrib/amd/amd/ops_unionfs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_unionfs.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
+ * $Id: ops_unionfs.c,v 5.2.2.3 1992/08/02 10:42:21 jsp Exp $
  *
  */
 
@@ -52,4 +52,4 @@
 #include <am_defs.h>
 #include <amd.h>
 
-/* FEEL FREE TO IMPLEMENT THIS... :-) */
+/* FEEL FREE TO INPLEMENT THIS... :-) */

contrib/amd/amd/ops_xfs.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: ops_xfs.c,v 1.1.1.1 1998/11/05 02:04:51 ezk Exp $
+ * $Id: ops_xfs.c,v 5.2.2.1 1992/02/09 15:09:08 jsp beta $
  *
  */
 

contrib/amd/amd/opts.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: opts.c,v 1.2 1998/12/27 06:24:48 ezk Exp $
+ * $Id: opts.c,v 5.2.2.4 1992/08/02 10:42:21 jsp Exp $
  *
  */
 
@@ -91,7 +91,7 @@ struct functable {
 };
 
 /*
- * FORWARD DEFINITION:
+ * FORWARD DEFINITSION:
  */
 static int f_in_network(char *);
 static int f_netgrp(char *);
@@ -106,7 +106,7 @@ static struct am_opts fs_static; /* copy of the options to play with */
 static char NullStr[] = "<NULL>";
 static char nullstr[] = "";
 static char *opt_dkey = NullStr;
-static char *opt_host = nullstr; /* XXX: was the global hostname */
+static char *opt_host = hostname;
 static char *opt_hostd = hostd;
 static char *opt_key = nullstr;
 static char *opt_keyd = nullstr;
@@ -1050,7 +1050,7 @@ expand_op(opt_apply *p, int sel_p)
       }
 
       /*
-       * Check that the search was successful
+       * Check that the search was succesful
        */
       if (!op->name) {
 	/*
@@ -1104,7 +1104,7 @@ out:
     }
 
     /*
-     * Save the expansion
+     * Save the exansion
      */
     *p->opt = strdup(expbuf);
   }
@@ -1219,9 +1219,6 @@ eval_fs_opts(am_opts *fo, char *opts, char *g_opts, char *path, char *key, char
   memset((voidp) vars, 0, sizeof(vars));
   memset((voidp) fo, 0, sizeof(*fo));
 
-  /* set hostname */
-  opt_host = (char *) am_get_hostname();
-
   /*
    * Set key, map & path before expansion
    */
@@ -1263,7 +1260,7 @@ eval_fs_opts(am_opts *fo, char *opts, char *g_opts, char *path, char *key, char
     ok = FALSE;
 
   /*
-   * Normalize remote host name.
+   * Normalise remote host name.
    * 1.  Expand variables
    * 2.  Normalize relative to host tables
    * 3.  Strip local domains from the remote host

contrib/amd/amd/restart.c

@@ -17,7 +17,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
+ *    must display the following acknowledgement:
  *      This product includes software developed by the University of
  *      California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: restart.c,v 1.1.1.1 1998/11/05 02:04:49 ezk Exp $
+ * $Id: restart.c,v 5.2.2.2 1992/08/02 10:42:21 jsp Exp $
  *
  */