From owner-p4-projects  Fri Oct  4 15:27:44 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8EDFE37B407; Fri,  4 Oct 2002 15:27:09 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1D73D37B404
	for <perforce@freebsd.org>; Fri,  4 Oct 2002 15:27:09 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0DA5443E42
	for <perforce@freebsd.org>; Fri,  4 Oct 2002 15:27:08 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g94MR8Co081069
	for <perforce@freebsd.org>; Fri, 4 Oct 2002 15:27:08 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g94MR6ec081066
	for perforce@freebsd.org; Fri, 4 Oct 2002 15:27:06 -0700 (PDT)
Date: Fri, 4 Oct 2002 15:27:06 -0700 (PDT)
Message-Id: <200210042227.g94MR6ec081066@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 18683 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18683

Change 18683 by peter@peter_daintree on 2002/10/04 15:26:12

	IFC @18682

Affected files ...

.. //depot/projects/hammer/etc/MAKEDEV#4 integrate
.. //depot/projects/hammer/etc/mtree/BSD.include.dist#3 integrate
.. //depot/projects/hammer/etc/rc#5 integrate
.. //depot/projects/hammer/include/Makefile#4 integrate
.. //depot/projects/hammer/include/string.h#3 integrate
.. //depot/projects/hammer/include/wchar.h#8 integrate
.. //depot/projects/hammer/lib/Makefile#3 integrate
.. //depot/projects/hammer/lib/libc/string/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/libc/string/stpcpy.c#1 branch
.. //depot/projects/hammer/lib/libc/string/strcpy.3#3 integrate
.. //depot/projects/hammer/lib/libc/string/string.3#2 integrate
.. //depot/projects/hammer/lib/libc/string/wcscoll.3#1 branch
.. //depot/projects/hammer/lib/libc/string/wcscoll.c#1 branch
.. //depot/projects/hammer/lib/libc/string/wcsxfrm.3#1 branch
.. //depot/projects/hammer/lib/libc/string/wcsxfrm.c#1 branch
.. //depot/projects/hammer/lib/libc/sys/sem.c#2 integrate
.. //depot/projects/hammer/lib/libc/sys/sigaction.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/sigprocmask.2#3 integrate
.. //depot/projects/hammer/lib/libc_r/man/sem_getvalue.3#2 integrate
.. //depot/projects/hammer/lib/libdisk/create_chunk.c#3 integrate
.. //depot/projects/hammer/lib/libexpat/Makefile#2 integrate
.. //depot/projects/hammer/lib/libexpat/libbsdxml.3#1 branch
.. //depot/projects/hammer/lib/libopie/Makefile#3 integrate
.. //depot/projects/hammer/lib/libz/minigzip.c#2 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 integrate
.. //depot/projects/hammer/sbin/fdisk_pc98/fdisk.c#3 integrate
.. //depot/projects/hammer/sbin/newfs_msdos/newfs_msdos.c#3 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#4 integrate
.. //depot/projects/hammer/share/man/man4/crypto.4#1 branch
.. //depot/projects/hammer/share/man/man4/hifn.4#1 branch
.. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#2 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/matcd.4#2 delete
.. //depot/projects/hammer/share/man/man4/ubsec.4#1 branch
.. //depot/projects/hammer/share/man/man5/utmp.5#2 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#2 integrate
.. //depot/projects/hammer/share/man/man9/crypto.9#1 branch
.. //depot/projects/hammer/share/man/man9/sbuf.9#2 integrate
.. //depot/projects/hammer/share/mk/bsd.kern.mk#3 integrate
.. //depot/projects/hammer/share/mk/bsd.libnames.mk#3 integrate
.. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#2 integrate
.. //depot/projects/hammer/sys/alpha/alpha/dec_2100_a50.c#3 integrate
.. //depot/projects/hammer/sys/alpha/alpha/dec_axppci_33.c#3 integrate
.. //depot/projects/hammer/sys/alpha/include/bus.h#2 integrate
.. //depot/projects/hammer/sys/alpha/include/setjmp.h#2 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#5 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#5 integrate
.. //depot/projects/hammer/sys/conf/NOTES#8 integrate
.. //depot/projects/hammer/sys/conf/files#7 integrate
.. //depot/projects/hammer/sys/conf/files.alpha#4 integrate
.. //depot/projects/hammer/sys/conf/files.i386#5 integrate
.. //depot/projects/hammer/sys/conf/files.ia64#3 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#5 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#3 integrate
.. //depot/projects/hammer/sys/conf/kmod.mk#3 integrate
.. //depot/projects/hammer/sys/conf/majors#5 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acdebug.h#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acexcep.h#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acglobal.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acinterp.h#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/aclocal.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acnamesp.h#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acparser.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/actbl2.h#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/actypes.h#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/acutils.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbdisply.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbexec.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbinput.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbstats.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dbxface.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dmnames.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsfield.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsobject.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsopcode.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsutils.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dswload.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dswscope.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evevent.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/evmisc.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exconvrt.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/excreate.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exdump.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exmisc.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg1.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg2.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exresnte.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exresolv.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exresop.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exstore.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exstoren.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/exstorob.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsdump.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsdumpdv.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsload.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsutils.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/psxface.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/rsdump.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/tbget.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/tbxface.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utclib.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utcopy.c#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utdebug.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utglobal.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utinit.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/utmisc.c#3 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#4 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#2 integrate
.. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#1 branch
.. //depot/projects/hammer/sys/dev/hifn/hifn7751reg.h#1 branch
.. //depot/projects/hammer/sys/dev/hifn/hifn7751var.h#1 branch
.. //depot/projects/hammer/sys/dev/mcd/mcd.c#1 branch
.. //depot/projects/hammer/sys/dev/mcd/mcd_isa.c#1 branch
.. //depot/projects/hammer/sys/dev/mcd/mcdreg.h#1 branch
.. //depot/projects/hammer/sys/dev/mcd/mcdvar.h#1 branch
.. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#1 branch
.. //depot/projects/hammer/sys/dev/ubsec/ubsecreg.h#1 branch
.. //depot/projects/hammer/sys/dev/ubsec/ubsecvar.h#1 branch
.. //depot/projects/hammer/sys/geom/geom_dev.c#6 integrate
.. //depot/projects/hammer/sys/geom/geom_disk.c#4 integrate
.. //depot/projects/hammer/sys/geom/geom_dump.c#4 integrate
.. //depot/projects/hammer/sys/geom/geom_int.h#4 integrate
.. //depot/projects/hammer/sys/geom/geom_kern.c#4 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#5 integrate
.. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#3 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#6 integrate
.. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#3 integrate
.. //depot/projects/hammer/sys/i386/include/bus_dma.h#2 integrate
.. //depot/projects/hammer/sys/i386/include/setjmp.h#2 integrate
.. //depot/projects/hammer/sys/i386/include/ucontext.h#3 integrate
.. //depot/projects/hammer/sys/i386/isa/matcd/TODO#2 delete
.. //depot/projects/hammer/sys/i386/isa/matcd/audio.c#2 delete
.. //depot/projects/hammer/sys/i386/isa/matcd/creative.h#2 delete
.. //depot/projects/hammer/sys/i386/isa/matcd/matcd.c#3 delete
.. //depot/projects/hammer/sys/i386/isa/matcd/matcddrv.h#2 delete
.. //depot/projects/hammer/sys/i386/isa/matcd/options.h#2 delete
.. //depot/projects/hammer/sys/i386/isa/mcd.c#3 delete
.. //depot/projects/hammer/sys/i386/isa/mcdreg.h#2 delete
.. //depot/projects/hammer/sys/i386/isa/scd.c#4 integrate
.. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#2 integrate
.. //depot/projects/hammer/sys/ia64/ia64/clock.c#2 integrate
.. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#3 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#2 integrate
.. //depot/projects/hammer/sys/ia64/ia64/sapic.c#3 integrate
.. //depot/projects/hammer/sys/ia64/ia64/trap.c#3 integrate
.. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#3 integrate
.. //depot/projects/hammer/sys/ia64/include/bus.h#2 integrate
.. //depot/projects/hammer/sys/ia64/include/clock.h#2 integrate
.. //depot/projects/hammer/sys/ia64/include/sapicvar.h#2 integrate
.. //depot/projects/hammer/sys/ia64/include/setjmp.h#2 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#8 integrate
.. //depot/projects/hammer/sys/kern/subr_sbuf.c#3 integrate
.. //depot/projects/hammer/sys/modules/Makefile#7 integrate
.. //depot/projects/hammer/sys/modules/cryptodev/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/hifn/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/mcd/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ubsec/Makefile#1 branch
.. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#3 integrate
.. //depot/projects/hammer/sys/opencrypto/cast.c#1 branch
.. //depot/projects/hammer/sys/opencrypto/cast.h#1 branch
.. //depot/projects/hammer/sys/opencrypto/castsb.h#1 branch
.. //depot/projects/hammer/sys/opencrypto/criov.c#1 branch
.. //depot/projects/hammer/sys/opencrypto/crmbuf.c#1 branch
.. //depot/projects/hammer/sys/opencrypto/crypto.c#1 branch
.. //depot/projects/hammer/sys/opencrypto/crypto_if.m#1 branch
.. //depot/projects/hammer/sys/opencrypto/cryptodev.c#1 branch
.. //depot/projects/hammer/sys/opencrypto/cryptodev.h#1 branch
.. //depot/projects/hammer/sys/opencrypto/cryptosoft.c#1 branch
.. //depot/projects/hammer/sys/opencrypto/cryptosoft.h#1 branch
.. //depot/projects/hammer/sys/opencrypto/deflate.c#1 branch
.. //depot/projects/hammer/sys/opencrypto/deflate.h#1 branch
.. //depot/projects/hammer/sys/opencrypto/rijndael.c#1 branch
.. //depot/projects/hammer/sys/opencrypto/rijndael.h#1 branch
.. //depot/projects/hammer/sys/opencrypto/rmd160.c#1 branch
.. //depot/projects/hammer/sys/opencrypto/rmd160.h#1 branch
.. //depot/projects/hammer/sys/opencrypto/skipjack.c#1 branch
.. //depot/projects/hammer/sys/opencrypto/skipjack.h#1 branch
.. //depot/projects/hammer/sys/opencrypto/xform.c#1 branch
.. //depot/projects/hammer/sys/opencrypto/xform.h#1 branch
.. //depot/projects/hammer/sys/posix4/semaphore.h#3 integrate
.. //depot/projects/hammer/sys/powerpc/conf/GENERIC#5 integrate
.. //depot/projects/hammer/sys/powerpc/include/db_machdep.h#2 integrate
.. //depot/projects/hammer/sys/powerpc/include/setjmp.h#2 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/db_disasm.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/db_interface.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/db_memrw.c#2 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/db_trace.c#3 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#5 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/trap.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/include/bus.h#5 integrate
.. //depot/projects/hammer/sys/sparc64/include/setjmp.h#2 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#3 integrate
.. //depot/projects/hammer/sys/sys/dmap.h#2 integrate
.. //depot/projects/hammer/sys/sys/file.h#4 integrate
.. //depot/projects/hammer/sys/sys/random.h#2 integrate
.. //depot/projects/hammer/sys/sys/sbuf.h#3 integrate
.. //depot/projects/hammer/sys/sys/types.h#7 integrate
.. //depot/projects/hammer/tools/tools/README#2 integrate
.. //depot/projects/hammer/tools/tools/find-sb/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/find-sb/README#1 branch
.. //depot/projects/hammer/tools/tools/find-sb/find-sb.c#1 branch
.. //depot/projects/hammer/usr.bin/make/Makefile#4 integrate
.. //depot/projects/hammer/usr.bin/make/job.c#4 integrate
.. //depot/projects/hammer/usr.bin/make/job.h#4 integrate
.. //depot/projects/hammer/usr.bin/minigzip/minigzip.1#2 integrate
.. //depot/projects/hammer/usr.bin/unexpand/unexpand.c#3 integrate
.. //depot/projects/hammer/usr.bin/xmlwf/Makefile#2 delete

