PERFORCE change 84288 for review

Robert Watson rwatson at FreeBSD.org
Mon Sep 26 12:38:02 GMT 2005


http://perforce.freebsd.org/chv.cgi?CH=84288

Change 84288 by rwatson at rwatson_zoo on 2005/09/26 12:37:50

	Integrate TrustedBSD base branch:
	
	- fortune cleanup, doc and other tweaks, many minor (and less minor)
	  bug fixes.
	- VFS_LOCK_GIANT.9  
	- bus/resource API simplification
	- less pc98 pccard
	- much devfs locking fixage
	- more fifofs cleanup and fixage
	- extended attribute system call mpsafety
	- more tprintf/uprintf Giant tweaks
	- more namei mpsafety
	- route locking fixes for route changes
	- more nanobsd
	- UFS bug fixes

Affected files ...

.. //depot/projects/trustedbsd/base/bin/csh/config_p.h#2 integrate
.. //depot/projects/trustedbsd/base/contrib/libpcap/rawss7.h#3 delete
.. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#31 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/geli#2 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/pf#8 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/pflog#5 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#43 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#15 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#5 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#12 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_private.h#11 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#9 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_data_into_fd.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_fd.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_file.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_bzip2.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#8 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_zip.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_cpio.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#13 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ustar.c#7 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ssh/pam_ssh.8#9 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ssh/pam_ssh.c#13 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_init.c#17 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#28 integrate
.. //depot/projects/trustedbsd/base/lib/libufs/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#4 integrate
.. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#32 integrate
.. //depot/projects/trustedbsd/base/sbin/kldstat/kldstat.8#5 integrate
.. //depot/projects/trustedbsd/base/sbin/kldstat/kldstat.c#7 integrate
.. //depot/projects/trustedbsd/base/sbin/route/route.c#14 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/ed.4#12 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/fe.4#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/sn.4#7 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/Makefile#45 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/VFS_LOCK_GIANT.9#1 branch
.. //depot/projects/trustedbsd/base/share/man/man9/namei.9#8 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/sgmap.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#37 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/isa/isa.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcpcia.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/pci/apecs.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/pci/cia.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/pci/pcibus.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/pci/t2.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/pci/tsunami.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/pci/tsunami_pci.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/tlsb/dwlpx.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/nexus.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/nexus.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0_irqhandler.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0_var.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321_pci.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321var.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq80321.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/obio.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/obiovar.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/common/help.common#15 integrate
.. //depot/projects/trustedbsd/base/sys/boot/common/loader.8#31 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/bootinfo.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#28 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/boot2.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/bootinfo.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/libi386.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/loader/main.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/bootinfo.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/powerpc/loader/metadata.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/metadata.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#64 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.pc98#48 integrate
.. //depot/projects/trustedbsd/base/sys/dev/adlink/adlink.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aic/aic_pccard.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahd_pci.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_pci.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/dev/an/if_an_pccard.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-card.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/dev/awi/if_awi_pccard.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cs/if_cs_pccard.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_pccard.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#43 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ep/if_ep.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/exca/exca.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fe/if_fe.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fe/if_fe_pccard.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#47 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ieee488/pcii.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ieee488/tnt4882.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ieee488/upd7210.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ieee488/upd7210.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ips/ips.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ips/ips.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ips/ips_commands.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ips/ips_disk.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ips/ips_ioctl.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/joy/joy_pccard.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ncv/ncr53c500_pccard.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/nsp/nsp_pccard.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccard/card_if.m#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard_device.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#39 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccard/pccardvar.h#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#41 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#43 integrate
.. //depot/projects/trustedbsd/base/sys/dev/puc/puc.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral_pccard.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ray/if_ray.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sn/if_snreg.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/snc/if_snc_pccard.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/stg/tmc18c30_pccard.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus_pccard.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/ehcivar.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/if_cdce.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/if_cdcereg.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/slhci_pccard.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uvscom.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pccard.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wivar.h#17 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs.h#14 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_rule.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vfsops.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/isa.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#49 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_shutdown.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_bus.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_rman.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_lookup.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#63 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/net/route.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#42 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#27 integrate
.. //depot/projects/trustedbsd/base/sys/pccard/mecia.c#5 delete
.. //depot/projects/trustedbsd/base/sys/pccard/pccard.c#19 delete
.. //depot/projects/trustedbsd/base/sys/pccard/pccard_beep.c#4 delete
.. //depot/projects/trustedbsd/base/sys/pccard/pccard_nbk.c#10 delete
.. //depot/projects/trustedbsd/base/sys/pccard/pcic.c#15 delete
.. //depot/projects/trustedbsd/base/sys/pccard/pcic_isa.c#7 delete
.. //depot/projects/trustedbsd/base/sys/pccard/pcic_pci.c#17 delete
.. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#43 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_sisreg.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/sys/bus.h#17 integrate
.. //depot/projects/trustedbsd/base/sys/sys/rman.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/sys/types.h#27 integrate
.. //depot/projects/trustedbsd/base/sys/tools/bus_macro.sh#1 branch
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_inode.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#41 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_mmap.c#31 integrate
.. //depot/projects/trustedbsd/base/tools/tools/nanobsd/Files/root/change_password#3 integrate
.. //depot/projects/trustedbsd/base/tools/tools/nanobsd/Files/root/save_sshkeys#3 integrate
.. //depot/projects/trustedbsd/base/tools/tools/nanobsd/Files/root/updatep#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/nanobsd/Files/root/updatep1#2 integrate
.. //depot/projects/trustedbsd/base/tools/tools/nanobsd/Files/root/updatep2#2 integrate
.. //depot/projects/trustedbsd/base/tools/tools/nanobsd/make.conf#12 integrate
.. //depot/projects/trustedbsd/base/tools/tools/nanobsd/nanobsd.sh#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.birthday#16 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#42 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/sed/main.c#13 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar_platform.h#10 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/configure.ac.in#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/getdate.y#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/write.c#10 integrate
.. //depot/projects/trustedbsd/base/usr.bin/vgrind/tmac.vgrind#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/asf/asf.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/show.c#11 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/match.c#8 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/portsnap/phttpget/phttpget.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/ppp.8.m4#23 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/watch/watch.c#13 integrate

