Date: Wed, 9 Jul 2008 00:21:31 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 144918 for review Message-ID: <200807090021.m690LViJ045975@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=144918 Change 144918 by peter@peter_overcee on 2008/07/09 00:21:28 IFC @144917 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#55 integrate .. //depot/projects/hammer/UPDATING#119 integrate .. //depot/projects/hammer/bin/setfacl/setfacl.1#11 integrate .. //depot/projects/hammer/etc/rc.d/ipfw#16 integrate .. //depot/projects/hammer/etc/rc.d/mountcritlocal#14 integrate .. //depot/projects/hammer/etc/rc.d/nfsclient#7 integrate .. //depot/projects/hammer/etc/rc.d/savecore#11 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#83 integrate .. //depot/projects/hammer/include/unistd.h#26 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#15 integrate .. //depot/projects/hammer/lib/libarchive/config_freebsd.h#9 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_gtar_1.tgz.uu#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/hcreate.3#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/hcreate.c#2 integrate .. //depot/projects/hammer/lib/libgeom/geom_ctl.c#4 integrate .. //depot/projects/hammer/lib/libgeom/geom_getxml.c#3 integrate .. //depot/projects/hammer/lib/libgeom/geom_xml2tree.c#5 integrate .. //depot/projects/hammer/lib/libutil/expand_number.c#3 integrate .. //depot/projects/hammer/release/Makefile#101 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#12 integrate .. //depot/projects/hammer/sbin/Makefile#49 integrate .. //depot/projects/hammer/sbin/geom/Makefile#5 integrate .. //depot/projects/hammer/sbin/quotacheck/preen.c#7 integrate .. //depot/projects/hammer/sbin/quotacheck/quotacheck.c#14 integrate .. //depot/projects/hammer/secure/usr.bin/bdes/bdes.ps#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#107 integrate .. //depot/projects/hammer/share/man/man4/bpf.4#15 integrate .. //depot/projects/hammer/share/man/man4/cnw.4#4 delete .. //depot/projects/hammer/share/man/man4/ddb.4#17 integrate .. //depot/projects/hammer/share/man/man4/ed.4#17 integrate .. //depot/projects/hammer/share/man/man4/malo.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#37 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/arl.4#9 delete .. //depot/projects/hammer/share/man/man4/man4.i386/oltr.4#3 delete .. //depot/projects/hammer/share/man/man4/man4.i386/sbni.4#3 delete .. //depot/projects/hammer/share/man/man4/man4.powerpc/Makefile#2 integrate .. //depot/projects/hammer/share/man/man4/man4.powerpc/bm.4#1 branch .. //depot/projects/hammer/share/man/man4/sbsh.4#5 delete .. //depot/projects/hammer/share/man/man4/snd_emu10kx.4#4 integrate .. //depot/projects/hammer/share/man/man4/uftdi.4#10 integrate .. //depot/projects/hammer/share/misc/committers-doc.dot#7 integrate .. //depot/projects/hammer/share/misc/committers-ports.dot#11 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/minidump_machdep.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#131 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#182 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#111 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#68 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#29 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#39 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/README.serial.98#2 delete .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#50 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stat.c#11 integrate .. //depot/projects/hammer/sys/conf/NOTES#148 integrate .. //depot/projects/hammer/sys/conf/files#185 integrate .. //depot/projects/hammer/sys/conf/files.i386#94 integrate .. //depot/projects/hammer/sys/conf/files.pc98#70 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#44 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/COPYRIGHT#2 delete .. //depot/projects/hammer/sys/contrib/dev/oltr/i386-elf.trlld.o.uu#2 delete .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr.c#18 delete .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr_isa.c#2 delete .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr_pci.c#4 delete .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltrvar.h#3 delete .. //depot/projects/hammer/sys/contrib/dev/oltr/trlld.h#2 delete .. //depot/projects/hammer/sys/contrib/dev/oltr/trlldbm.c#2 delete .. //depot/projects/hammer/sys/contrib/dev/oltr/trlldhm.c#2 delete .. //depot/projects/hammer/sys/contrib/dev/oltr/trlldmac.c#2 delete .. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#13 integrate .. //depot/projects/hammer/sys/dev/arl/if_arl.c#13 delete .. //depot/projects/hammer/sys/dev/arl/if_arl_isa.c#9 delete .. //depot/projects/hammer/sys/dev/arl/if_arlreg.h#8 delete .. //depot/projects/hammer/sys/dev/bm/if_bm.c#2 integrate .. //depot/projects/hammer/sys/dev/bm/if_bmreg.h#2 integrate .. //depot/projects/hammer/sys/dev/bm/if_bmvar.h#2 integrate .. //depot/projects/hammer/sys/dev/cnw/if_cnw.c#19 delete .. //depot/projects/hammer/sys/dev/cnw/if_cnwioctl.h#3 delete .. //depot/projects/hammer/sys/dev/cnw/if_cnwreg.h#2 delete .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#36 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#64 integrate .. //depot/projects/hammer/sys/dev/k8temp/k8temp.c#4 integrate .. //depot/projects/hammer/sys/dev/lmc/if_lmc.c#11 integrate .. //depot/projects/hammer/sys/dev/lmc/if_lmc.h#5 integrate .. //depot/projects/hammer/sys/dev/mii/rgephy.c#10 integrate .. //depot/projects/hammer/sys/dev/mii/rgephyreg.h#4 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#51 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#61 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#20 delete .. //depot/projects/hammer/sys/dev/sbni/if_sbni_isa.c#10 delete .. //depot/projects/hammer/sys/dev/sbni/if_sbni_pci.c#7 delete .. //depot/projects/hammer/sys/dev/sbni/if_sbnireg.h#3 delete .. //depot/projects/hammer/sys/dev/sbni/if_sbnivar.h#4 delete .. //depot/projects/hammer/sys/dev/sbsh/if_sbsh.c#15 delete .. //depot/projects/hammer/sys/dev/sbsh/if_sbshreg.h#3 delete .. //depot/projects/hammer/sys/dev/syscons/daemon/daemon_saver.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/usb_ethersubr.c#12 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#38 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#20 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#69 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#104 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#75 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#114 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_socksys.c#7 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#36 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#73 integrate .. //depot/projects/hammer/sys/ia64/include/ia64_cpu.h#7 integrate .. //depot/projects/hammer/sys/kern/kern_alq.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_cpuset.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#53 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#72 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_poll.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_xxx.c#16 integrate .. //depot/projects/hammer/sys/kern/link_elf.c#33 integrate .. //depot/projects/hammer/sys/kern/link_elf_obj.c#58 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_debug.c#4 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#83 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#57 integrate .. //depot/projects/hammer/sys/mips/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/adm5120/adm5120reg.h#1 branch .. //depot/projects/hammer/sys/mips/adm5120/admpci.c#1 branch .. //depot/projects/hammer/sys/mips/adm5120/console.c#1 branch .. //depot/projects/hammer/sys/mips/adm5120/files.adm5120#1 branch .. //depot/projects/hammer/sys/mips/adm5120/if_admsw.c#1 branch .. //depot/projects/hammer/sys/mips/adm5120/if_admswreg.h#1 branch .. //depot/projects/hammer/sys/mips/adm5120/if_admswvar.h#1 branch .. //depot/projects/hammer/sys/mips/adm5120/obio.c#1 branch .. //depot/projects/hammer/sys/mips/adm5120/obiovar.h#1 branch .. //depot/projects/hammer/sys/mips/adm5120/std.adm5120#1 branch .. //depot/projects/hammer/sys/mips/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/hammer/sys/mips/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/hammer/sys/mips/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/hammer/sys/mips/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/hammer/sys/mips/idt/files.idt#1 branch .. //depot/projects/hammer/sys/mips/idt/idt_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/idt/idtpci.c#1 branch .. //depot/projects/hammer/sys/mips/idt/idtreg.h#1 branch .. //depot/projects/hammer/sys/mips/idt/if_kr.c#1 branch .. //depot/projects/hammer/sys/mips/idt/if_krreg.h#1 branch .. //depot/projects/hammer/sys/mips/idt/obio.c#1 branch .. //depot/projects/hammer/sys/mips/idt/obiovar.h#1 branch .. //depot/projects/hammer/sys/mips/idt/std.idt#1 branch .. //depot/projects/hammer/sys/mips/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/hammer/sys/mips/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/hammer/sys/mips/malta/files.malta#1 branch .. //depot/projects/hammer/sys/mips/malta/gt.c#1 branch .. //depot/projects/hammer/sys/mips/malta/gt_pci.c#1 branch .. //depot/projects/hammer/sys/mips/malta/gtreg.h#1 branch .. //depot/projects/hammer/sys/mips/malta/gtvar.h#1 branch .. //depot/projects/hammer/sys/mips/malta/malta_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/malta/maltareg.h#1 branch .. //depot/projects/hammer/sys/mips/malta/obio.c#1 branch .. //depot/projects/hammer/sys/mips/malta/obiovar.h#1 branch .. //depot/projects/hammer/sys/mips/malta/std.malta#1 branch .. //depot/projects/hammer/sys/mips/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/hammer/sys/mips/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/hammer/sys/mips/malta/yamon.c#1 branch .. //depot/projects/hammer/sys/mips/malta/yamon.h#1 branch .. //depot/projects/hammer/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/hammer/sys/mips/mips32/adm5120/adm5120_machdep.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/adm5120reg.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/admpci.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/console.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/files.adm5120#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/if_admsw.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/if_admswreg.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/if_admswvar.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/obio.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/obiovar.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/std.adm5120#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/uart_bus_adm5120.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/uart_dev_adm5120.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/adm5120/uart_dev_adm5120.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/idt/files.idt#2 delete .. //depot/projects/hammer/sys/mips/mips32/idt/idt_machdep.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/idt/idtpci.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/idt/idtreg.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/idt/if_kr.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/idt/if_krreg.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/idt/obio.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/idt/obiovar.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/idt/std.idt#2 delete .. //depot/projects/hammer/sys/mips/mips32/idt/uart_bus_rc32434.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/idt/uart_cpu_rc32434.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/files.malta#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/gt.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/gt_pci.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/gtreg.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/gtvar.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/malta_machdep.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/maltareg.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/obio.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/obiovar.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/std.malta#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/uart_bus_maltausart.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/uart_cpu_maltausart.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/yamon.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/malta/yamon.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/sentry5/files.sentry5#2 delete .. //depot/projects/hammer/sys/mips/mips32/sentry5/obio.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/sentry5/obiovar.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/sentry5/s5_machdep.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/sentry5/s5reg.h#2 delete .. //depot/projects/hammer/sys/mips/mips32/sentry5/siba_cc.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/sentry5/siba_mips.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/sentry5/siba_sdram.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/sentry5/uart_bus_sbusart.c#2 delete .. //depot/projects/hammer/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#2 delete .. //depot/projects/hammer/sys/mips/sentry5/files.sentry5#1 branch .. //depot/projects/hammer/sys/mips/sentry5/obio.c#1 branch .. //depot/projects/hammer/sys/mips/sentry5/obiovar.h#1 branch .. //depot/projects/hammer/sys/mips/sentry5/s5_machdep.c#1 branch .. //depot/projects/hammer/sys/mips/sentry5/s5reg.h#1 branch .. //depot/projects/hammer/sys/mips/sentry5/siba_cc.c#1 branch .. //depot/projects/hammer/sys/mips/sentry5/siba_mips.c#1 branch .. //depot/projects/hammer/sys/mips/sentry5/siba_sdram.c#1 branch .. //depot/projects/hammer/sys/mips/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/hammer/sys/mips/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/hammer/sys/modules/Makefile#128 integrate .. //depot/projects/hammer/sys/modules/arl/Makefile#5 delete .. //depot/projects/hammer/sys/modules/cnw/Makefile#2 delete .. //depot/projects/hammer/sys/modules/oltr/Makefile#5 delete .. //depot/projects/hammer/sys/modules/sbni/Makefile#2 delete .. //depot/projects/hammer/sys/modules/sbsh/Makefile#2 delete .. //depot/projects/hammer/sys/net/bpf.c#62 integrate .. //depot/projects/hammer/sys/net/bpf.h#21 integrate .. //depot/projects/hammer/sys/net/bpf_zerocopy.c#4 integrate .. //depot/projects/hammer/sys/net/bpf_zerocopy.h#3 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#42 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#15 integrate .. //depot/projects/hammer/sys/net/if_ppp.c#32 integrate .. //depot/projects/hammer/sys/net/netisr.c#17 integrate .. //depot/projects/hammer/sys/net/netisr.h#8 integrate .. //depot/projects/hammer/sys/net/raw_cb.c#13 integrate .. //depot/projects/hammer/sys/net/raw_cb.h#5 integrate .. //depot/projects/hammer/sys/net/raw_usrreq.c#17 integrate .. //depot/projects/hammer/sys/net/rtsock.c#38 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ht.c#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#37 integrate .. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#21 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#60 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#25 integrate .. //depot/projects/hammer/sys/netgraph/ng_ip_input.c#5 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#47 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#40 integrate .. //depot/projects/hammer/sys/netinet/ip_gre.c#18 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#73 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#54 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#57 integrate .. //depot/projects/hammer/sys/netinet6/frag6.c#14 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#35 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#33 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#24 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#37 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#28 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#21 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#36 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#23 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#37 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#39 integrate .. //depot/projects/hammer/sys/netipx/ipx_input.c#13 integrate .. //depot/projects/hammer/sys/netnatm/natm_proto.c#13 integrate .. //depot/projects/hammer/sys/nfsclient/bootp_subr.c#23 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#59 integrate .. //depot/projects/hammer/sys/nlm/nlm_advlock.c#2 integrate .. //depot/projects/hammer/sys/nlm/nlm_prot_impl.c#6 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#54 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#65 integrate .. //depot/projects/hammer/sys/pc98/include/bus.h#5 integrate .. //depot/projects/hammer/sys/pc98/pc98/busiosubr.c#2 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#35 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#41 integrate .. //depot/projects/hammer/sys/rpc/authunix_prot.c#4 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#63 integrate .. //depot/projects/hammer/sys/sparc64/include/in_cksum.h#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/in_cksum.c#3 integrate .. //depot/projects/hammer/sys/sun4v/conf/GENERIC#10 integrate .. //depot/projects/hammer/sys/sys/event.h#17 integrate .. //depot/projects/hammer/sys/sys/kernel.h#27 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#43 integrate .. //depot/projects/hammer/sys/vm/vm_kern.h#7 integrate .. //depot/projects/hammer/tools/regression/lib/msun/Makefile#11 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-fmaxmin.c#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-fmaxmin.t#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#65 integrate .. //depot/projects/hammer/usr.bin/cpio/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/cpio/config_freebsd.h#2 integrate .. //depot/projects/hammer/usr.bin/cpio/cpio.c#5 integrate .. //depot/projects/hammer/usr.bin/ldd/ldd.1#5 integrate .. //depot/projects/hammer/usr.bin/ldd/ldd.c#3 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#26 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#22 integrate .. //depot/projects/hammer/usr.bin/tar/config_freebsd.h#5 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#27 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#34 integrate .. //depot/projects/hammer/usr.sbin/Makefile#90 integrate .. //depot/projects/hammer/usr.sbin/arlcontrol/Makefile#4 delete .. //depot/projects/hammer/usr.sbin/arlcontrol/arlcontrol.8#5 delete .. //depot/projects/hammer/usr.sbin/arlcontrol/arlcontrol.c#3 delete .. //depot/projects/hammer/usr.sbin/edquota/edquota.c#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/main.c#12 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#19 integrate .. //depot/projects/hammer/usr.sbin/quot/quot.c#9 integrate .. //depot/projects/hammer/usr.sbin/quotaon/quotaon.c#6 integrate .. //depot/projects/hammer/usr.sbin/repquota/repquota.c#9 integrate Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#55 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.144 2008/07/01 21:54:08 danger Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.151 2008/07/06 20:57:35 marcel Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,46 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080706: bsdlabel(8) removed on powerpc +.if ${TARGET_ARCH} == "powerpc" +OLD_FILES+=sbin/bsdlabel +OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz +.endif +# 20080704: sbsh(4) removed +OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz +OLD_FILES+=usr/share/man/man4/sbsh.4.gz +# 20080704: sbni(4) removed +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/if_sbni.4.gz +OLD_FILES+=usr/share/man/man4/i386/sbni.4.gz +.endif +# 20080704: cnw(4) removed +OLD_FILES+=usr/share/man/man4/if_cnw.4.gz +OLD_FILES+=usr/share/man/man4/cnw.4.gz +# 20080704: oltr(4) removed +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/if_oltr.4.gz +OLD_FILES+=usr/share/man/man4/i386/oltr.4.gz +.endif +# 20080704: arl(4) removed +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/sbin/arlcontrol +OLD_FILES+=usr/share/man/man4/i386/arl.4.gz +OLD_FILES+=usr/share/man/man8/arlcontrol.8.gz +.endif +# 20080703: sunlabel only for sparc64 +.if ${TARGET_ARCH} != "sparc64" +OLD_FILES+=sbin/sunlabel +OLD_FILES+=usr/share/man/man8/sunlabel.8.gz +.endif +# 20080703: bsdlabel & fdisk removed on ia64 +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=sbin/bsdlabel +OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz +OLD_FILES+=usr/share/man/man8/disklabel.8.gz +OLD_FILES+=sbin/fdisk +OLD_FILES+=usr/share/man/man8/fdisk.8.gz +.endif # 20080701: wpa_supplicant.conf moved to share/examples/etc/ OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf OLD_DIRS+=usr/share/examples/wpa_supplicant ==== //depot/projects/hammer/UPDATING#119 (text+ko) ==== @@ -413,6 +413,20 @@ This does not affect those who are using "/dev/dsp". 20061122: + geom(4)'s gmirror(8) class metadata structure has been + rev'd from v3 to v4. If you update across this point and + your metadata is converted for you, you will not be easily + able to downgrade since the /boot/kernel.old/geom_mirror.ko + kernel module will be unable to read the v4 metadata. You + can resolve this by doing from the loader(8) prompt: + + set vfs.root.mountfrom="ufs:/dev/XXX" + + where XXX is the root slice of one of the disks that composed + the mirror (i.e.: /dev/ad0s1a). You can then rebuild + the array the same way you built it originally. + +20061122: The following binaries have been disconnected from the build: mount_devfs, mount_ext2fs, mount_fdescfs, mount_procfs, mount_linprocfs, and mount_std. The functionality of these programs has been @@ -1053,4 +1067,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.532 2008/06/09 21:33:57 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.534 2008/07/07 13:08:30 remko Exp $ ==== //depot/projects/hammer/bin/setfacl/setfacl.1#11 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.17 2006/09/17 17:40:07 ru Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.19 2008/07/06 22:47:10 csjp Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -234,9 +234,27 @@ .Pp Multiple ACL entries specified on the command line are separated by commas. +.Pp +It is possible for files and directories to inherit ACL entries from their +parent directory. +This is accomplished through the use of the default ACL. +It should be noted that before you can specify a default ACL, the mandatory +ACL entries for user, group, other and mask must be set. +For more details see the examples below. +Default ACLs can be created by using +.Fl d . .Sh EXIT STATUS .Ex -std .Sh EXAMPLES +.Dl setfacl -d -m u::rwx,g::rx,o::rx,mask::rwx dir +.Dl setfacl -d -m g:admins:rwx dir +.Pp +The first command sets the mandatory elements of the default ACL. +The second command specifies that users in group admins can have read, write, and execute +permissions for directory named "dir". +It should be noted that any files or directories created underneath "dir" will +inherit these default ACLs upon creation. +.Pp .Dl setfacl -m u::rwx,g:mail:rw file .Pp Sets read, write, and execute permissions for the ==== //depot/projects/hammer/etc/rc.d/ipfw#16 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.17 2008/01/27 15:15:12 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.18 2008/07/05 15:27:39 mtm Exp $ # # PROVIDE: ipfw @@ -51,7 +51,9 @@ # Enable the firewall # - ${SYSCTL_W} net.inet.ip.fw.enable=1 + if ! ${SYSCTL_W} net.inet.ip.fw.enable=1 1>/dev/null 2>&1; then + warn "failed to enable firewall" + fi } ipfw_stop() ==== //depot/projects/hammer/etc/rc.d/mountcritlocal#14 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.16 2008/03/06 14:39:33 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.17 2008/07/05 15:19:58 mtm Exp $ # # PROVIDE: mountcritlocal @@ -28,7 +28,7 @@ esac # Mount everything except nfs filesystems. - echo -n 'Mounting local file systems:' + [ -z "${rc_quiet}" ] && echo -n 'Mounting local file systems:' mount_excludes='no' for i in ${netfs_types}; do fstype=${i%:*} @@ -37,7 +37,7 @@ mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} err=$? - echo '.' + [ -z "${rc_quiet}" ] && echo '.' case ${err} in 0) ==== //depot/projects/hammer/etc/rc.d/nfsclient#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/nfsclient,v 1.6 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/nfsclient,v 1.7 2008/07/05 15:13:21 mtm Exp $ # # PROVIDE: nfsclient @@ -22,11 +22,15 @@ # if [ -n "${nfs_access_cache}" ]; then - echo "NFS access cache time=${nfs_access_cache}" - sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + [ -z "${rc_quiet}" ] && echo "NFS access cache time=${nfs_access_cache}" + if ! sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null; then + warn "failed to set access cache timeout" + fi fi if [ -n "${nfs_bufpackets}" ]; then - sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null + if ! sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null; then + warn "failed to set vfs.nfs.bufpackets" + fi fi unmount_all ==== //depot/projects/hammer/etc/rc.d/savecore#11 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/savecore,v 1.13 2008/06/23 20:54:32 mtm Exp $ +# $FreeBSD: src/etc/rc.d/savecore,v 1.15 2008/07/06 08:31:29 mtm Exp $ # # PROVIDE: savecore @@ -17,11 +17,6 @@ savecore_prestart() { - # ${DUMPDIR} should be a directory or a symbolic link - # to the crash directory if core dumps are to be saved. - # - DUMPDIR="${dumpdir:-/var/crash}" - # Quit if we have no dump device case ${dumpdev} in [Nn][Oo] | '') @@ -57,8 +52,19 @@ savecore_start() { - if savecore -C >/dev/null; then - savecore ${savecore_flags} ${DUMPDIR} ${dumpdev} + local dev + + case "${dumpdev}" in + [Aa][Uu][Tt][Oo]) + dev= + ;; + *) + dev="${dumpdev}" + ;; + esac + + if savecore -C "${dumpdir}" "${dev}" >/dev/null; then + savecore ${savecore_flags} ${dumpdir} ${dumpdev} else [ -z "${rc_quiet}" ] && echo "No core dumps found" fi ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#83 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.265 2008/06/25 04:56:08 wollman Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.267 2008/07/07 10:04:16 phk Exp $ % ======================================================================= || || @@ -22738,6 +22738,10 @@ they don't even invite me. -- Dave Barry % +I asked a teacher what the opposite of a miracle was and she, without +thinking, I assume, said it was an act of God. + -- Terry Prachett (Daily Mail 21 june 2008) +% I asked the engineer who designed the communication terminal's keyboards why these were not manufactured in a central facility, in view of the small number needed [1 per month] in his factory. He explained that this @@ -52173,6 +52177,9 @@ the affair," and of course be sadly disappointed thereby. -- Sacramento Daily Union, November 29, 1861 % +Too many of his [Mozart's] works sound like interoffice memos. + -- Glenn Gould +% Too many people are thinking of security instead of opportunity. They seem more afraid of life than death. -- James F. Byrnes ==== //depot/projects/hammer/include/unistd.h#26 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.89 2008/06/23 05:22:06 ed Exp $ + * $FreeBSD: src/include/unistd.h,v 1.90 2008/07/08 03:08:32 davidxu Exp $ */ #ifndef _UNISTD_H_ @@ -107,7 +107,7 @@ #define _POSIX_READER_WRITER_LOCKS 200112L #define _POSIX_REGEXP 1 #define _POSIX_SHELL 1 -#define _POSIX_SPAWN -1 +#define _POSIX_SPAWN 200112L #define _POSIX_SPIN_LOCKS 200112L #define _POSIX_THREAD_ATTR_STACKADDR 200112L #define _POSIX_THREAD_ATTR_STACKSIZE 200112L ==== //depot/projects/hammer/lib/libarchive/archive.h#14 (text+ko) ==== @@ -22,7 +22,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,v 1.17 2008/06/15 05:05:53 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h,v 1.18 2008/07/05 01:50:40 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -112,13 +112,13 @@ * (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000) * #endif */ -#define ARCHIVE_VERSION_NUMBER 2005004 +#define ARCHIVE_VERSION_NUMBER 2005005 __LA_DECL int archive_version_number(void); /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_STRING "libarchive 2.5.4b" +#define ARCHIVE_VERSION_STRING "libarchive 2.5.5" __LA_DECL const char * archive_version_string(void); #if ARCHIVE_VERSION_NUMBER < 3000000 ==== //depot/projects/hammer/lib/libarchive/archive_write_disk.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.26 2008/06/21 19:05:29 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.28 2008/07/05 01:48:33 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -64,9 +64,6 @@ #ifdef HAVE_LINUX_FS_H #include <linux/fs.h> /* for Linux file flags */ #endif -#ifdef HAVE_LINUX_EXT2_FS_H -#include <linux/ext2_fs.h> /* for Linux file flags */ -#endif #ifdef HAVE_LIMITS_H #include <limits.h> #endif @@ -613,8 +610,8 @@ /* Restore metadata. */ /* - * Look up the "real" UID only if we're going to need it. We - * need this for TODO_SGID because chown() requires both. + * Look up the "real" UID only if we're going to need it. + * TODO: the TODO_SGID condition can be dropped here, can't it? */ if (a->todo & (TODO_OWNER | TODO_SUID | TODO_SGID)) { a->uid = a->lookup_uid(a->lookup_uid_data, @@ -622,6 +619,7 @@ archive_entry_uid(a->entry)); } /* Look up the "real" GID only if we're going to need it. */ + /* TODO: the TODO_SUID condition can be dropped here, can't it? */ if (a->todo & (TODO_OWNER | TODO_SGID | TODO_SUID)) { a->gid = a->lookup_gid(a->lookup_gid_data, archive_entry_gname(a->entry), @@ -1023,7 +1021,10 @@ a->deferred |= (a->todo & TODO_TIMES); a->todo &= ~TODO_TIMES; /* Never use an immediate chmod(). */ - if (mode != final_mode) + /* We can't avoid the chmod() entirely if EXTRACT_PERM + * because of SysV SGID inheritance. */ + if ((mode != final_mode) + || (a->flags & ARCHIVE_EXTRACT_PERM)) a->deferred |= (a->todo & TODO_MODE); a->todo &= ~TODO_MODE; } @@ -1565,8 +1566,8 @@ /* * Note: Although we can skip setting the user id if the desired user * id matches the current user, we cannot skip setting the group, as - * many systems set the gid bit based on the containing directory. So - * we have to perform a chown syscall if we want to restore the SGID + * many systems set the gid based on the containing directory. So + * we have to perform a chown syscall if we want to set the SGID * bit. (The alternative is to stat() and then possibly chown(); it's * more efficient to skip the stat() and just always chown().) Note * that a successful chown() here clears the TODO_SGID_CHECK bit, which ==== //depot/projects/hammer/lib/libarchive/config_freebsd.h#9 (text+ko) ==== @@ -22,7 +22,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/config_freebsd.h,v 1.10 2008/06/15 05:12:47 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/config_freebsd.h,v 1.11 2008/07/05 01:50:07 kientzle Exp $ */ /* FreeBSD 5.0 and later have ACL support. */ @@ -87,8 +87,6 @@ #define HAVE_STRING_H 1 #define HAVE_STRRCHR 1 #define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 -#define HAVE_STRUCT_STAT_ST_RDEV 1 -#define HAVE_STRUCT_TM_TM_GMTOFF 1 #define HAVE_SYS_ACL_H 1 #define HAVE_SYS_IOCTL_H 1 #define HAVE_SYS_SELECT_H 1 ==== //depot/projects/hammer/lib/libarchive/test/test_compat_gtar_1.tgz.uu#2 (text+ko) ==== @@ -1,3 +1,4 @@ +$FreeBSD: src/lib/libarchive/test/test_compat_gtar_1.tgz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $ begin 644 test_compat_gtar_1.tgz M'XL(`,N`6T<``^W62PZ",!`&X!YE3@`SI:6Z<R^7\(&*+Q+%>'W+PJB)43=4 MJO^W:1.Z:#KYATG2)!T5]7Y95/N-Z@:UF)ZO7B9"-TPD[%@4%1W=Y\'IV$P. ==== //depot/projects/hammer/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#2 (text+ko) ==== @@ -1,3 +1,4 @@ +$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $ begin 644 test_pax_filename_encoding.tar.gz M'XL(`)4;VT<``^V6STK#0!#&<\Y3[!/HS/Z-ASVHEQ1$BE[L<4T6$DP32:-$ MG\%'\Y%Z,*7$UEJLE"91NK_+P.P>OF'X^&9LZM":V):GYCYZ?YOFQ5W]\NH= ==== //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#2 (text+ko) ==== @@ -1,3 +1,4 @@ +$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $ begin 644 test_read_format_gtar_sparse_1_13.tgz M'XL(`&&";$<``^W72VX;1Q2%X<Y.N($`=>NYD*Q``P\\L&.(\OYSNP/)LGE` M!SDF.D#^SP,G94&\7?VS']<O3\_7#]M#E2AE]KZ54F*-\O[O7<W_W:*LUJ)$ ==== //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#2 (text+ko) ==== @@ -1,3 +1,4 @@ +$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $ begin 644 test_read_format_gtar_sparse_1_17.tgz M'XL(`&&";$<``^W776X3611%83,33Z"E>^[O0'H$?N"!!V@4A_GWJ8*$".\V MK=Y8U1+KB\#H)L2G;BV77=?/EZ?K^]-#E31[WQYCC?+V<5/SSRG*:BU*1,_U ==== //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#2 (text+ko) ==== @@ -1,3 +1,4 @@ +$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $ begin 644 test_read_format_gtar_sparse_1_17_posix00.tgz M'XL(`&*";$<``^W9S6[;1A2&8:UU%;Z!RO/#^5MHW:R*;'H!K,,`06L[$&7` M[=5W%#FN'(Q-Z1S5K-#W642!E&/3/M\$'\'5]<?^\</0?QHVX\KG&,KU^+7? ==== //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#2 (text+ko) ==== @@ -1,3 +1,4 @@ +$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $ begin 644 test_read_format_gtar_sparse_1_17_posix01.tgz M'XL(`&*";$<``^W7WVX:1QB&<8ZY"B[`Q?/-OYT]X+3-416IZ@5L'0ZLQHX% MMF3UZKN`';]V&SO21[PB>GXG;,#F`_,,F5F>?QSN/ZR'3^O-=IE:K7:^O1DV ==== //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#2 (text+ko) ==== @@ -1,3 +1,4 @@ +$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu,v 1.2 2008/07/03 03:26:30 peter Exp $ begin 644 test_read_format_gtar_sparse_1_17_posix10.tgz M'XL(`&.";$<``^W7RV[;5A1&88WU%'J!RN=^&7B:9E0$*/H`1,*!B]@))`<P M\O2A)#O];=@RBJV8$+*^"1G*T=9E'8%G??%AN'L_#I_&S78=6RGQ8OMUV&S' ==== //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#2 (text+ko) ==== @@ -1,3 +1,4 @@ +$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu,v 1.2 2008/07/03 03:26:30 peter Exp $ begin 644 test_read_format_gtar_sparse_1_17_posix10_modified.tar M+B]087A(96%D97)S+C,X-C8S+W-P87)S90`````````````````````````` M```````````````````````````````````````````````````````````` ==== //depot/projects/hammer/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu#2 (text+ko) ==== @@ -1,3 +1,4 @@ +$FreeBSD: src/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu,v 1.2 2008/07/03 03:26:30 peter Exp $ begin 644 test_compat_tar_1.tar M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` ==== //depot/projects/hammer/lib/libc/stdlib/hcreate.3#5 (text+ko) ==== @@ -1,6 +1,34 @@ -.\" $FreeBSD: src/lib/libc/stdlib/hcreate.3,v 1.5 2005/01/20 09:17:04 ru Exp $ +.\"- +.\" Copyright (c) 1999 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" This code is derived from software contributed to The NetBSD Foundation +.\" by Klaus Klein. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.\" $FreeBSD: src/lib/libc/stdlib/hcreate.3,v 1.7 2008/07/06 17:03:37 danger Exp $ .\" -.Dd May 8, 2001 +.Dd July 6, 2008 .Os .Dt HCREATE 3 .Sh NAME @@ -111,8 +139,10 @@ .Sh RETURN VALUES The .Fn hcreate -function returns 0 if it cannot allocate sufficient space for the table; -otherwise, it returns non-zero. +function returns 0 if the table creation failed and the global variable +.Va errno +is set to indicate the error; +otherwise, a non-zero value is returned. .Pp The .Fn hdestroy @@ -199,6 +229,8 @@ .Bl -tag -width Er .It Bq Er ENOMEM Insufficient storage space is available. +.It Bq Er EINVAL +A table already exists. .El .Sh SEE ALSO .Xr bsearch 3 , ==== //depot/projects/hammer/lib/libc/stdlib/hcreate.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ __RCSID("$NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $"); #endif /* LIBC_SCCS and not lint */ #endif -__FBSDID("$FreeBSD: src/lib/libc/stdlib/hcreate.c,v 1.3 2002/06/27 13:18:27 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/hcreate.c,v 1.4 2008/07/06 11:31:20 danger Exp $"); #include <sys/types.h> #include <sys/queue.h> @@ -93,7 +93,7 @@ size_t idx; unsigned int p2; - /* Make sure this this isn't called when a table already exists. */ + /* Make sure this is not called when a table already exists. */ if (htable != NULL) { errno = EINVAL; return 0; @@ -103,11 +103,11 @@ if (nel < MIN_BUCKETS) nel = MIN_BUCKETS; - /* If it's too large, cap it. */ + /* If it is too large, cap it. */ if (nel > MAX_BUCKETS) nel = MAX_BUCKETS; - /* If it's is not a power of two in size, round up. */ + /* If it is not a power of two in size, round up. */ if ((nel & (nel - 1)) != 0) { for (p2 = 0; nel != 0; p2++) nel >>= 1; ==== //depot/projects/hammer/lib/libgeom/geom_ctl.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgeom/geom_ctl.c,v 1.4 2003/06/01 15:05:22 phk Exp $ + * $FreeBSD: src/lib/libgeom/geom_ctl.c,v 1.5 2008/07/08 17:34:50 lulf Exp $ */ #include <stdio.h> @@ -45,6 +45,12 @@ #define GCTL_TABLE 1 #include <libgeom.h> +/* + * Global pointer to a string that is used to avoid an errorneous free in + * gctl_free. + */ +static char nomemmsg[] = "Could not allocate memory"; + void gctl_dump(struct gctl_req *req, FILE *f) { @@ -105,11 +111,12 @@ static void gctl_check_alloc(struct gctl_req *req, void *ptr) { + if (ptr != NULL) return; - gctl_set_error(req, "Could not allocate memory"); + gctl_set_error(req, nomemmsg); if (req->error == NULL) - req->error = "Could not allocate memory"; + req->error = nomemmsg; } /* @@ -134,7 +141,7 @@ struct gctl_req_arg *ap; req->narg++; - req->arg = realloc(req->arg, sizeof *ap * req->narg); + req->arg = reallocf(req->arg, sizeof *ap * req->narg); gctl_check_alloc(req, req->arg); if (req->arg == NULL) { req->narg = 0; @@ -157,6 +164,8 @@ return; ap->name = strdup(name); gctl_check_alloc(req, ap->name); + if (ap->name == NULL) + return; ap->nlen = strlen(ap->name) + 1; ap->value = __DECONST(void *, value); ap->flag = GCTL_PARAM_RD; @@ -180,6 +189,8 @@ return; ap->name = strdup(name); gctl_check_alloc(req, ap->name); + if (ap->name == NULL) + return; ap->nlen = strlen(ap->name) + 1; ap->value = value; ap->flag = GCTL_PARAM_RW; @@ -201,12 +212,11 @@ req->version = GCTL_VERSION; req->lerror = BUFSIZ; /* XXX: arbitrary number */ - req->error = malloc(req->lerror); + req->error = calloc(1, req->lerror); if (req->error == NULL) { gctl_check_alloc(req, req->error); return (req->error); } - memset(req->error, 0, req->lerror); req->lerror--; fd = open(_PATH_DEV PATH_GEOM_CTL, O_RDONLY); if (fd < 0) @@ -232,7 +242,7 @@ free(req->arg[i].name); } free(req->arg); - if (req->error != NULL) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807090021.m690LViJ045975>