Differences ...

==== //depot/projects/hammer/etc/MAKEDEV#4 (text+ko) ====

@@ -20,7 +20,7 @@
 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 #	@(#)MAKEDEV	5.2 (Berkeley) 6/22/90
-# $FreeBSD: src/etc/MAKEDEV,v 1.328 2002/09/17 22:39:16 sam Exp $
+# $FreeBSD: src/etc/MAKEDEV,v 1.329 2002/10/04 20:44:46 sam Exp $
 #
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, standard number of units (or close)
@@ -128,6 +128,7 @@
 #	apm	Advanced Power Management BIOS
 #	apmctl	APM BIOS control device
 #	bpf*	packet filter
+#	crypto	crypto interface
 #	speaker	pc speaker
 #	tw*	xten power controller
 #	snd*	various sound cards
@@ -341,6 +342,7 @@
 	sh $0 agpgart					# AGP
  	sh $0 nsmb0					# SMB/CIFS
 	sh $0 ti0 ti1					# ti(4)
+	sh $0 crypto					# crypto
 	;;
 
 # a much restricted set of the above, to save precious i-nodes on the
@@ -1770,6 +1772,11 @@
 	chmod 600 elan-mmcr
 	;;
 
+crypto)
+	mknod crypto c 70 0 root:operator
+	chmod 666 crypto
+	;;
+
 local)
 	umask 0			# XXX should be elsewhere
 	sh $0.local