Differences ...

==== //depot/projects/trustedbsd/base/bin/csh/config_p.h#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/bin/csh/config_p.h,v 1.11 2005/04/24 19:51:57 mp Exp $ */
+/* $FreeBSD: src/bin/csh/config_p.h,v 1.12 2005/09/22 18:32:53 mp Exp $ */
 /*
  * config.h -- configure various defines for tcsh
  *
@@ -98,6 +98,7 @@
 #define SYSMALLOC
 /* Use LC_MESSAGES locale category to open the message catalog */
 #define MCLoadBySet NL_CAT_LOCALE
+#define BUFSIZE 8192
 #endif
 
 #if defined(__bsdi__)

==== //depot/projects/trustedbsd/base/etc/rc.d/Makefile#31 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.55 2005/08/14 18:25:35 pjd Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.56 2005/09/23 16:54:09 wollman Exp $
 
 FILES=	DAEMON LOGIN NETWORKING SERVERS \
 	abi accounting addswap adjkerntz amd \
@@ -31,7 +31,7 @@
 	ramdisk ramdisk-own random rarpd rcconf.sh resolv root \
 	route6d routed routing rpcbind rtadvd rwho \
 	savecore securelevel sendmail \
-	serial sppp sshd swap1 \
+	serial sppp swap1 \
 	syscons sysctl syslogd \
 	timed tmp \
 	ugidfw usbd \
@@ -39,6 +39,11 @@
 	watchdogd wpa_supplicant \
 	ypbind yppasswdd ypserv \
 	ypset ypupdated ypxfrd
+
+.if !defined(NO_OPENSSH)
+FILES+=	sshd
+.endif
+
 FILESDIR=	/etc/rc.d
 FILESMODE=	${BINMODE}
 

==== //depot/projects/trustedbsd/base/etc/rc.d/geli#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/geli,v 1.2 2005/08/14 22:16:34 pjd Exp $
+# $FreeBSD: src/etc/rc.d/geli,v 1.3 2005/09/23 23:53:35 pjd Exp $
 #
 
 # PROVIDE: disks
@@ -46,10 +46,7 @@
 		return
 	fi
 
-	geli load >/dev/null 2>&1
-	if ! kldstat -m g_eli >/dev/null 2>&1; then
-		err 1 'geom_eli module failed to load.'
-	fi
+	kldstat -q -m g_eli || geli load || err 1 'geom_eli module failed to load.'
 
 	if [ -z "${geli_tries}" ]; then
 		if [ -n "${geli_attach_attempts}" ]; then

==== //depot/projects/trustedbsd/base/etc/rc.d/pf#8 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/pf,v 1.7 2005/04/04 23:06:10 seanc Exp $
+# $FreeBSD: src/etc/rc.d/pf,v 1.8 2005/09/24 15:57:17 pjd Exp $
 #
 
 # PROVIDE: pf
