PERFORCE change 127116 for review
Kip Macy
kmacy at FreeBSD.org
Tue Oct 2 15:53:58 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=127116
Change 127116 by kmacy at kmacy:storage:toestack on 2007/10/02 22:53:20
IFC #127115
Affected files ...
.. //depot/projects/toestack/ObsoleteFiles.inc#2 integrate
.. //depot/projects/toestack/UPDATING#2 integrate
.. //depot/projects/toestack/bin/getfacl/getfacl.c#2 integrate
.. //depot/projects/toestack/bin/ps/print.c#2 integrate
.. //depot/projects/toestack/bin/ps/ps.c#2 integrate
.. //depot/projects/toestack/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/toestack/etc/defaults/rc.conf#3 integrate
.. //depot/projects/toestack/etc/mtree/BSD.include.dist#2 integrate
.. //depot/projects/toestack/etc/rc.d/Makefile#3 integrate
.. //depot/projects/toestack/etc/rc.d/nscd#2 integrate
.. //depot/projects/toestack/etc/services#3 integrate
.. //depot/projects/toestack/gnu/usr.bin/binutils/ld/Makefile#2 integrate
.. //depot/projects/toestack/gnu/usr.bin/binutils/ld/genscripts.sh#2 integrate
.. //depot/projects/toestack/gnu/usr.bin/cc/cc_int/Makefile#2 integrate
.. //depot/projects/toestack/gnu/usr.bin/man/man/man.c#2 integrate
.. //depot/projects/toestack/gnu/usr.bin/texinfo/info/Makefile#2 integrate
.. //depot/projects/toestack/include/Makefile#2 integrate
.. //depot/projects/toestack/lib/libarchive/archive_read.3#2 integrate
.. //depot/projects/toestack/lib/libarchive/archive_write_disk.c#2 integrate
.. //depot/projects/toestack/lib/libarchive/test/test_write_disk.c#2 integrate
.. //depot/projects/toestack/lib/libc/gen/Makefile.inc#2 integrate
.. //depot/projects/toestack/lib/libc/net/sctp_connectx.3#2 integrate
.. //depot/projects/toestack/lib/libc/net/sctp_opt_info.3#2 integrate
.. //depot/projects/toestack/lib/libc/net/sctp_recvmsg.3#2 integrate
.. //depot/projects/toestack/lib/libc/net/sctp_send.3#2 integrate
.. //depot/projects/toestack/lib/libc/net/sctp_sendmsg.3#2 integrate
.. //depot/projects/toestack/lib/libc/rpc/auth_time.c#2 integrate
.. //depot/projects/toestack/lib/libc/rpc/getnetconfig.c#2 integrate
.. //depot/projects/toestack/lib/libc/rpc/getnetpath.c#2 integrate
.. //depot/projects/toestack/lib/libc/rpc/rpc_generic.c#2 integrate
.. //depot/projects/toestack/lib/libc/rpc/rpcb_clnt.c#2 integrate
.. //depot/projects/toestack/lib/libc/stdlib/getenv.c#2 integrate
.. //depot/projects/toestack/lib/libc/sys/Makefile.inc#2 integrate
.. //depot/projects/toestack/lib/libc/sys/minherit.2#2 integrate
.. //depot/projects/toestack/lib/libc/sys/ntp_adjtime.2#2 integrate
.. //depot/projects/toestack/lib/libc/sys/ntp_gettime.2#2 delete
.. //depot/projects/toestack/lib/libdisk/open_disk.c#2 integrate
.. //depot/projects/toestack/lib/libdisk/open_ia64_disk.c#2 integrate
.. //depot/projects/toestack/lib/libkvm/kvm_proc.c#2 integrate
.. //depot/projects/toestack/lib/libutil/expand_number.3#3 integrate
.. //depot/projects/toestack/lib/libutil/flopen.3#2 integrate
.. //depot/projects/toestack/lib/libutil/humanize_number.3#3 integrate
.. //depot/projects/toestack/lib/libutil/kld.3#2 integrate
.. //depot/projects/toestack/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate
.. //depot/projects/toestack/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate
.. //depot/projects/toestack/release/doc/share/misc/dev.archlist.txt#4 integrate
.. //depot/projects/toestack/sbin/dhclient/dhclient.8#2 integrate
.. //depot/projects/toestack/sbin/fsck_ffs/Makefile#2 integrate
.. //depot/projects/toestack/sbin/fsck_ffs/main.c#2 integrate
.. //depot/projects/toestack/sbin/geom/class/Makefile#2 integrate
.. //depot/projects/toestack/sbin/geom/class/virstor/Makefile#1 branch
.. //depot/projects/toestack/sbin/geom/class/virstor/geom_virstor.c#1 branch
.. //depot/projects/toestack/sbin/geom/class/virstor/gvirstor.8#1 branch
.. //depot/projects/toestack/sbin/geom/core/geom.8#2 integrate
.. //depot/projects/toestack/sbin/geom/core/geom.c#2 integrate
.. //depot/projects/toestack/sbin/ipfw/ipfw2.c#2 integrate
.. //depot/projects/toestack/sbin/quotacheck/preen.c#2 integrate
.. //depot/projects/toestack/sbin/quotacheck/quotacheck.c#2 integrate
.. //depot/projects/toestack/sbin/tunefs/tunefs.8#2 integrate
.. //depot/projects/toestack/share/man/man4/cxgb.4#2 integrate
.. //depot/projects/toestack/share/man/man4/gem.4#2 integrate
.. //depot/projects/toestack/share/man/man4/if_bridge.4#2 integrate
.. //depot/projects/toestack/share/man/man4/sctp.4#2 integrate
.. //depot/projects/toestack/share/man/man4/snd_emu10kx.4#2 integrate
.. //depot/projects/toestack/share/man/man9/DECLARE_GEOM_CLASS.9#2 integrate
.. //depot/projects/toestack/share/man/man9/crypto.9#2 integrate
.. //depot/projects/toestack/share/man/man9/sleepqueue.9#2 integrate
.. //depot/projects/toestack/share/misc/committers-ports.dot#2 integrate
.. //depot/projects/toestack/share/misc/committers-src.dot#2 integrate
.. //depot/projects/toestack/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/toestack/sys/amd64/amd64/uma_machdep.c#2 integrate
.. //depot/projects/toestack/sys/amd64/conf/MULTIQ#5 integrate
.. //depot/projects/toestack/sys/amd64/include/smp.h#2 integrate
.. //depot/projects/toestack/sys/amd64/include/vmparam.h#3 integrate
.. //depot/projects/toestack/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/toestack/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/toestack/sys/amd64/linux32/linux32_proto.h#2 integrate
.. //depot/projects/toestack/sys/amd64/linux32/linux32_syscall.h#2 integrate
.. //depot/projects/toestack/sys/amd64/linux32/linux32_sysent.c#2 integrate
.. //depot/projects/toestack/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/toestack/sys/amd64/linux32/syscalls.master#2 integrate
.. //depot/projects/toestack/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/toestack/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/toestack/sys/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/toestack/sys/arm/at91/at91_mci.c#2 integrate
.. //depot/projects/toestack/sys/arm/at91/at91_pmc.c#2 integrate
.. //depot/projects/toestack/sys/arm/conf/AVILA#2 integrate
.. //depot/projects/toestack/sys/arm/conf/CRB#2 integrate
.. //depot/projects/toestack/sys/arm/include/asmacros.h#2 integrate
.. //depot/projects/toestack/sys/arm/include/vmparam.h#2 integrate
.. //depot/projects/toestack/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i8134x/files.crb#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i8134x/i81342.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i8134x/i81342reg.h#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch
.. //depot/projects/toestack/sys/arm/xscale/i8134x/iq81342reg.h#1 branch
.. //depot/projects/toestack/sys/arm/xscale/i8134x/iq81342var.h#1 branch
.. //depot/projects/toestack/sys/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate
.. //depot/projects/toestack/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/toestack/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/toestack/sys/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/toestack/sys/conf/files#3 integrate
.. //depot/projects/toestack/sys/conf/options#3 integrate
.. //depot/projects/toestack/sys/contrib/dev/acpica/evmisc.c#2 integrate
.. //depot/projects/toestack/sys/contrib/dev/acpica/evxface.c#2 integrate
.. //depot/projects/toestack/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch
.. //depot/projects/toestack/sys/contrib/dev/npe/LICENSE#1 branch
.. //depot/projects/toestack/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/toestack/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/toestack/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/toestack/sys/dev/acpica/acpi_ec.c#2 integrate
.. //depot/projects/toestack/sys/dev/ath/ath_rate/sample/sample.c#2 integrate
.. //depot/projects/toestack/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#6 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_include.h#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#7 edit
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#4 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_osdep.h#5 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#4 edit
.. //depot/projects/toestack/sys/dev/cxgb/sys/cxgb_support.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/sys/mvec.h#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate
.. //depot/projects/toestack/sys/dev/gem/if_gem.c#2 integrate
.. //depot/projects/toestack/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/gem/if_gemreg.h#2 integrate
.. //depot/projects/toestack/sys/dev/gem/if_gemvar.h#2 integrate
.. //depot/projects/toestack/sys/dev/mcd/mcd.c#2 integrate
.. //depot/projects/toestack/sys/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/toestack/sys/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/toestack/sys/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pcireg.h#2 integrate
.. //depot/projects/toestack/sys/dev/ral/rt2560.c#3 integrate
.. //depot/projects/toestack/sys/dev/ral/rt2661.c#3 integrate
.. //depot/projects/toestack/sys/dev/rc/rc.c#2 integrate
.. //depot/projects/toestack/sys/dev/scd/scd.c#2 integrate
.. //depot/projects/toestack/sys/dev/sound/pci/emu10kx-midi.c#2 integrate
.. //depot/projects/toestack/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate
.. //depot/projects/toestack/sys/dev/sound/pci/emu10kx.c#2 integrate
.. //depot/projects/toestack/sys/dev/sound/pci/emu10kx.h#2 integrate
.. //depot/projects/toestack/sys/dev/syscons/syscons.c#2 integrate
.. //depot/projects/toestack/sys/dev/syscons/syscons.h#2 integrate
.. //depot/projects/toestack/sys/dev/usb/ehci_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/usb/if_axe.c#2 integrate
.. //depot/projects/toestack/sys/dev/usb/if_axereg.h#2 integrate
.. //depot/projects/toestack/sys/dev/usb/if_rum.c#3 integrate
.. //depot/projects/toestack/sys/dev/usb/if_ural.c#3 integrate
.. //depot/projects/toestack/sys/dev/usb/if_zyd.c#4 integrate
.. //depot/projects/toestack/sys/dev/wi/if_wi.c#3 integrate
.. //depot/projects/toestack/sys/fs/msdosfs/msdosfs_fat.c#2 integrate
.. //depot/projects/toestack/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/procfs/procfs_status.c#2 integrate
.. //depot/projects/toestack/sys/geom/geom_event.c#2 integrate
.. //depot/projects/toestack/sys/geom/virstor/binstream.c#1 branch
.. //depot/projects/toestack/sys/geom/virstor/binstream.h#1 branch
.. //depot/projects/toestack/sys/geom/virstor/g_virstor.c#1 branch
.. //depot/projects/toestack/sys/geom/virstor/g_virstor.h#1 branch
.. //depot/projects/toestack/sys/geom/virstor/g_virstor_md.c#1 branch
.. //depot/projects/toestack/sys/geom/virstor/g_virstor_md.h#1 branch
.. //depot/projects/toestack/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/toestack/sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/toestack/sys/i386/i386/geode.c#2 integrate
.. //depot/projects/toestack/sys/i386/i386/intr_machdep.c#2 integrate
.. //depot/projects/toestack/sys/i386/i386/local_apic.c#3 integrate
.. //depot/projects/toestack/sys/i386/include/intr_machdep.h#2 integrate
.. //depot/projects/toestack/sys/i386/include/smp.h#2 integrate
.. //depot/projects/toestack/sys/i386/include/vmparam.h#2 integrate
.. //depot/projects/toestack/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/toestack/sys/i386/linux/linux_proto.h#2 integrate
.. //depot/projects/toestack/sys/i386/linux/linux_ptrace.c#2 integrate
.. //depot/projects/toestack/sys/i386/linux/linux_syscall.h#2 integrate
.. //depot/projects/toestack/sys/i386/linux/linux_sysent.c#2 integrate
.. //depot/projects/toestack/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/toestack/sys/i386/linux/syscalls.master#2 integrate
.. //depot/projects/toestack/sys/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/toestack/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/toestack/sys/ia64/ia64/uma_machdep.c#2 integrate
.. //depot/projects/toestack/sys/ia64/include/vmparam.h#2 integrate
.. //depot/projects/toestack/sys/kern/init_main.c#3 integrate
.. //depot/projects/toestack/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_kse.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_mbuf.c#3 integrate
.. //depot/projects/toestack/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_switch.c#3 integrate
.. //depot/projects/toestack/sys/kern/kern_synch.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_timeout.c#3 integrate
.. //depot/projects/toestack/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/toestack/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/toestack/sys/kern/subr_kdb.c#2 integrate
.. //depot/projects/toestack/sys/kern/subr_lock.c#2 integrate
.. //depot/projects/toestack/sys/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/toestack/sys/kern/subr_trap.c#2 integrate
.. //depot/projects/toestack/sys/kern/subr_witness.c#3 integrate
.. //depot/projects/toestack/sys/kern/sys_process.c#2 integrate
.. //depot/projects/toestack/sys/kern/uipc_mbuf.c#3 integrate
.. //depot/projects/toestack/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/toestack/sys/kern/vfs_cache.c#2 integrate
.. //depot/projects/toestack/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/toestack/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/toestack/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/toestack/sys/modules/Makefile#2 integrate
.. //depot/projects/toestack/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/toestack/sys/modules/cxgb/cxgb/Makefile#3 edit
.. //depot/projects/toestack/sys/modules/geom/geom_virstor/Makefile#1 branch
.. //depot/projects/toestack/sys/modules/sound/driver/emu10kx/Makefile#2 integrate
.. //depot/projects/toestack/sys/net/bpf_filter.c#2 integrate
.. //depot/projects/toestack/sys/net/if_bridge.c#2 integrate
.. //depot/projects/toestack/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/toestack/sys/net/if_media.h#2 integrate
.. //depot/projects/toestack/sys/net/if_stf.c#2 integrate
.. //depot/projects/toestack/sys/net/route.h#3 integrate
.. //depot/projects/toestack/sys/net80211/_ieee80211.h#3 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_ht.c#3 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_ht.h#2 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_ioctl.h#3 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_node.h#2 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_power.c#2 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_proto.c#3 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_proto.h#3 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_regdomain.c#2 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_var.h#3 integrate
.. //depot/projects/toestack/sys/netgraph/ng_ppp.c#2 integrate
.. //depot/projects/toestack/sys/netgraph/ng_pppoe.c#2 integrate
.. //depot/projects/toestack/sys/netinet/if_ether.c#3 integrate
.. //depot/projects/toestack/sys/netinet/in_gif.c#2 integrate
.. //depot/projects/toestack/sys/netinet/in_pcb.c#4 integrate
.. //depot/projects/toestack/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/toestack/sys/netinet/sctp.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_asconf.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_asconf.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_constants.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_input.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_lock_bsd.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_os_bsd.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_output.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_pcb.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_pcb.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_sysctl.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_timer.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_timer.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_uio.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctputil.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctputil.h#3 integrate
.. //depot/projects/toestack/sys/netinet/tcp_subr.c#4 integrate
.. //depot/projects/toestack/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/toestack/sys/netinet/tcp_timer.h#3 integrate
.. //depot/projects/toestack/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/toestack/sys/netinet/tcp_var.h#4 integrate
.. //depot/projects/toestack/sys/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/toestack/sys/netinet6/sctp6_var.h#2 integrate
.. //depot/projects/toestack/sys/nfsclient/nfs_bio.c#2 integrate
.. //depot/projects/toestack/sys/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/toestack/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/toestack/sys/pci/agp_i810.c#2 integrate
.. //depot/projects/toestack/sys/pci/agp_via.c#2 integrate
.. //depot/projects/toestack/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/toestack/sys/powerpc/conf/NOTES#2 integrate
.. //depot/projects/toestack/sys/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/toestack/sys/powerpc/powerpc/uma_machdep.c#2 integrate
.. //depot/projects/toestack/sys/security/mac_lomac/mac_lomac.c#3 integrate
.. //depot/projects/toestack/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/toestack/sys/sparc64/include/vmparam.h#2 integrate
.. //depot/projects/toestack/sys/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/toestack/sys/sparc64/sparc64/genassym.c#2 integrate
.. //depot/projects/toestack/sys/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/toestack/sys/sun4v/conf/GENERIC#2 integrate
.. //depot/projects/toestack/sys/sun4v/include/vmparam.h#2 integrate
.. //depot/projects/toestack/sys/sun4v/sun4v/vm_machdep.c#2 integrate
.. //depot/projects/toestack/sys/sys/callout.h#3 integrate
.. //depot/projects/toestack/sys/sys/lock_profile.h#2 integrate
.. //depot/projects/toestack/sys/sys/mbuf.h#3 integrate
.. //depot/projects/toestack/sys/sys/mount.h#2 integrate
.. //depot/projects/toestack/sys/sys/param.h#2 integrate
.. //depot/projects/toestack/sys/sys/proc.h#3 integrate
.. //depot/projects/toestack/sys/sys/socket.h#2 integrate
.. //depot/projects/toestack/sys/sys/user.h#2 integrate
.. //depot/projects/toestack/sys/sys/vmmeter.h#2 integrate
.. //depot/projects/toestack/sys/vm/vm_contig.c#3 integrate
.. //depot/projects/toestack/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_glue.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_map.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_object.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_object.h#2 integrate
.. //depot/projects/toestack/sys/vm/vm_page.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_page.h#2 integrate
.. //depot/projects/toestack/sys/vm/vm_pageout.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_pageq.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_phys.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_phys.h#2 integrate
.. //depot/projects/toestack/tools/tools/crypto/ipsecstats.c#2 integrate
.. //depot/projects/toestack/tools/tools/nanobsd/nanobsd.sh#2 integrate
.. //depot/projects/toestack/usr.bin/at/at.c#2 integrate
.. //depot/projects/toestack/usr.bin/calendar/calendars/calendar.dutch#3 integrate
.. //depot/projects/toestack/usr.bin/calendar/calendars/calendar.freebsd#2 integrate
.. //depot/projects/toestack/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici#2 integrate
.. //depot/projects/toestack/usr.bin/login/login_fbtab.c#2 integrate
.. //depot/projects/toestack/usr.bin/m4/gnum4.c#2 integrate
.. //depot/projects/toestack/usr.bin/mklocale/yacc.y#2 integrate
.. //depot/projects/toestack/usr.bin/systat/pigs.c#3 integrate
.. //depot/projects/toestack/usr.bin/top/machine.c#2 integrate
.. //depot/projects/toestack/usr.sbin/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agent.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agent.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/Makefile.inc#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/group.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/group.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/passwd.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/passwd.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/services.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/services.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/cachelib.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/cachelib.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/cacheplcs.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/cacheplcs.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/config.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/config.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/debug.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/hashtable.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/log.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/log.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/mp_rs_query.#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/mp_rs_query.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/mp_rs_query.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/mp_ws_query.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/mp_ws_query.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/nscd.8#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/nscd.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/nscd.conf.5#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/nscdcli.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/nscdcli.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/parser.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/parser.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/protocol.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/protocol.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/query.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/query.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/singletons.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/singletons.h#2 integrate
.. //depot/projects/toestack/usr.sbin/repquota/repquota.c#2 integrate
.. //depot/projects/toestack/usr.sbin/wpa/hostapd/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate
Differences ...
==== //depot/projects/toestack/ObsoleteFiles.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.110 2007/08/31 19:41:27 yar Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.112 2007/09/29 22:37:40 bushman 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,11 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20070930: rename of cached to nscd
+OLD_FILES+=etc/rc.d/cached
+OLD_FILES+=usr/sbin/cached
+OLD_FILES+=usr/share/man/man5/cached.conf.5
+OLD_FILES+=usr/share/man/man8/cached.8
# 20070807: removal of PowerPC specific header file.
.if ${TARGET_ARCH} == "powerpc"
OLD_FILES+=usr/include/machine/interruptvar.h
@@ -3301,7 +3306,6 @@
OLD_FILES+=usr/share/man/man4/uaudio.4.gz
OLD_FILES+=usr/share/man/man4/utf2.4.gz
OLD_FILES+=usr/share/man/man4/vinumdebug.4.gz
-OLD_FILES+=usr/share/man/man5/ar.5.gz
OLD_FILES+=usr/share/man/man5/disklabel.5.gz
OLD_FILES+=usr/share/man/man5/dm.conf.5.gz
OLD_FILES+=usr/share/man/man5/ranlib.5.gz
==== //depot/projects/toestack/UPDATING#2 (text+ko) ====
@@ -21,6 +21,13 @@
developers choose to disable these features on build machines
to maximize performance.
+20070928:
+ The caching daemon (cached) was renamed to nscd. nscd.conf
+ configuration file should be used instead of cached.conf and
+ nscd_enable, nscd_pidfile and nscd_flags options should be used
+ instead of cached_enable, cached_pidfile and cached_flags in
+ rc.conf.
+
20070704:
The new IPsec code is now compiled in using the IPSEC option. The
IPSEC option now requires "device crypto" be defined in your kernel
@@ -887,4 +894,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $
+$FreeBSD: src/UPDATING,v 1.504 2007/09/28 10:38:07 bushman Exp $
==== //depot/projects/toestack/bin/getfacl/getfacl.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.11 2006/03/13 11:45:29 rwatson Exp $");
+__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.12 2007/09/19 02:04:47 kevlo Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -41,6 +41,8 @@
#include <err.h>
#include <errno.h>
+#include <grp.h>
+#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -55,6 +57,32 @@
fprintf(stderr, "getfacl [-dhq] [file ...]\n");
}
+static char *
+getuname(uid_t uid)
+{
+ struct passwd *pw;
+ static char uids[10];
+
+ if ((pw = getpwuid(uid)) == NULL) {
+ (void)snprintf(uids, sizeof(uids), "%u", uid);
+ return (uids);
+ } else
+ return (pw->pw_name);
+}
+
+static char *
+getgname(gid_t gid)
+{
+ struct group *gr;
+ static char gids[10];
+
+ if ((gr = getgrgid(gid)) == NULL) {
+ (void)snprintf(gids, sizeof(gids), "%u", gid);
+ return (gids);
+ } else
+ return (gr->gr_name);
+}
+
/*
* return an ACL corresponding to the permissions
* contained in struct stat
@@ -169,8 +197,8 @@
more_than_one++;
if (!qflag)
- printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid,
- sb.st_gid);
+ printf("# file: %s\n# owner: %s\n# group: %s\n", path,
+ getuname(sb.st_uid), getgname(sb.st_gid));
if (hflag)
acl = acl_get_link_np(path, type);
==== //depot/projects/toestack/bin/ps/print.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -197,14 +197,13 @@
void
state(KINFO *k, VARENT *ve)
{
- int flag, sflag, tdflags;
+ int flag, tdflags;
char *cp;
VAR *v;
char buf[16];
v = ve->var;
flag = k->ki_p->ki_flag;
- sflag = k->ki_p->ki_sflag;
tdflags = k->ki_p->ki_tdflags; /* XXXKSE */
cp = buf;
@@ -242,7 +241,7 @@
*cp = '?';
}
cp++;
- if (!(sflag & PS_INMEM))
+ if (!(flag & P_INMEM))
*cp++ = 'W';
if (k->ki_p->ki_nice < NZERO)
*cp++ = '<';
@@ -591,7 +590,7 @@
#define fxtofl(fixpt) ((double)(fixpt) / fscale)
/* XXX - I don't like this */
- if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_sflag & PS_INMEM) == 0)
+ if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_flag & P_INMEM) == 0)
return (0.0);
if (rawcpu)
return (100.0 * fxtofl(k->ki_p->ki_pctcpu));
@@ -619,7 +618,7 @@
if (failure)
return (0.0);
- if ((k->ki_p->ki_sflag & PS_INMEM) == 0)
+ if ((k->ki_p->ki_flag & P_INMEM) == 0)
return (0.0);
/* XXX want pmap ptpages, segtab, etc. (per architecture) */
/* XXX don't have info about shared */
==== //depot/projects/toestack/bin/ps/ps.c#2 (text+ko) ====
@@ -47,7 +47,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.110 2005/02/09 17:37:38 ru Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -994,13 +994,13 @@
return (s);
}
-#define UREADOK(ki) (forceuread || (ki->ki_p->ki_sflag & PS_INMEM))
+#define UREADOK(ki) (forceuread || (ki->ki_p->ki_flag & P_INMEM))
static void
saveuser(KINFO *ki)
{
- if (ki->ki_p->ki_sflag & PS_INMEM) {
+ if (ki->ki_p->ki_flag & P_INMEM) {
/*
* The u-area might be swapped out, and we can't get
* at it because we have a crashdump and no swap.
==== //depot/projects/toestack/etc/defaults/rc.conf#3 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.317 2007/09/06 21:00:48 mlaier Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.318 2007/09/28 10:38:08 bushman Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -495,7 +495,6 @@
auditd_enable="NO" # Run the audit daemon.
auditd_program="/usr/sbin/auditd" # Path to the audit daemon.
auditd_flags="" # Which options to pass to the audit daemon.
-cached_enable="NO" # Run the nsswitch caching daemon.
cron_enable="YES" # Run the periodic job daemon.
cron_program="/usr/sbin/cron" # Which cron executable to run (if enabled).
cron_dst="YES" # Handle DST transitions intelligently (YES/NO)
@@ -503,6 +502,7 @@
lpd_enable="NO" # Run the line printer daemon.
lpd_program="/usr/sbin/lpd" # path to lpd, if you want a different one.
lpd_flags="" # Flags to lpd (if enabled).
+nscd_enable="NO" # Run the nsswitch caching daemon.
chkprintcap_enable="NO" # Run chkprintcap(8) before running lpd.
chkprintcap_flags="-d" # Create missing directories by default.
dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO).
==== //depot/projects/toestack/etc/mtree/BSD.include.dist#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.118 2007/07/14 21:49:21 rwatson Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.119 2007/09/23 07:34:21 pjd Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -174,6 +174,8 @@
..
stripe
..
+ virstor
+ ..
..
gnu
posix
==== //depot/projects/toestack/etc/rc.d/Makefile#3 (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.83 2007/09/07 15:44:09 mlaier Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.84 2007/09/28 10:38:08 bushman Exp $
.include <bsd.own.mk>
@@ -48,7 +48,7 @@
.endif
.if ${MK_NS_CACHING} != "no"
-FILES+= cached
+FILES+= nscd
.endif
FILESDIR= /etc/rc.d
==== //depot/projects/toestack/etc/rc.d/nscd#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/nscd,v 1.4 2007/08/09 13:06:11 bushman Exp $
+# $FreeBSD: src/etc/rc.d/nscd,v 1.6 2007/09/28 10:38:08 bushman Exp $
#
# PROVIDE: nscd
@@ -8,7 +8,7 @@
# BEFORE: LOGIN
#
-# Add the following lines to /etc/rc.conf to enable cached:
+# Add the following lines to /etc/rc.conf to enable nscd:
#
# nscd_enable="YES"
#
@@ -24,9 +24,29 @@
extra_commands="flush"
flush_cmd="${command} -I all"
-nscd_enable=${nscd_enable:-"NO"}
-nscd_pidfile=${nscd_pidfile:-"/var/run/nscd.pid"}
-nscd_flags=${nscd_flags:-""}
+# usage: _nscd_set_option <option name> <default value>
+#
+_nscd_set_option() {
+ local _optname _defoptval _nscd_opt_val _cached_opt_val
+ _optname=$1
+ _defoptval=$2
+
+ _nscd_opt_val=$(eval "echo \$nscd_${_optname}")
+ _cached_opt_val=$(eval "echo \$cached_${_optname}")
+
+ if [ -n "$_cached_opt_val" -a "$_nscd_opt_val" != "$_defoptval" ]; then
+ warn "You should use nscd_${_optname} instead of" \
+ "cached_${_optname}"
+ setvar "nscd_${_optname}" "$_cached_opt_val"
+ else
+ setvar "nscd_${_optname}" "${_nscd_opt_val:-$_defoptval}"
+ fi
+}
+
load_rc_config $name
+_nscd_set_option "enable" "NO"
+_nscd_set_option "pidfile" "/var/run/nscd.pid"
+_nscd_set_option "flags" ""
run_rc_command "$1"
+
==== //depot/projects/toestack/etc/services#3 (text+ko) ====
@@ -16,7 +16,7 @@
# Kerberos services are for Kerberos v4, and are unofficial. Sites running
# v5 should uncomment v5 entries and comment v4 entries.
#
-# $FreeBSD: src/etc/services,v 1.112 2007/09/08 08:56:01 mr Exp $
+# $FreeBSD: src/etc/services,v 1.113 2007/09/21 01:26:00 brooks Exp $
# From: @(#)services 5.8 (Berkeley) 5/9/91
#
# WELL KNOWN PORT NUMBERS
@@ -2331,7 +2331,7 @@
sge_qmaster 6444/tcp #Grid Engine Qmaster Service
sge_qmaster 6444/udp #Grid Engine Qmaster Service
sge_execd 6445/tcp #Grid Engine Execution Service
-sge_execd 6445/upd #Grid Engine Execution Service
+sge_execd 6445/udp #Grid Engine Execution Service
xdsxdm 6558/tcp
xdsxdm 6558/udp
ircd 6667/tcp #Internet Relay Chat (unoffical)
==== //depot/projects/toestack/gnu/usr.bin/binutils/ld/Makefile#2 (text+ko) ====
@@ -1,9 +1,13 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.31 2004/12/21 09:59:40 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.32 2007/09/26 01:31:28 marcel Exp $
.include "../Makefile.inc0"
.PATH: ${SRCDIR}/ld
+.if ${TARGET_ARCH} == "ia64"
+CFLAGS+= -O1
+.endif
+
PROG= ld
SCRIPTDIR= /usr/libdata/ldscripts
SRCS+= ldcref.c ldctor.c ldemul.c ldemul-list.h ldexp.c ldfile.c \
==== //depot/projects/toestack/gnu/usr.bin/binutils/ld/genscripts.sh#2 (text+ko) ====
@@ -9,7 +9,7 @@
# sparc-sun-sunos4.1.3 sparc-sun-sunos4.1.3 sun4 "" sun3 sparc-sun-sunos4.1.3
# produces sun3.x sun3.xbn sun3.xn sun3.xr sun3.xu em_sun3.c
#
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.7 2006/09/14 07:46:32 imp Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.9 2007/09/19 14:19:32 obrien Exp $
#
# This is a cut-down version of the GNU script. Instead of jumping through
# hoops for all possible combinations of paths, just use the libdir
@@ -54,8 +54,12 @@
fi
# Set some flags for the emultempl scripts. USE_LIBPATH will
-# be set for any libpath-using emulation.
- USE_LIBPATH=yes
+# be set for any libpath-using emulation; NATIVE will be set for a
+# emulation to enable 'LD_LIBRARY_PATH=/foo:/bar ld -lfooz'
+ if [ "x${host}" = "x${target}" ] ; then
+ NATIVE=yes
+ fi
+ USE_LIBPATH=yes
# Set the library search path, for libraries named by -lfoo.
# If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used.
==== //depot/projects/toestack/gnu/usr.bin/cc/cc_int/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.51 2007/05/19 04:25:57 kan Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.52 2007/09/18 23:34:42 cognet Exp $
.include "../Makefile.inc"
.include "../Makefile.ver"
@@ -75,6 +75,10 @@
# Target specific, C specific object file
C_TARGET_OBJS=
+.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
+CFLAGS += -DTARGET_ENDIAN_DEFAULT=MASK_BIG_END
+.endif
+
# Language-specific object files for C and Objective C.
C_AND_OBJC_OBJS = attribs.o c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \
c-convert.o c-aux-info.o c-common.o c-opts.o c-format.o c-semantics.o \
==== //depot/projects/toestack/gnu/usr.bin/man/man/man.c#2 (text+ko) ====
@@ -16,7 +16,7 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.63 2005/12/05 14:22:11 ru Exp $";
+ "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.65 2007/09/25 21:41:22 edwin Exp $";
#endif /* not lint */
#define MAN_MAIN
@@ -884,11 +884,26 @@
next:
+#if HAVE_LIBZ > 0
+ if ((fp = gzopen (ult, "r")) == NULL)
+ {
+ /* check for the compressed version too */
+ strlcat(ult, ".gz", FILENAME_MAX);
+ if ((fp = gzopen (ult, "r")) == NULL)
+ return ult; /* we munged it, but it doesn't exist anyway */
+ }
+#else
if ((fp = fopen (ult, "r")) == NULL)
return ult;
+#endif
+#if HAVE_LIBZ > 0
+ end = gzgets (fp, buf, BUFSIZ);
+ gzclose(fp);
+#else
end = fgets (buf, BUFSIZ, fp);
fclose(fp);
+#endif
if (!end || strlen (buf) < 5)
return ult;
==== //depot/projects/toestack/gnu/usr.bin/texinfo/info/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/texinfo/info/Makefile,v 1.13 2002/06/05 06:58:32 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/texinfo/info/Makefile,v 1.14 2007/09/19 14:21:18 obrien Exp $
PROG= info
MAN= info.1 info.5 texinfo.5
@@ -8,7 +8,7 @@
infomap.c m-x.c man.c nodemenu.c nodes.c search.c session.c \
signals.c terminal.c tilde.c variables.c window.c
-CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:/usr/X11R6/info:.\"
+CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\"
DPADD= ${LIBTERMCAP} ${LIBTXI}
LDADD= -ltermcap ${LIBTXI}
==== //depot/projects/toestack/include/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.274 2007/07/14 21:49:22 rwatson Exp $
+# $FreeBSD: src/include/Makefile,v 1.275 2007/09/23 07:34:21 pjd Exp $
#
# Doing a "make install" builds /usr/include.
@@ -49,7 +49,7 @@
fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
- geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \
+ geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe geom/virstor \
netgraph/atm netgraph/netflow \
security/audit \
security/mac_biba security/mac_bsdextended security/mac_lomac \
==== //depot/projects/toestack/lib/libarchive/archive_read.3#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.34 2007/05/29 01:00:18 kientzle Exp $
+.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.35 2007/09/19 16:37:45 kientzle Exp $
.\"
.Dd August 19, 2006
.Dt archive_read 3
@@ -267,7 +267,7 @@
The
.Va flags
argument is passed unmodified to
-.Xr archiv_write_disk_set_options 3 .
+.Xr archive_write_disk_set_options 3 .
.It Fn archive_read_extract_set_progress_callback
Sets a pointer to a user-defined callback that can be used
for updating progress displays during extraction.
==== //depot/projects/toestack/lib/libarchive/archive_write_disk.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.14 2007/08/12 17:35:05 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.17 2007/09/21 04:52:42 kientzle Exp $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -448,8 +448,10 @@
__archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
ARCHIVE_STATE_DATA, "archive_write_disk_block");
- if (a->fd < 0)
- return (ARCHIVE_OK);
+ if (a->fd < 0) {
+ archive_set_error(&a->archive, 0, "File not open");
+ return (ARCHIVE_WARN);
+ }
archive_clear_error(&a->archive);
/* Seek if necessary to the specified offset. */
@@ -478,12 +480,17 @@
_archive_write_data(struct archive *_a, const void *buff, size_t size)
{
struct archive_write_disk *a = (struct archive_write_disk *)_a;
+ int r;
+
__archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
ARCHIVE_STATE_DATA, "archive_write_data");
if (a->fd < 0)
return (ARCHIVE_OK);
- return (_archive_write_data_block(_a, buff, size, a->offset));
+ r = _archive_write_data_block(_a, buff, size, a->offset);
+ if (r < ARCHIVE_OK)
+ return (r);
+ return (size);
}
static int
==== //depot/projects/toestack/lib/libarchive/test/test_write_disk.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.3 2007/07/06 15:43:11 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.6 2007/09/21 04:52:43 kientzle Exp $");
#if ARCHIVE_VERSION_STAMP >= 1009000
@@ -50,8 +50,76 @@
st.st_mode, archive_entry_mode(ae));
assert(st.st_mode == (archive_entry_mode(ae) & ~UMASK));
}
+
+static void create_reg_file(struct archive_entry *ae, const char *msg)
+{
+ static const char data[]="abcdefghijklmnopqrstuvwxyz";
+ struct archive *ad;
+ struct stat st;
+
+ /* Write the entry to disk. */
+ assert((ad = archive_write_disk_new()) != NULL);
+ failure("%s", msg);
+ assertEqualIntA(ad, 0, archive_write_header(ad, ae));
+ assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data)));
+ assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
+#if ARCHIVE_API_VERSION > 1
+ assertEqualInt(0, archive_write_finish(ad));
+#else
+ archive_write_finish(ad);
#endif
+ /* Test the entries on disk. */
+ assert(0 == stat(archive_entry_pathname(ae), &st));
+ failure("st.st_mode=%o archive_entry_mode(ae)=%o",
+ st.st_mode, archive_entry_mode(ae));
+ assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK));
+ assertEqualInt(st.st_size, sizeof(data));
+}
+
+static void create_reg_file2(struct archive_entry *ae, const char *msg)
+{
+ const int datasize = 100000;
+ char *data;
+ char *compare;
+ struct archive *ad;
+ struct stat st;
+ int i, fd;
+ data = malloc(datasize);
+ for (i = 0; i < datasize; i++)
+ data[i] = (char)(i % 256);
+
+ /* Write the entry to disk. */
+ assert((ad = archive_write_disk_new()) != NULL);
+ failure("%s", msg);
+ assertEqualIntA(ad, 0, archive_write_header(ad, ae));
+ for (i = 0; i < datasize - 999; i += 1000) {
+ assertEqualIntA(ad, ARCHIVE_OK,
+ archive_write_data_block(ad, data + i, 1000, i));
+ }
+ assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
+#if ARCHIVE_API_VERSION > 1
+ assertEqualInt(0, archive_write_finish(ad));
+#else
+ archive_write_finish(ad);
+#endif
+ /* Test the entries on disk. */
+ assert(0 == stat(archive_entry_pathname(ae), &st));
+ failure("st.st_mode=%o archive_entry_mode(ae)=%o",
+ st.st_mode, archive_entry_mode(ae));
+ assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK));
+ assertEqualInt(st.st_size, i);
+
+ compare = malloc(datasize);
+ fd = open(archive_entry_pathname(ae), O_RDONLY);
+ assertEqualInt(datasize, read(fd, compare, datasize));
+ close(fd);
+ assert(memcmp(compare, data, datasize) == 0);
+ free(compare);
+ free(data);
+}
+#endif
+
DEFINE_TEST(test_write_disk)
{
#if ARCHIVE_VERSION_STAMP < 1009000
@@ -66,7 +134,14 @@
assert((ae = archive_entry_new()) != NULL);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list