==== //depot/projects/hammer/etc/mtree/BSD.include.dist#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.57 2002/09/19 08:35:12 truckman Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.58 2002/10/04 20:44:28 sam Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -11,6 +11,8 @@
         scsi
         ..
     ..
+    crypto
+    ..
     dev
         an
         ..

==== //depot/projects/hammer/etc/rc#5 (text+ko) ====

@@ -25,7 +25,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)rc	5.27 (Berkeley) 6/5/91
-# $FreeBSD: src/etc/rc,v 1.320 2002/10/02 00:59:14 dd Exp $
+# $FreeBSD: src/etc/rc,v 1.321 2002/10/03 20:39:29 schweikh Exp $
 #
 
 # System startup script run by init on autoboot
@@ -54,10 +54,10 @@
 # XXX - The only purpose of duplicating it here is to catch rc_ng="YES"
 #
 if [ -r /etc/defaults/rc.conf ]; then
-        . /etc/defaults/rc.conf
-        source_rc_confs
+	. /etc/defaults/rc.conf
+	source_rc_confs
 elif [ -r /etc/rc.conf ]; then
-        . /etc/rc.conf
+	. /etc/rc.conf
 fi
 
 # Diskless setups have to depend on a different mechanism since
@@ -75,9 +75,9 @@
 	load_rc_config 'XXX'
 
 	if [ "$1" = autoboot ]; then
-        	autoboot=yes
+		autoboot=yes
 		_boot="faststart"