@@ -30,8 +30,8 @@
 pf_prestart()
 {
 	# load pf kernel module if needed
-	if ! kldstat -v | grep -q pf\$; then
-		if kldload pf; then
+	if ! kldstat -q -m pf ; then
+		if kldload pf ; then
 			info 'pf module loaded.'
 		else
 			err 1 'pf module failed to load.'
@@ -84,10 +84,7 @@
 pf_resync()
 {
 	# Don't resync if pf is not loaded
-	if ! kldstat -v | grep -q pf\$ ; then
-		 return
-	fi
-	${pf_program:-/sbin/pfctl} -f "${pf_rules}" ${pf_flags}
+	kldstat -q -m pf && ${pf_program:-/sbin/pfctl} -f "${pf_rules}" ${pf_flags}
 }
 
 pf_status()

==== //depot/projects/trustedbsd/base/etc/rc.d/pflog#5 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/pflog,v 1.5 2005/01/16 03:12:03 obrien Exp $
+# $FreeBSD: src/etc/rc.d/pflog,v 1.6 2005/09/24 15:57:17 pjd Exp $
 #
 
 # PROVIDE: pflog
@@ -26,7 +26,7 @@
 pflog_prestart()
 {
 	# load pflog kernel module if needed
-	if ! kldstat -v | grep -q pflog\$; then
+	if ! kldstat -q -m pflog; then
 		if kldload pf; then
 			info 'pflog module loaded.'
 		else

==== //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#43 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.190 2005/09/10 08:27:07 schweikh Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.192 2005/09/23 12:15:52 krion Exp $
 
 %
 =======================================================================
@@ -1106,7 +1106,7 @@
 %
 	A novel approach is to remove all power from the system, which
 removes most system overhead so that resources can be fully devoted to
-doing nothing.  Benchmarks on  this technique are promising; tremendous
+doing nothing.  Benchmarks on this technique are promising; tremendous
 amounts of nothing can be produced in this manner.  Certain hardware
 limitations can limit the speed of this method, especially in the
 larger systems which require a more involved & less efficient
@@ -1904,7 +1904,7 @@
 and waist, that it is almost impossible to reach one's shoelaces.  And the
 sizes don't run the way they used to.  The 12's and 14's are so much smaller.
 	Even people are changing.  They are so much younger than they used to
-be when I was their age.  On  the other hand people my age are so much older
+be when I was their age.  On the other hand people my age are so much older
 than I am.
 	I ran into an old classmate the other day and she has aged so much
 that she didn't recognize me.
@@ -2227,7 +2227,7 @@
 	"How many people work here?"
 	"Oh, about half."
 %
-	How many seconds are there in a year?  If I tell you there  are
+	How many seconds are there in a year?  If I tell you there are
 3.155  x  10^7, you won't even try to remember it.  On the other hand, who
 could forget that, to within half a percent, pi seconds is a nanocentury.
 		-- Tom Duff, Bell Labs
@@ -3040,7 +3040,7 @@
 	Never ask if your lover has had therapy.  Only people who have had
 therapy ask if people have had therapy.
 	Don't ask about plaster casts of male sex organs marked JIMI, JIM, etc.
-Assume that she bought them at a flea  market.
+Assume that she bought them at a flea market.
 		-- James Peterson and Kate Nolan
 %
 	NEW YORK-- Kraft Foods, Inc. announced today that its board of
@@ -4983,14 +4983,6 @@
 there is change.
 		-- Jim Starlin, "Captain Marvel", #29
 %
-	"Why did you spend so much time parked in that fellow's car last
-night?" demanded the irate mother.
-"I could hear the giggling and squealing for a good half hour."
-	"But, Mom," answered her daughter, "if a fellow takes you to the
-movies you ought to at least kiss him good night."
-	"I thought you went to the Stork Club?" countered the mother.
-	"We did."
-%
 	Will Rogers, having paid too much income tax one year, tried in
 vain to claim a rebate.  His numerous letters and queries remained
 unanswered.  Eventually the form for the next year's return arrived.  In
@@ -5473,7 +5465,7 @@
 %
 "... And remember: if you don't like the news, go out and make some of
 your own."
-        	-- "Scoop" Nisker, KFOG radio reporter
+		-- "Scoop" Nisker, KFOG radio reporter
 		   Preposterous Words
 %
 ... Another writer again agreed with all my generalities, but said that as an
@@ -6072,9 +6064,9 @@
 	(6)  Fungus trellis
 	(7)  False eyelashes
 	(8)  Prosthetic dog claws
-        .
-        .
-        .
+	.
+	.
+	.
 	(99)  Window garden harrow (pulled behind Tonka tractors)
 	(100) Killer velcro
 	(101) Currency
@@ -6250,7 +6242,7 @@
 You patch a bug, and dump it again:
 101 blocks of crud on the disk!
 %
-A  truly great man will neither trample on a worm nor sneak to an emperor.
+A truly great man will neither trample on a worm nor sneak to an emperor.
 		-- Ben Franklin
 %
 A baby is an alimentary canal with a loud voice
@@ -6633,7 +6625,7 @@
 		scope!
 Hacker:		So call it 'previous'.
 
-And then the CS Student was enlightened. 
+And then the CS Student was enlightened.
 %
 A computer science student on an exam:
 
@@ -7103,7 +7095,7 @@
 A good sysadmin always carries around a few feet of fiber. If he ever
 gets lost, he simply drops the fiber on the ground, waits ten minutes,
 then asks the backhoe operator for directions.
-                -- Bill Bradford <mrbill at mrbill.net>
+		-- Bill Bradford <mrbill at mrbill.net>
 %
 A GOOD WAY TO THREATEN somebody is to light a stick of dynamite.  Then you
 call the guy and hold the burning fuse to the phone.  "Hear that?" you say.
@@ -7257,7 +7249,7 @@
 O is for Olive, run through with an awl, P is for Prue, trampled flat in a brawl
 Q is for Quinton who sank in a mire, R is for Rhoda, consumed by a fire.
 S is for Susan who parished of fits, T is for Titas who flew into bits.
-U is for Una  who slipped down a drain, V is for Victor, squashed under a train.
+U is for Una who slipped down a drain, V is for Victor, squashed under a train.
 W is for Winie, embedded in ice, X is for Xercies, devoured by mice.
 Y is for Yoric whose head was bashed in, Z is for Zilla who drank too much gin.
 		-- Edward Gorey "The Gastly Crumb Tines"
@@ -9064,7 +9056,7 @@
 %
 According to a recent and unscientific national survey, smiling is something
 everyone should do at least 6 times a day.  In an effort to increase the
-national average  (the US ranks third among the world's superpowers in
+national average (the US ranks third among the world's superpowers in
 smiling), Xerox has instructed all personnel to be happy, effervescent, and
 most importantly, to smile.  Xerox employees agree, and even feel strongly
 that they can not only meet but surpass the national average...  except for
@@ -9359,7 +9351,7 @@
 After his legs had been broken in an accident, Mr. Miller sued for damages,
 claiming that he was crippled and would have to spend the rest of his life
 in a wheelchair.  Although the insurance-company doctor testified that his
-bones had healed properly and that he was fully capable  of walking, the
+bones had healed properly and that he was fully capable of walking, the
 judge decided for the plaintiff and awarded him $500,000.
 	When he was wheeled into the insurance office to collect his check,
 Miller was confronted by several executives.  "You're not getting away with
@@ -9882,7 +9874,7 @@
 A light from the shadows shall spring;
 Renewed shall be blade that was broken,
 The crownless again shall be king.
-	        -- J. R. R. Tolkien
+		-- J. R. R. Tolkien
 %
 All the big corporations depreciate their possessions, and you can,
 too, provided you use them for business purposes.  For example, if you
@@ -11090,7 +11082,7 @@
 explanation, and many men and women have acquired a reputation for
 intelligence who know only this word and have used it in place of
 thought on every occasion."
-                -- Chuck Jones (Warner Bros. animation director.)
+		-- Chuck Jones (Warner Bros. animation director.)
 %
 Anyone stupid enough to be caught by the police is probably guilty.
 %
@@ -11973,7 +11965,7 @@
 you're smart, just don't start.  Remember, if any weirdo offers you
 some UNIX,
 
-        Just Say No!
+	Just Say No!
 %
 At first sight, the idea of any rules or principles being superimposed on
 the creative mind seems more likely to hinder than to help, but this is
@@ -12155,7 +12147,7 @@
 Back in the early 60's, touch tone phones only had 10 buttons.  Some
 military versions had 16, while the 12 button jobs were used only by people
 who had "diva" (digital inquiry, voice answerback) systems -- mainly banks.
-Since in those days, only Western Electric  made "data sets" (modems) the
+Since in those days, only Western Electric made "data sets" (modems) the
 problems of terminology were all Bell System.  We used to struggle with
 written descriptions of dial pads that were unfamiliar to most people
 (most phones were rotary then.)  Partly in jest, some AT&T engineering
@@ -12494,7 +12486,7 @@
 Behind every successful man you'll find a woman with nothing to wear.
 %
 Behold the fool saith, "Put not all thine eggs in the one basket" -- which
-is but a manner of saying,  "Scatter your money and  your attention"; but
+is but a manner of saying,  "Scatter your money and your attention"; but
 the wise man saith, "Put all your eggs in the one basket and -- watch that
 basket!"
 		-- Mark Twain
@@ -14775,15 +14767,15 @@
 %
 "Congratulations!
 
-Some products leave home silently, some go kicking and screaming.  If 
-v1.0 was the first born who came downstairs with shoes untied missing 
-a sock and a belt, then this one was a full fledged punk rocker 
-with neon hair and multiple piercings.  I believe we squeezed it into 
-a suit and tie and brought its color back to an earth tone before it 
+Some products leave home silently, some go kicking and screaming.  If
+v1.0 was the first born who came downstairs with shoes untied missing
+a sock and a belt, then this one was a full fledged punk rocker
+with neon hair and multiple piercings.  I believe we squeezed it into
+a suit and tie and brought its color back to an earth tone before it
 left."
 
-		-- An HP engineering project manager who shall remain 
-		   nameless to the development team after releasing 
+		-- An HP engineering project manager who shall remain
+		   nameless to the development team after releasing
 		   the second version of their product.
 %
 Conjecture: All odd numbers are prime.
@@ -17861,7 +17853,7 @@
 ....
 - none of these should have made it to customers.  BUT you could loosen the
 screws and lift system board at fan end while powering on to see if OCP
-comes up - this is not recommended unless you have three hands. 
+comes up - this is not recommended unless you have three hands.
 %
 Excess on occasion is exhilarating.  It prevents moderation from
 acquiring the deadening effect of a habit.
@@ -19985,8 +19977,8 @@
 %
 From Italian tourist guide:
 
-        "Non stop trains to Roma Termini Station leave from 7.38
-        a.m. to 10.08 p.m., hourly."
+	"Non stop trains to Roma Termini Station leave from 7.38
+	 a.m. to 10.08 p.m., hourly."
 %
 From listening comes wisdom and from speaking repentance.
 %
@@ -20393,7 +20385,7 @@
 Give a small boy a hammer and he will find
 that everything he encounters needs pounding.
 %
-Give a woman an inch  and she'll park a car in it.
+Give a woman an inch and she'll park a car in it.
 %
 Give all orders verbally.  Never write anything down
 that might go into a "Pearl Harbor File".
@@ -21164,8 +21156,8 @@
 %
 Hacker's Guide To Cooking:
 2 pkg. cream cheese (the mushy white stuff in silver wrappings that doesn't
-	really  come from Philadelphia after all; anyway, about 16 oz.)
-1 tsp. vanilla  extract  (which is more alcohol than vanilla and pretty
+	really come from Philadelphia after all; anyway, about 16 oz.)
+1 tsp. vanilla extract (which is more alcohol than vanilla and pretty
 	strong so this part you *GOTTA* measure)
 1/4 cup sugar (but honey works fine too)
 8 oz. Cool Whip (the fluffy stuff devoid of nutritional value that you
@@ -21177,10 +21169,10 @@
 	beater if you have a cat(1) that can climb wall(1s) to lick it off
 	the ceiling(3m).
 "Pour into a graham cracker crust..."  Aha, the BUGS section at last.  You
-	just happened  to have a GCC sitting around under /etc/food, right?
+	just happened to have a GCC sitting around under /etc/food, right?
 	If not, don't panic(8), merely crumble a rand(3m) handful of innocent
 	GCs into a suitable tempfile and mix in some melted butter.
-"...and  refrigerate for an hour."  Leave the  recipe's  stdout in a fridge
+"...and refrigerate for an hour."  Leave the recipe's stdout in a fridge
 	for 3.6E6 milliseconds while you work on cleaning up stderr, and
 	by time out your cheesecake will be ready for stdin.
 %
@@ -23101,7 +23093,7 @@
 %
 Hydrogen: A colorless, odorless, lighter than air gas which, given
 time, turns into people.
-                -- Harlow Shapley
+		-- Harlow Shapley
 %
 I:
 	The best way to make a silk purse from a sow's ear is to begin
@@ -23599,7 +23591,7 @@
 		-- Strange de Jim
 %
 I didn't do it! Nobody saw me do it! Can't prove anything!
-                -- Bart Simpson
+		-- Bart Simpson
 %
 I didn't get sophisticated -- I just got tired.
 But maybe that's what sophisticated is -- being tired.
@@ -24839,7 +24831,7 @@
 %
 I predict that today will be remembered until tomorrow!
 %
-I prefer rogues to imbeciles  because they sometimes take a rest.
+I prefer rogues to imbeciles because they sometimes take a rest.
 		-- Alexandre Dumas the Younger
 %
 I prefer the most unjust peace to the most righteous war.
@@ -24965,7 +24957,7 @@
 woman should marry -- and no man.
 		-- Benjamin Disraeli, "Lothair"
 %
-I reverently believe that the maker who made us all  makes everything in New
+I reverently believe that the maker who made us all makes everything in New
 England, but the weather.  I don't know who makes that, but I think it must be
 raw apprentices in the weather-clerks factory who experiment and learn how, in
 New England, for board and clothes, and then are promoted to make weather for
@@ -26079,10 +26071,10 @@
 %
 Idleness is the holiday of fools.
 %
-"If 10 years from now, when you are doing something quick 
+"If 10 years from now, when you are doing something quick
 and dirty, you suddenly visualize that I am looking over your
 shoulders and say to yourself, "Dijkstra would not have liked this",
-well that would be enough immortality for me." 
+well that would be enough immortality for me."
 		-- Edsger W. Dijkstra
 %
 If A = B and B = C, then A = C, except where void or prohibited by law.
@@ -30141,7 +30133,7 @@
 		-- Groucho Marx
 %
 It isn't whether you win or lose, it's how much money you end up with.
-                -- Jack T. Shakespeare
+		-- Jack T. Shakespeare
 %
 It just doesn't seem right to go over the river and through the woods
 to Grandmother's condo.
@@ -36519,7 +36511,7 @@
 		-- Professor, EECS, George Washington University
 
 I'm looking forward to working with you on this next year.
-		-- Professor, Harvard, on a  senior thesis.
+		-- Professor, Harvard, on a senior thesis.
 %
 Not only is UNIX dead, it's starting to smell really bad.
 		-- Rob Pike
@@ -36848,7 +36840,7 @@
 We see him and he's all washed up --
 Moving on into the body of a beetle
 Getting ready for a long long crawl
-He  ain't nothing -- he ain't nothing at all...
+He ain't nothing -- he ain't nothing at all...
 
 Death and Money make their point once more
 In the shape of Philosophical assassins
@@ -38205,7 +38197,7 @@
 Orcs really aren't so bad (if you use lots of catsup).
 %
 Order and simplification are the first steps toward
-mastery of  a subject -- the actual enemy is the unknown.
+mastery of a subject -- the actual enemy is the unknown.
 		-- Thomas Mann
 %
 Oregano, n.:
@@ -38295,7 +38287,7 @@
 Our government has kept us in a perpetual state of fear -- kept us in a
 continuous stampede of patriotic fervor -- with the cry of grave national
 emergency...  Always there has been some terrible evil to gobble us up if we
-did not blindly rally behind it  by furnishing the exorbitant sums demanded.
+did not blindly rally behind it by furnishing the exorbitant sums demanded.
 Yet, in retrospect, these disasters seem never to have happened, seem never
 to have been quite real.
 		-- General Douglas MacArthur, 1957
@@ -39540,7 +39532,7 @@
 	Vast plains covered by treeless forests.
 %
 Praise the Lord and pass the ammunition.
-                -- Stephen Coonts, "The Minotaur"
+		-- Stephen Coonts, "The Minotaur"
 %
 Praise the sea; on shore remain.
 		-- John Florio
@@ -42259,7 +42251,7 @@
 		-- Rich Hall, "Sniglets"
 %
 Schmidt's Observation:
-	All things being equal, a fat person  uses more soap
+	All things being equal, a fat person uses more soap
 	than a thin person.
 %
 Schnuffel, n.:
@@ -42494,10 +42486,10 @@
 mountain, gaining speed, but finally managed to grind to a halt, more by
 luck than anything else, just inches from a thousand foot drop to jagged
 rocks.  They all got out of the car:
-        The computer engineer said, "I think I can fix it."
-        The systems analyst said, "No, no, I think we should take it
+	The computer engineer said, "I think I can fix it."
+	The systems analyst said, "No, no, I think we should take it
 into town and have a specialist look at it."
-        The programmer said, "OK, but first I think we should get back
+	The programmer said, "OK, but first I think we should get back
 in and see if it does it again."
 %
 Seems like this duck waddles into a pharmacy, waddles up to the prescription
@@ -42924,7 +42916,7 @@
 Ships are safe in harbor, but they were never meant to stay there.
 %
 Shirley MacLaine died today in a freak psychic collision today.  Two freaks
-in a van  [Oh no!!  It's the Copyright Police!!]  Her aura-charred body was
+in a van [Oh no!!  It's the Copyright Police!!]  Her aura-charred body was
 laid to rest after a eulogy by Jackie Collins, fellow member of SAFE [Society
 of Asinine Flake Entertainers].  Excerpted from some of his more quotable
 comments:
@@ -45096,8 +45088,8 @@
 It's a rather pleasant experience to be alone in a bank at night.
 		-- Willie Sutton
 %
-The  White Rabbit put on his spectacles.
-	"Where shall  I  begin, please your Majesty ?" he asked.
+The White Rabbit put on his spectacles.
+	"Where shall I begin, please your Majesty ?" he asked.
 	"Begin at the beginning,", the King said, very gravely,
 "and go on till you come to the end: then stop."
 		-- Lewis Carroll
@@ -47114,7 +47106,7 @@
 The hand that feeds the chicken every day finally wrings its neck instead,
 thus proving that more sophisticated views about the uniformity of nature
 would have been useful to the chicken.
- 
+
 		-- Bertrand Russell, "On Induction"
 %
 The happiest time in any man's life is just after the first divorce.
@@ -49440,7 +49432,7 @@
 		-- Alexandre Arnoux, "Etudes et caprices"
 %
 The state that separates its scholars from its warriors will have its
-thinking done by cowards, and its fighting by fools. 
+thinking done by cowards, and its fighting by fools.
 
 		-- Thucydides
 %
@@ -51377,7 +51369,7 @@
 There was an old Indian belief that by making love on the hide of
 their favorite animal, one could guarantee the health and prosperity
 of the offspring conceived thereupon.  And so it goes that one Indian
-couple made love on a buffalo  hide.  Nine months later, they were
+couple made love on a buffalo hide.  Nine months later, they were
 blessed with a healthy baby son.  Yet another couple huddled together
 on the hide of a deer and they too were blessed with a very healthy
 baby son.  But a third couple, whose favorite animal was a hippopotamus,
@@ -54390,7 +54382,7 @@
 Walking on water wasn't built in a day.
 		-- Jack Kerouac
 %
-Wall Street indices predicted nine out of the last five recessions 
+Wall Street indices predicted nine out of the last five recessions
 		-- Paul A. Samuelson, Nobel laureate in economics.
 		   (Newsweek, Science and Stocks, 19 Sep. 1966.)
 %
@@ -59790,7 +59782,7 @@
 You humans are all alike.
 %
 You just know when a relationship is about to end.  My girlfriend called me
-at work and asked me how you change a lightbulb in  the bathroom.  "It's very
+at work and asked me how you change a lightbulb in the bathroom.  "It's very
 simple," I said. "You start by filling up the bathtub with water..."
 %
 You just wait, I'll sin till I blow up!
@@ -60957,7 +60949,7 @@
 %
 beachhead:
 In marketing: a small piece of a market over which you gain control and
-from which you go out to control other pieces of the market.  
+from which you go out to control other pieces of the market.
 In war: where soldiers die.
 %
 ...that FC loop thing sucks.
@@ -60965,12 +60957,12 @@
 wheels or FC loops it will give you problem!"
 		-- storage engineer on the virtues of FC-AL
 %
-Life should not be a journey to the grave with the intention 
+Life should not be a journey to the grave with the intention
 of arriving safely in a pretty and well preserved body, but
-rather to skid in broadside, thoroughly used up, totally worn out, 
+rather to skid in broadside, thoroughly used up, totally worn out,
 and loudly proclaiming --WOW---What A RIDE!!
 %
 To announce that there must be no criticism of the president, or that we are
 to stand by the president right or wrong, is not only unpatriotic and
 servile, but is morally treasonable to the American public."
-  		--  Theodore Roosevelt 
+		--  Theodore Roosevelt

==== //depot/projects/trustedbsd/base/lib/libarchive/Makefile#15 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.38 2005/09/10 22:58:06 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.39 2005/09/21 04:25:05 kientzle Exp $
 
 #
 # Use "make distfile" to build a conventional tar.gz archive
@@ -7,7 +7,7 @@
 
 
 LIB=	archive
-VERSION=	1.02.032
+VERSION=	1.02.033
 ARCHIVE_API_FEATURE=	2
 ARCHIVE_API_VERSION=	2
 SHLIB_MAJOR=	${ARCHIVE_API_VERSION}

==== //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#5 (text+ko) ====

@@ -23,7 +23,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.
  *
- * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.23 2005/06/04 22:24:04 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.24 2005/09/24 21:15:00 kientzle Exp $
  */
 
 #ifndef ARCHIVE_H_INCLUDED
@@ -258,9 +258,11 @@
 /*-
  * To create an archive:
  *   1) Ask archive_write_new for a archive writer object.
- *   2) Set any global properties.  In particular, you should register
- *      open/write/close callbacks.
- *   3) Call archive_write_open to open the file
+ *   2) Set any global properties.  In particular, you should set
+ *      the compression and format to use.
+ *   3) Call archive_write_open to open the file (most people
+ *       will use archive_write_open_file or archive_write_open_fd,
+ *       which provide convenient canned I/O callbacks for you).
  *   4) For each entry:
  *      - construct an appropriate struct archive_entry structure
  *      - archive_write_header to write the header

==== //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#12 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.30 2005/09/10 22:58:06 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.31 2005/09/21 04:25:05 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -63,6 +63,7 @@
 
 #include "archive.h"
 #include "archive_entry.h"
+#include "archive_private.h"
 
 #undef max
 #define	max(a, b)	((a)>(b)?(a):(b))
@@ -185,12 +186,16 @@
 	if (src->aes_mbs != NULL) {
 		dest->aes_mbs_alloc = strdup(src->aes_mbs);
 		dest->aes_mbs = dest->aes_mbs_alloc;
+		if (dest->aes_mbs == NULL)
+			__archive_errx(1, "No memory for aes_copy()");
 	}
 
 	if (src->aes_wcs != NULL) {
 		dest->aes_wcs_alloc = malloc((wcslen(src->aes_wcs) + 1)
 		    * sizeof(wchar_t));
 		dest->aes_wcs = dest->aes_wcs_alloc;
+		if (dest->aes_wcs == NULL)
+			__archive_errx(1, "No memory for aes_copy()");
 		wcscpy(dest->aes_wcs_alloc, src->aes_wcs);
 	}
 }
@@ -208,6 +213,8 @@
 		int mbs_length = wcslen(aes->aes_wcs) * 3 + 64;
 		aes->aes_mbs_alloc = malloc(mbs_length);
 		aes->aes_mbs = aes->aes_mbs_alloc;
+		if (aes->aes_mbs == NULL)
+			__archive_errx(1, "No memory for aes_get_mbs()");
 		wcstombs(aes->aes_mbs_alloc, aes->aes_wcs, mbs_length - 1);
 		aes->aes_mbs_alloc[mbs_length - 1] = 0;
 	}
@@ -226,6 +233,8 @@
 		aes->aes_wcs_alloc
 		    = malloc((wcs_length + 1) * sizeof(wchar_t));
 		aes->aes_wcs = aes->aes_wcs_alloc;
+		if (aes->aes_wcs == NULL)
+			__archive_errx(1, "No memory for aes_get_wcs()");
 		mbstowcs(aes->aes_wcs_alloc, aes->aes_mbs, wcs_length);
 		aes->aes_wcs_alloc[wcs_length] = 0;
 	}
@@ -259,6 +268,8 @@
 		aes->aes_wcs_alloc = NULL;
 	}
 	aes->aes_mbs_alloc = malloc((strlen(mbs) + 1) * sizeof(char));
+	if (aes->aes_mbs_alloc == NULL)
+		__archive_errx(1, "No memory for aes_copy_mbs()");
 	strcpy(aes->aes_mbs_alloc, mbs);
 	aes->aes_mbs = aes->aes_mbs_alloc;
 	aes->aes_wcs = NULL;
@@ -294,6 +305,8 @@
 	}
 	aes->aes_mbs = NULL;
 	aes->aes_wcs_alloc = malloc((wcslen(wcs) + 1) * sizeof(wchar_t));
+	if (aes->aes_wcs_alloc == NULL)
+		__archive_errx(1, "No memory for aes_copy_wcs()");
 	wcscpy(aes->aes_wcs_alloc, wcs);
 	aes->aes_wcs = aes->aes_wcs_alloc;
 }
@@ -319,7 +332,7 @@
 
 	/* Allocate new structure and copy over all of the fields. */
 	entry2 = malloc(sizeof(*entry2));
-	if(entry2 == NULL)
+	if (entry2 == NULL)
 		return (NULL);
 	memset(entry2, 0, sizeof(*entry2));
 	entry2->ae_stat = entry->ae_stat;
@@ -350,7 +363,7 @@
 	struct archive_entry *entry;
 
 	entry = malloc(sizeof(*entry));
-	if(entry == NULL)
+	if (entry == NULL)
 		return (NULL);
 	memset(entry, 0, sizeof(*entry));
 	return (entry);
@@ -841,6 +854,8 @@
 
 	/* Add a new entry to the list. */
 	ap = malloc(sizeof(*ap));
+	if (ap == NULL)
+		return (NULL);
 	memset(ap, 0, sizeof(*ap));
 	ap->next = entry->acl_head;
 	entry->acl_head = ap;
@@ -1021,6 +1036,8 @@
 
 	/* Now, allocate the string and actually populate it. */
 	wp = entry->acl_text_w = malloc(length * sizeof(wchar_t));
+	if (wp == NULL)
+		__archive_errx(1, "No memory to generate the text version of the ACL");
 	count = 0;
 	if ((flags & ARCHIVE_ENTRY_ACL_TYPE_ACCESS) != 0) {
 		append_entry_w(&wp, NULL, ARCHIVE_ENTRY_ACL_USER_OBJ, NULL,
@@ -1274,6 +1291,8 @@
 				namebuff_length = name_end - name_start + 256;
 				namebuff =
 				    malloc(namebuff_length * sizeof(wchar_t));
+				if (namebuff == NULL)
+					goto fail;
 			}
 			wmemcpy(namebuff, name_start, name_end - name_start);
 			namebuff[name_end - name_start] = L'\0';

==== //depot/projects/trustedbsd/base/lib/libarchive/archive_private.h#11 (text+ko) ====

@@ -23,7 +23,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.
  *
- * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.19 2005/09/10 22:58:06 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.20 2005/09/24 21:15:00 kientzle Exp $
  */
 
 #ifndef ARCHIVE_PRIVATE_H_INCLUDED
@@ -53,7 +53,7 @@
 	ino_t		  skip_file_ino;
 
 	/* Utility:  Pointer to a block of nulls. */
-	const char 		*nulls;
+	const unsigned char	*nulls;
 	size_t			 null_length;
 
 	/*

==== //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#9 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"

>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message



More information about the trustedbsd-cvs mailing list