-        	rc_fast=yes        # run_rc_command(): do fast booting
+		rc_fast=yes        # run_rc_command(): do fast booting
 	else
 		autoboot=no
 		_boot="start"
@@ -87,7 +87,7 @@
 	files=`rcorder -k ${os} -s nostart /etc/rc.d/* 2>/dev/null`
 
 	for _rc_elem in ${files}; do
-        	run_rc_script ${_rc_elem} ${_boot}
+		run_rc_script ${_rc_elem} ${_boot}
 		# Local FreeBSD hack to reload the rc.conf on
 		# a return status of 2
 		if [ $? -eq 2 ]; then
@@ -158,12 +158,12 @@
 	[Yy][Ee][Ss])
 		case ${dep_val} in
 		[Yy][Ee][Ss])
-		    ;;
+			;;
 		*)
-		    eval ${dep_var}="YES"
-		    echo "DEPENDENCY NOTE: ${dep} will be enabled" \
-			 "to support ${svc}"
-		    ;;
+			eval ${dep_var}="YES"
+			echo "DEPENDENCY NOTE: ${dep} will be enabled" \
+			"to support ${svc}"
+			;;
 		esac
 		;;
 	esac
@@ -545,10 +545,10 @@
 	fi
 	case "`mount -d -a -t ${fstype}`" in
 	*mount_${fstype}*)
-	       echo -n "Mounting ${fsdecr} filesystems:"
-	       mount -a -t ${fstype}
-	       echo '.'
-	       ;;
+		echo -n "Mounting ${fsdecr} filesystems:"
+		mount -a -t ${fstype}
+		echo '.'
+		;;
 	esac
 done
 

==== //depot/projects/hammer/include/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.180 2002/10/01 13:29:45 ru Exp $
+# $FreeBSD: src/include/Makefile,v 1.181 2002/10/04 20:44:26 sam Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -83,7 +83,7 @@
 .endfor
 
 copies:
-.for i in ${LDIRS} ${LSYMSUBDIRS} machine
+.for i in ${LDIRS} ${LSYMSUBDIRS} machine crypto
 	if [ -L ${DESTDIR}/usr/include/$i ]; then \
 		rm -f ${DESTDIR}/usr/include/$i; \
 	fi
@@ -95,6 +95,9 @@
 		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
 		${DESTDIR}/usr/include/$i
 .endfor
+	cd ${.CURDIR}/../sys; \
+		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 opencrypto/*.h \
+		${DESTDIR}/usr/include/crypto
 .if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include)
 	cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \
 		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
@@ -112,6 +115,8 @@
 	rm -rf ${DESTDIR}/usr/include/$i
 	ln -s ../../sys/$i ${DESTDIR}/usr/include/$i
 .endfor
+	rm -rf ${DESTDIR}/usr/include/crypto
+	ln -s ../../sys/opencrypto ${DESTDIR}/usr/include/crypto
 .for i in ${LSYMSUBDIRS}
 	rm -rf ${DESTDIR}/usr/include/$i
 	ln -s ../../../sys/$i ${DESTDIR}/usr/include/$i

==== //depot/projects/hammer/include/string.h#3 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)string.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/string.h,v 1.15 2002/08/21 16:19:55 mike Exp $
+ * $FreeBSD: src/include/string.h,v 1.16 2002/10/03 19:51:04 obrien Exp $
  */
 
 #ifndef _STRING_H_
@@ -68,6 +68,7 @@
 int	 strcmp(const char *, const char *);
 int	 strcoll(const char *, const char *);
 char	*strcpy(char * __restrict, const char * __restrict);
+char	*stpcpy(char *, const char *);
 size_t	 strcspn(const char *, const char *);
 char	*strerror(int);
 size_t	 strlen(const char *);

==== //depot/projects/hammer/include/wchar.h#8 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/include/wchar.h,v 1.31 2002/09/28 07:43:43 tjr Exp $
+ * $FreeBSD: src/include/wchar.h,v 1.32 2002/10/04 03:18:25 tjr Exp $
  */
 
 /*-
@@ -141,6 +141,7 @@
 wchar_t	*wcscat(wchar_t * __restrict, const wchar_t * __restrict);
 wchar_t	*wcschr(const wchar_t *, wchar_t);
 int	wcscmp(const wchar_t *, const wchar_t *);
+int	wcscoll(const wchar_t *, const wchar_t *);
 wchar_t	*wcscpy(wchar_t * __restrict, const wchar_t * __restrict);
 size_t	wcscspn(const wchar_t *, const wchar_t *);
 size_t	wcsftime(wchar_t * __restrict, size_t, const wchar_t * __restrict,
@@ -156,6 +157,7 @@
 	    mbstate_t * __restrict);
 size_t	wcsspn(const wchar_t *, const wchar_t *);
 wchar_t	*wcsstr(const wchar_t * __restrict, const wchar_t * __restrict);
+size_t	wcsxfrm(wchar_t * __restrict, const wchar_t * __restrict, size_t);
 int	wctob(wint_t);
 double	wcstod(const wchar_t * __restrict, wchar_t ** __restrict);
 wchar_t	*wcstok(wchar_t * __restrict, const wchar_t * __restrict,

==== //depot/projects/hammer/lib/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.144 2002/09/19 08:06:23 julian Exp $
+# $FreeBSD: src/lib/Makefile,v 1.145 2002/10/04 13:40:39 phk Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
@@ -25,7 +25,7 @@
 	libncurses libradius librpcsvc libsbuf libtacplus libutil libypclnt \
 	${_compat} libalias libatm ${_libbind} libbz2 libc ${_libc_r} \
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
-	libedit libfetch libform libftpio ${_libio} libipsec \
+	libedit libexpat libfetch libform libftpio ${_libio} libipsec \
 	libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \
 	libnetgraph libopie libpam libpanel libpcap \
 	${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \

==== //depot/projects/hammer/lib/libc/string/Makefile.inc#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.29 2002/09/07 08:16:57 tjr Exp $
+# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.31 2002/10/04 03:18:26 tjr Exp $
 
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/string ${.CURDIR}/../libc/string
 
@@ -7,14 +7,16 @@
 
 # machine-independent string sources
 MISRCS+=bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \
-	memcpy.c memmove.c memset.c rindex.c strcasecmp.c strcat.c strchr.c \
-	strcmp.c strcoll.c strcpy.c strcspn.c strdup.c strerror.c \
+	memcpy.c memmove.c memset.c rindex.c stpcpy.c strcasecmp.c strcat.c \
+	strchr.c strcmp.c strcoll.c strcpy.c strcspn.c strdup.c strerror.c \
 	strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c strncpy.c \
 	strcasestr.c strnstr.c \
 	strpbrk.c strrchr.c strsep.c strsignal.c strspn.c strstr.c strtok.c \
-	strxfrm.c swab.c wcscat.c wcschr.c wcscmp.c wcscpy.c wcscspn.c \
+	strxfrm.c swab.c wcscat.c wcschr.c wcscmp.c wcscoll.c wcscpy.c \
+	wcscspn.c \
 	wcslcat.c wcslcpy.c wcslen.c wcsncat.c wcsncmp.c wcsncpy.c wcspbrk.c \
-	wcsrchr.c wcsspn.c wcsstr.c wcstok.c wcswidth.c wmemchr.c wmemcmp.c \
+	wcsrchr.c wcsspn.c wcsstr.c wcstok.c wcswidth.c wcsxfrm.c wmemchr.c \
+	wmemcmp.c \
 	wmemcpy.c wmemmove.c wmemset.c
 
 
@@ -28,12 +30,13 @@
 	memcmp.3 memcpy.3 memmove.3 memset.3 rindex.3 strcasecmp.3 strcat.3 \
 	strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strdup.3 strerror.3 \
 	string.3 strlcpy.3 strlen.3 strmode.3 strpbrk.3 strrchr.3 strsep.3 \
-	strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3 wcstok.3 wcswidth.3 \
-	wmemchr.3
+	strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3 wcscoll.3 wcstok.3 \
+	wcswidth.3 wcsxfrm.3 wmemchr.3
 
 MLINKS+=strcasecmp.3 strncasecmp.3
 MLINKS+=strcat.3 strncat.3
 MLINKS+=strcmp.3 strncmp.3
+MLINKS+=strcpy.3 stpcpy.3
 MLINKS+=strcpy.3 strncpy.3
 MLINKS+=strerror.3 perror.3 strerror.3 sys_errlist.3 strerror.3 sys_nerr.3
 MLINKS+=strerror.3 strerror_r.3

==== //depot/projects/hammer/lib/libc/string/strcpy.3#3 (text+ko) ====

@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcpy.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/string/strcpy.3,v 1.17 2002/09/06 11:24:06 tjr Exp $
+.\" $FreeBSD: src/lib/libc/string/strcpy.3,v 1.18 2002/10/03 19:39:20 obrien Exp $
 .\"
 .Dd August 9, 2001
 .Dt STRCPY 3
@@ -47,11 +47,14 @@
 .Sh SYNOPSIS
 .In string.h
 .Ft char *
+.Fn stpcpy "char *dst" "const char *src"
+.Ft char *
 .Fn strcpy "char * restrict dst" "const char * restrict src"
 .Ft char *
 .Fn strncpy "char * restrict dst" "const char * restrict src" "size_t len"
 .Sh DESCRIPTION
 The
+.Fn stpcpy ,
 .Fn strcpy
 function
 copies the string
@@ -89,6 +92,12 @@
 functions
 return
 .Fa dst .
+The
+.Fn stpcpy
+function returns a pointer to the terminating 
+.Ql \e0
+character of
+.Fa dst .
 .Sh EXAMPLES
 The following sets
 .Va chararray
@@ -178,3 +187,14 @@
 functions
 conform to
 .St -isoC .
+The
+.Fn stpcpy
+function is an MS-DOS and GNUism.
+.Fn stpcpy
+conforms to no standard.
+.Sh HISTORY
+The
+.Fn stpcpy
+function first appeared in
+.Fx 4.4 ,
+comming from 1998-ventage Linux.

==== //depot/projects/hammer/lib/libc/string/string.3#2 (text+ko) ====

@@ -32,12 +32,13 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)string.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/lib/libc/string/string.3,v 1.11 2001/10/01 16:09:00 ru Exp $
+.\" $FreeBSD: src/lib/libc/string/string.3,v 1.12 2002/10/03 19:39:20 obrien Exp $
 .\"
 .Dd December 11, 1993
 .Dt STRING 3
 .Os
 .Sh NAME
+.Nm stpcpy ,
 .Nm strcat ,
 .Nm strncat ,
 .Nm strchr ,
@@ -64,6 +65,8 @@
 .Sh SYNOPSIS
 .In string.h
 .Ft char *
+.Fn stpcpy "char *dst" "const char *src"
+.Ft char *
 .Fn strcat "char *s" "const char * append"
 .Ft char *
 .Fn strncat "char *s" "const char *append" "size_t count"
@@ -120,6 +123,7 @@
 .Xr bstring 3 ,
 .Xr index 3 ,
 .Xr rindex 3 ,
+.Xr stpcpy 3 ,
 .Xr strcasecmp 3 ,
 .Xr strcat 3 ,
 .Xr strchr 3 ,

==== //depot/projects/hammer/lib/libc/sys/sem.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc/sys/sem.c,v 1.1 2002/09/19 01:14:08 alfred Exp $
+ * $FreeBSD: src/lib/libc/sys/sem.c,v 1.2 2002/10/04 21:32:00 mike Exp $
  */
 
 #include <stdlib.h>
@@ -333,7 +333,7 @@
 }
 
 int
-sem_getvalue(sem_t *sem, int *sval)
+sem_getvalue(sem_t * __restrict sem, int * __restrict sval)
 {
 	int	retval;
 

==== //depot/projects/hammer/lib/libc/sys/sigaction.2#4 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sigaction.2	8.2 (Berkeley) 4/3/94
-.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.39 2002/10/02 10:53:43 robert Exp $
+.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.40 2002/10/04 11:30:59 robert Exp $
 .\"
 .Dd April 3, 1994
 .Dt SIGACTION 2
@@ -57,10 +57,8 @@
 #define	sa_sigaction	__sigaction_u.__sa_sigaction
 .Ed
 .Ft int
-.Fo sigaction
-.Fa "int sig" "const struct sigaction * restrict act"
-.Fa "struct sigaction * restrict oact"
-.Fc
+.Fn "int sig" "const struct sigaction * restrict act" \
+    "struct sigaction * restrict oact"
 .Sh DESCRIPTION
 The system defines a set of signals that may be delivered to a process.
 Signal delivery resembles the occurrence of a hardware interrupt:

==== //depot/projects/hammer/lib/libc/sys/sigprocmask.2#3 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sigprocmask.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/sys/sigprocmask.2,v 1.14 2002/10/02 10:53:43 robert Exp $
+.\" $FreeBSD: src/lib/libc/sys/sigprocmask.2,v 1.15 2002/10/04 11:31:00 robert Exp $
 .\"
 .Dd June 4, 1993
 .Dt SIGPROCMASK 2
@@ -43,9 +43,8 @@
 .Sh SYNOPSIS
 .In signal.h
 .Ft int
-.Fo sigprocmask
-.Fa "int how" "const sigset_t * restrict set" "sigset_t * restrict oset"
-.Fc
+.Fn sigprocmask "int how" "const sigset_t * restrict set" \
+    "sigset_t * restrict oset"
 .Sh DESCRIPTION
 The
 .Fn sigprocmask

==== //depot/projects/hammer/lib/libc_r/man/sem_getvalue.3#2 (text+ko) ====

@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc_r/man/sem_getvalue.3,v 1.9 2001/10/01 16:09:09 ru Exp $
+.\" $FreeBSD: src/lib/libc_r/man/sem_getvalue.3,v 1.10 2002/10/04 21:32:00 mike Exp $
 .Dd February 15, 2000
 .Dt SEM_GETVALUE 3
 .Os
@@ -37,7 +37,7 @@
 .Sh SYNOPSIS
 .In semaphore.h
 .Ft int
-.Fn sem_getvalue "sem_t *sem" "int *sval"
+.Fn sem_getvalue "sem_t * restrict sem" "int * restrict sval"
 .Sh DESCRIPTION
 The
 .Fn sem_getvalue

==== //depot/projects/hammer/lib/libdisk/create_chunk.c#3 (text+ko) ====

@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.67 2002/10/01 07:24:51 phk Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.68 2002/10/04 18:10:39 phk Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,170 +37,170 @@
 static int
 isDebug()
 {
-    static int debug = 0;	/* Allow debugger to tweak it */
+	static int debug = 0;	/* Allow debugger to tweak it */
 
-    return debug;
+	return debug;
 }
 
 /* Write something to the debugging port */
 static void
 msgDebug(char *fmt, ...)
 {
-    va_list args;
-    char *dbg;
-    static int DebugFD = -1;
+	va_list args;
+	char *dbg;
+	static int DebugFD = -1;
 
-    if (DebugFD == -1)
-	DebugFD = open(_PATH_DEV"ttyv1", O_RDWR);
-    dbg = (char *)alloca(FILENAME_MAX);
-    strcpy(dbg, "DEBUG: ");
-    va_start(args, fmt);
-    vsnprintf((char *)(dbg + strlen(dbg)), FILENAME_MAX, fmt, args);
-    va_end(args);
-    write(DebugFD, dbg, strlen(dbg));
+	if (DebugFD == -1)
+		DebugFD = open(_PATH_DEV"ttyv1", O_RDWR);
+	dbg = (char *)alloca(FILENAME_MAX);
+	strcpy(dbg, "DEBUG: ");
+	va_start(args, fmt);
+	vsnprintf((char *)(dbg + strlen(dbg)), FILENAME_MAX, fmt, args);
+	va_end(args);
+	write(DebugFD, dbg, strlen(dbg));
 }
 
 int
 Fixup_FreeBSD_Names(struct disk *d, struct chunk *c)
 {
-    struct chunk *c1, *c3;
-    int j;
+	struct chunk *c1, *c3;
+	int j;
     
-    if (!strcmp(c->name, "X")) return 0;
+	if (!strcmp(c->name, "X")) return 0;
     
-    /* reset all names to "X" */
-    for (c1 = c->part; c1; c1 = c1->next) {
-	c1->oname = c1->name;
-	c1->name = malloc(12);
-	if(!c1->name) return -1;
-	strcpy(c1->name,"X");
-    }
+	/* reset all names to "X" */
+	for (c1 = c->part; c1; c1 = c1->next) {
+		c1->oname = c1->name;
+		c1->name = malloc(12);
+		if(!c1->name) return -1;
+		strcpy(c1->name,"X");
+	}
     
-    /* Allocate the first swap-partition we find */
-    for (c1 = c->part; c1; c1 = c1->next) {
-	if (c1->type == unused) continue;
-	if (c1->subtype != FS_SWAP) continue;
-	sprintf(c1->name, "%s%c", c->name, SWAP_PART + 'a');
-	break;
-    }
+	/* Allocate the first swap-partition we find */
+	for (c1 = c->part; c1; c1 = c1->next) {
+		if (c1->type == unused) continue;
+		if (c1->subtype != FS_SWAP) continue;
+		sprintf(c1->name, "%s%c", c->name, SWAP_PART + 'a');
+		break;
+	}
     
-    /* Allocate the first root-partition we find */
-    for (c1 = c->part; c1; c1 = c1->next) {
-	if (c1->type == unused) continue;
-	if (!(c1->flags & CHUNK_IS_ROOT)) continue;
-	sprintf(c1->name, "%s%c", c->name, 0 + 'a');
-	break;
-    }
+	/* Allocate the first root-partition we find */
+	for (c1 = c->part; c1; c1 = c1->next) {
+		if (c1->type == unused) continue;
+		if (!(c1->flags & CHUNK_IS_ROOT)) continue;
+		sprintf(c1->name, "%s%c", c->name, 0 + 'a');
+		break;
+	}
     
-    /* Try to give them the same as they had before */
-    for (c1 = c->part; c1; c1 = c1->next) {
-	if (strcmp(c1->name, "X")) continue;
-	for(c3 = c->part; c3 ; c3 = c3->next)
-	    if (c1 != c3 && !strcmp(c3->name, c1->oname)) {
-		goto newname;
-	    }
-	strcpy(c1->name, c1->oname);
-    newname: ;
-    }
+	/* Try to give them the same as they had before */
+	for (c1 = c->part; c1; c1 = c1->next) {
+		if (strcmp(c1->name, "X")) continue;
+		for(c3 = c->part; c3 ; c3 = c3->next)
+			if (c1 != c3 && !strcmp(c3->name, c1->oname)) {
+				    goto newname;
+			}
+		strcpy(c1->name, c1->oname);
+		newname: ;
+	}
     
     
-    /* Allocate the rest sequentially */
-    for (c1 = c->part; c1; c1 = c1->next) {
-	const char order[] = "efghabd";
-	if (c1->type == unused) continue;
-	if (strcmp("X", c1->name)) continue;
+	/* Allocate the rest sequentially */
+	for (c1 = c->part; c1; c1 = c1->next) {
+		const char order[] = "efghabd";
+		if (c1->type == unused) continue;
+		if (strcmp("X", c1->name)) continue;
 	
-	for(j = 0; j < strlen(order); j++) {
-	    sprintf(c1->name, "%s%c", c->name, order[j]);
-	    for(c3 = c->part; c3 ; c3 = c3->next)
-		if (c1 != c3 && !strcmp(c3->name, c1->name))
-		    goto match;
-	    break;
-	match:
-	    strcpy(c1->name, "X");
-	    continue;
+		for(j = 0; j < strlen(order); j++) {
+			sprintf(c1->name, "%s%c", c->name, order[j]);
+			for(c3 = c->part; c3 ; c3 = c3->next)
+				if (c1 != c3 && !strcmp(c3->name, c1->name))
+					goto match;
+			break;
+		    match:
+			strcpy(c1->name, "X");
+			continue;
+		}
+	}
+	for (c1 = c->part; c1; c1 = c1->next) {
+		free(c1->oname);
+		c1->oname = 0;
 	}
-    }
-    for (c1 = c->part; c1; c1 = c1->next) {
-	free(c1->oname);
-	c1->oname = 0;
-    }
-    return 0;
+	return 0;
 }
 
 int
 Fixup_Extended_Names(struct disk *d, struct chunk *c)
 {
-    struct chunk *c1;
-    int j=5;
+	struct chunk *c1;
+	int j=5;
     
-    for (c1 = c->part; c1; c1 = c1->next) {
-	if (c1->type == unused) continue;
-	free(c1->name);
-	c1->name = malloc(12);
-	if(!c1->name) return -1;
-	sprintf(c1->name, "%ss%d", d->chunks->name, j++);
-	if (c1->type == freebsd)
-	    if (Fixup_FreeBSD_Names(d, c1) != 0)
-		return -1;
-    }
-    return 0;
+	for (c1 = c->part; c1; c1 = c1->next) {
+		if (c1->type == unused) continue;
+		free(c1->name);
+		c1->name = malloc(12);
+		if(!c1->name) return -1;
+		sprintf(c1->name, "%ss%d", d->chunks->name, j++);
+		if (c1->type == freebsd)
+			if (Fixup_FreeBSD_Names(d, c1) != 0)
+				return -1;
+	}
+	return 0;
 }
 
 int
 Fixup_Names(struct disk *d)
-{
-    struct chunk *c1, *c2;
-    int i;
+    {
+	struct chunk *c1, *c2;
+	int i;
+	#ifdef __i386__
+	struct chunk *c3;
+	int j;
+	#endif
+
+	c1 = d->chunks;
+	for(i=1,c2 = c1->part; c2 ; c2 = c2->next) {
+		c2->flags &= ~CHUNK_BSD_COMPAT;
+		if (c2->type == unused)
+			continue;
+		if (strcmp(c2->name, "X"))
+			continue;
 #ifdef __i386__
-    struct chunk *c3;
-    int j;
-#endif
-    
-    c1 = d->chunks;
-    for(i=1,c2 = c1->part; c2 ; c2 = c2->next) {
-	c2->flags &= ~CHUNK_BSD_COMPAT;
-	if (c2->type == unused)
-	    continue;
-	if (strcmp(c2->name, "X"))
-	    continue;
-#ifdef __i386__
-	c2->oname = malloc(12);
-	if(!c2->oname) return -1;
-	for(j = 1; j <= NDOSPART; j++) {
-	    sprintf(c2->oname, "%ss%d", c1->name, j);
-	    for(c3 = c1->part; c3; c3 = c3->next)
-		if (c3 != c2 && !strcmp(c3->name, c2->oname))
-		    goto match;
-	    free(c2->name);
-	    c2->name = c2->oname;
-	    c2->oname = 0;
-	    break;
-	match:
-	    continue;
-	}
-	if (c2->oname)
-	    free(c2->oname);
+		c2->oname = malloc(12);
+		if(!c2->oname) return -1;
+		for(j = 1; j <= NDOSPART; j++) {
+			sprintf(c2->oname, "%ss%d", c1->name, j);
+			for(c3 = c1->part; c3; c3 = c3->next)
+				if (c3 != c2 && !strcmp(c3->name, c2->oname))
+					goto match;
+			free(c2->name);
+			c2->name = c2->oname;
+			c2->oname = 0;
+			break;
+		match:
+			continue;
+		}
+		if (c2->oname)
+			free(c2->oname);
 #else
-	free(c2->name);
-	c2->name = strdup(c1->name);
+		free(c2->name);
+		c2->name = strdup(c1->name);
 #endif /*__i386__*/
-    }
-    for(c2 = c1->part; c2; c2 = c2->next) {
-	if (c2->type == freebsd) {
-	    c2->flags |= CHUNK_BSD_COMPAT;
-	    break;
+	}
+	for(c2 = c1->part; c2; c2 = c2->next) {
+		if (c2->type == freebsd) {
+			c2->flags |= CHUNK_BSD_COMPAT;
+			break;
+		}
 	}
-    }
-    for(c2 = c1->part; c2; c2 = c2->next) {
-	if (c2->type == freebsd)
-	    Fixup_FreeBSD_Names(d, c2);
+	for(c2 = c1->part; c2; c2 = c2->next) {
+		if (c2->type == freebsd)
+			Fixup_FreeBSD_Names(d, c2);
 #ifndef PC98
-	if (c2->type == extended)
-	    Fixup_Extended_Names(d, c2);
+		if (c2->type == extended)
+			Fixup_Extended_Names(d, c2);
 #endif
-    }
-    return 0;
+	}
+	return 0;
 }
 
 int

>>> TRUNCATED FOR MAIL (1000 lines) <<<

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message