PERFORCE change 155129 for review
Ed Schouten
ed at FreeBSD.org
Mon Dec 22 13:09:42 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=155129
Change 155129 by ed at ed_dull on 2008/12/22 21:09:25
IFC.
Affected files ...
.. //depot/projects/mpsafetty/UPDATING#17 integrate
.. //depot/projects/mpsafetty/contrib/netcat/FREEBSD-vendor#2 integrate
.. //depot/projects/mpsafetty/contrib/netcat/nc.1#2 integrate
.. //depot/projects/mpsafetty/contrib/netcat/netcat.c#2 integrate
.. //depot/projects/mpsafetty/etc/Makefile#6 integrate
.. //depot/projects/mpsafetty/etc/devd.conf#4 integrate
.. //depot/projects/mpsafetty/etc/devd/Makefile#1 branch
.. //depot/projects/mpsafetty/etc/devd/asus.conf#1 branch
.. //depot/projects/mpsafetty/etc/mtree/BSD.root.dist#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/defaultroute#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_ar.c#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/main.c#4 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_gtar.c#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_write_compress.c#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_ar.c#3 integrate
.. //depot/projects/mpsafetty/lib/libfetch/fetch.c#2 integrate
.. //depot/projects/mpsafetty/lib/libutil/kinfo_getfile.c#2 integrate
.. //depot/projects/mpsafetty/lib/libutil/kinfo_getvmmap.c#2 integrate
.. //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 integrate
.. //depot/projects/mpsafetty/sbin/ipfw/ipfw.8#6 integrate
.. //depot/projects/mpsafetty/sbin/ipfw/ipfw2.c#7 integrate
.. //depot/projects/mpsafetty/sbin/kldstat/kldstat.c#2 integrate
.. //depot/projects/mpsafetty/sbin/mount/mount.c#3 integrate
.. //depot/projects/mpsafetty/sbin/mount/mount_fs.c#2 integrate
.. //depot/projects/mpsafetty/share/man/man4/acpi_asus.4#4 integrate
.. //depot/projects/mpsafetty/share/man/man9/VOP_STRATEGY.9#2 integrate
.. //depot/projects/mpsafetty/share/man/man9/style.9#6 integrate
.. //depot/projects/mpsafetty/sys/amd64/conf/DEFAULTS#2 integrate
.. //depot/projects/mpsafetty/sys/amd64/include/elf.h#2 integrate
.. //depot/projects/mpsafetty/sys/amd64/linux32/linux32_sysvec.c#5 integrate
.. //depot/projects/mpsafetty/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/mpsafetty/sys/arm/arm/identcpu.c#3 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/AVILA#7 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/AVILA.hints#2 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/CAMBRIA#1 branch
.. //depot/projects/mpsafetty/sys/arm/conf/CAMBRIA.hints#1 branch
.. //depot/projects/mpsafetty/sys/arm/conf/DEFAULTS#2 integrate
.. //depot/projects/mpsafetty/sys/arm/conf/EP80219#5 integrate
.. //depot/projects/mpsafetty/sys/arm/include/armreg.h#3 integrate
.. //depot/projects/mpsafetty/sys/arm/include/elf.h#2 integrate
.. //depot/projects/mpsafetty/sys/arm/include/intr.h#4 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/avila_ata.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/avila_led.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/cambria_fled.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/cambria_led.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/files.avila#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/if_npe.c#3 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/if_npereg.h#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425.c#3 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_iic.c#3 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425reg.h#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425var.h#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp435_ehci.c#1 branch
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/std.avila#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/std.ixp435#1 branch
.. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/arm_init.S#2 integrate
.. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/boot2.c#2 integrate
.. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/ixp425_board.c#2 integrate
.. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/lib.h#2 integrate
.. //depot/projects/mpsafetty/sys/boot/i386/gptzfsboot/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/boot/i386/zfsboot/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/boot/powerpc/uboot/conf.c#2 integrate
.. //depot/projects/mpsafetty/sys/boot/uboot/common/main.c#3 integrate
.. //depot/projects/mpsafetty/sys/boot/uboot/lib/devicename.c#3 integrate
.. //depot/projects/mpsafetty/sys/boot/zfs/zfsimpl.c#3 integrate
.. //depot/projects/mpsafetty/sys/cam/cam_periph.c#2 integrate
.. //depot/projects/mpsafetty/sys/cam/cam_periph.h#2 integrate
.. //depot/projects/mpsafetty/sys/cam/cam_sim.c#2 integrate
.. //depot/projects/mpsafetty/sys/cam/cam_sim.h#2 integrate
.. //depot/projects/mpsafetty/sys/cam/cam_xpt.c#3 integrate
.. //depot/projects/mpsafetty/sys/cam/scsi/scsi_cd.c#2 integrate
.. //depot/projects/mpsafetty/sys/cam/scsi/scsi_da.c#4 integrate
.. //depot/projects/mpsafetty/sys/cam/scsi/scsi_pass.c#3 integrate
.. //depot/projects/mpsafetty/sys/cam/scsi/scsi_sg.c#3 integrate
.. //depot/projects/mpsafetty/sys/compat/svr4/svr4_sysvec.c#5 integrate
.. //depot/projects/mpsafetty/sys/conf/files#36 integrate
.. //depot/projects/mpsafetty/sys/conf/files.powerpc#11 integrate
.. //depot/projects/mpsafetty/sys/conf/files.sparc64#11 integrate
.. //depot/projects/mpsafetty/sys/conf/files.sun4v#4 integrate
.. //depot/projects/mpsafetty/sys/conf/options#18 integrate
.. //depot/projects/mpsafetty/sys/conf/options.arm#4 integrate
.. //depot/projects/mpsafetty/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#2 integrate
.. //depot/projects/mpsafetty/sys/crypto/rc4/rc4.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/agp/agppriv.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.h#11 integrate
.. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-ahci.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-sis.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/atkbdc/psm.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/bce/if_bce.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_main.c#15 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drmP.h#5 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_drv.c#8 integrate
.. //depot/projects/mpsafetty/sys/dev/drm/drm_scatter.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/fxp/if_fxp.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_core.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/isp/isp.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/md/md.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/mfi/mfi.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/mfi/mfi_pci.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/nfe/if_nfe.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/ofw/ofw_if.m#1 branch
.. //depot/projects/mpsafetty/sys/dev/ofw/ofw_standard.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/ofw/ofwvar.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/ofw/openfirm.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/ofw/openfirm.h#3 integrate
.. //depot/projects/mpsafetty/sys/dev/ofw/openfirmio.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/ofw/openpromio.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/re/if_re.c#9 integrate
.. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#11 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ehci.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ehci_ddb.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb/ehci_mbus.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ehci_pci.c#6 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ehcireg.h#4 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ehcivar.h#4 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ucom.c#12 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/usbdi.h#3 integrate
.. //depot/projects/mpsafetty/sys/fs/hpfs/hpfs_vnops.c#6 integrate
.. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate
.. //depot/projects/mpsafetty/sys/fs/ntfs/ntfs_vnops.c#6 integrate
.. //depot/projects/mpsafetty/sys/fs/nwfs/nwfs_vnops.c#4 integrate
.. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_vnops.c#4 integrate
.. //depot/projects/mpsafetty/sys/geom/geom_vfs.c#3 integrate
.. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate
.. //depot/projects/mpsafetty/sys/gnu/fs/reiserfs/reiserfs_vnops.c#3 integrate
.. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate
.. //depot/projects/mpsafetty/sys/i386/conf/DEFAULTS#3 integrate
.. //depot/projects/mpsafetty/sys/i386/include/elf.h#2 integrate
.. //depot/projects/mpsafetty/sys/i386/linux/linux_sysvec.c#5 integrate
.. //depot/projects/mpsafetty/sys/ia64/include/elf.h#2 integrate
.. //depot/projects/mpsafetty/sys/kern/imgact_elf.c#3 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_cpu.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_mbuf.c#4 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_kobj.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_param.c#4 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_prf.c#7 integrate
.. //depot/projects/mpsafetty/sys/kern/tty.c#68 integrate
.. //depot/projects/mpsafetty/sys/kern/tty_pts.c#26 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_lookup.c#6 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_mount.c#13 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_subr.c#14 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#12 integrate
.. //depot/projects/mpsafetty/sys/mips/conf/DEFAULTS#2 integrate
.. //depot/projects/mpsafetty/sys/mips/include/elf.h#2 integrate
.. //depot/projects/mpsafetty/sys/mips/mips/elf_machdep.c#4 integrate
.. //depot/projects/mpsafetty/sys/net/ieee8023ad_lacp.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/if.c#14 integrate
.. //depot/projects/mpsafetty/sys/net/if_arcsubr.c#5 integrate
.. //depot/projects/mpsafetty/sys/net/if_ethersubr.c#10 integrate
.. //depot/projects/mpsafetty/sys/net/if_fddisubr.c#6 integrate
.. //depot/projects/mpsafetty/sys/net/if_fwsubr.c#6 integrate
.. //depot/projects/mpsafetty/sys/net/if_iso88025subr.c#6 integrate
.. //depot/projects/mpsafetty/sys/net/if_lagg.c#5 integrate
.. //depot/projects/mpsafetty/sys/net/if_llatbl.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/if_llatbl.h#2 integrate
.. //depot/projects/mpsafetty/sys/net/if_media.h#3 integrate
.. //depot/projects/mpsafetty/sys/net/if_tun.c#9 integrate
.. //depot/projects/mpsafetty/sys/net/if_var.h#8 integrate
.. //depot/projects/mpsafetty/sys/net/pfil.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/radix.c#3 integrate
.. //depot/projects/mpsafetty/sys/net/route.c#13 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_acl.c#3 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto.h#3 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto_ccmp.c#3 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto_tkip.c#4 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto_wep.c#3 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_freebsd.c#5 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#9 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_input.c#5 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_ioctl.c#7 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_node.c#7 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_power.c#3 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_proto.c#3 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_scan.c#3 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_scan_sta.c#6 integrate
.. //depot/projects/mpsafetty/sys/net80211/ieee80211_sta.c#7 integrate
.. //depot/projects/mpsafetty/sys/netgraph/ng_mppc.c#4 integrate
.. //depot/projects/mpsafetty/sys/netinet/if_ether.c#13 integrate
.. //depot/projects/mpsafetty/sys/netinet/in.c#8 integrate
.. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#17 integrate
.. //depot/projects/mpsafetty/sys/netinet/in_pcb.h#12 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#18 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_fw_pfil.c#5 integrate
.. //depot/projects/mpsafetty/sys/netinet/raw_ip.c#13 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_hostcache.c#9 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#15 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#15 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.c#15 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_timewait.c#6 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_usrreq.c#6 integrate
.. //depot/projects/mpsafetty/sys/netinet6/icmp6.c#10 integrate
.. //depot/projects/mpsafetty/sys/netinet6/in6.c#8 integrate
.. //depot/projects/mpsafetty/sys/netinet6/in6_pcb.c#10 integrate
.. //depot/projects/mpsafetty/sys/netinet6/in6_rmx.c#10 integrate
.. //depot/projects/mpsafetty/sys/netinet6/in6_src.c#12 integrate
.. //depot/projects/mpsafetty/sys/netinet6/ip6_input.c#9 integrate
.. //depot/projects/mpsafetty/sys/netinet6/ip6_output.c#8 integrate
.. //depot/projects/mpsafetty/sys/netinet6/nd6.c#9 integrate
.. //depot/projects/mpsafetty/sys/netinet6/nd6.h#6 integrate
.. //depot/projects/mpsafetty/sys/netinet6/nd6_nbr.c#9 integrate
.. //depot/projects/mpsafetty/sys/netinet6/nd6_rtr.c#9 integrate
.. //depot/projects/mpsafetty/sys/netinet6/raw_ip6.c#11 integrate
.. //depot/projects/mpsafetty/sys/netinet6/udp6_usrreq.c#10 integrate
.. //depot/projects/mpsafetty/sys/netipsec/ipsec.c#9 integrate
.. //depot/projects/mpsafetty/sys/netipsec/key.c#7 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_serv.c#10 integrate
.. //depot/projects/mpsafetty/sys/pc98/conf/DEFAULTS#2 integrate
.. //depot/projects/mpsafetty/sys/pc98/conf/GENERIC#9 integrate
.. //depot/projects/mpsafetty/sys/pci/if_rl.c#6 integrate
.. //depot/projects/mpsafetty/sys/pci/if_rlreg.h#10 integrate
.. //depot/projects/mpsafetty/sys/powerpc/aim/locore.S#3 integrate
.. //depot/projects/mpsafetty/sys/powerpc/aim/machdep.c#4 integrate
.. //depot/projects/mpsafetty/sys/powerpc/aim/ofw_machdep.c#3 integrate
.. //depot/projects/mpsafetty/sys/powerpc/booke/interrupt.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/booke/locore.S#4 integrate
.. //depot/projects/mpsafetty/sys/powerpc/booke/machdep.c#4 integrate
.. //depot/projects/mpsafetty/sys/powerpc/include/elf.h#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/include/ofw_machdep.h#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/include/spr.h#3 integrate
.. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/lbc.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/lbc.h#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/mpc85xx.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/mpc85xx.h#1 branch
.. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/nexus.c#2 integrate
.. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/ocpbus.c#3 integrate
.. //depot/projects/mpsafetty/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate
.. //depot/projects/mpsafetty/sys/security/mac/mac_process.c#4 integrate
.. //depot/projects/mpsafetty/sys/sparc64/conf/DEFAULTS#2 integrate
.. //depot/projects/mpsafetty/sys/sparc64/include/elf.h#2 integrate
.. //depot/projects/mpsafetty/sys/sparc64/include/ofw_machdep.h#2 integrate
.. //depot/projects/mpsafetty/sys/sparc64/pci/schizo.c#5 integrate
.. //depot/projects/mpsafetty/sys/sparc64/sparc64/machdep.c#6 integrate
.. //depot/projects/mpsafetty/sys/sparc64/sparc64/mp_machdep.c#8 integrate
.. //depot/projects/mpsafetty/sys/sparc64/sparc64/support.S#5 integrate
.. //depot/projects/mpsafetty/sys/sparc64/sparc64/trap.c#5 integrate
.. //depot/projects/mpsafetty/sys/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/sun4v/conf/DEFAULTS#2 integrate
.. //depot/projects/mpsafetty/sys/sun4v/include/elf.h#2 integrate
.. //depot/projects/mpsafetty/sys/sun4v/include/ofw_machdep.h#2 integrate
.. //depot/projects/mpsafetty/sys/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/sun4v/sun4v/mp_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/sun4v/sun4v/support.S#2 integrate
.. //depot/projects/mpsafetty/sys/sun4v/sun4v/trap.c#2 integrate
.. //depot/projects/mpsafetty/sys/sys/buf_ring.h#3 integrate
.. //depot/projects/mpsafetty/sys/sys/elf_common.h#3 integrate
.. //depot/projects/mpsafetty/sys/sys/imgact_elf.h#2 integrate
.. //depot/projects/mpsafetty/sys/sys/kobj.h#2 integrate
.. //depot/projects/mpsafetty/sys/sys/mount.h#8 integrate
.. //depot/projects/mpsafetty/sys/sys/param.h#24 integrate
.. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vfsops.c#4 integrate
.. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vnops.c#8 integrate
.. //depot/projects/mpsafetty/sys/vm/vm_object.c#5 integrate
.. //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#13 integrate
.. //depot/projects/mpsafetty/tools/tools/tionxcl/Makefile#1 branch
.. //depot/projects/mpsafetty/tools/tools/tionxcl/tionxcl.c#1 branch
.. //depot/projects/mpsafetty/usr.bin/fetch/fetch.c#5 integrate
.. //depot/projects/mpsafetty/usr.bin/ipcs/ipcs.c#2 integrate
.. //depot/projects/mpsafetty/usr.bin/make/globals.h#2 integrate
.. //depot/projects/mpsafetty/usr.bin/make/job.c#4 integrate
.. //depot/projects/mpsafetty/usr.bin/make/job.h#2 integrate
.. //depot/projects/mpsafetty/usr.bin/make/main.c#3 integrate
.. //depot/projects/mpsafetty/usr.bin/make/make.c#2 integrate
.. //depot/projects/mpsafetty/usr.bin/procstat/procstat.1#5 integrate
.. //depot/projects/mpsafetty/usr.bin/procstat/procstat_files.c#5 integrate
.. //depot/projects/mpsafetty/usr.bin/procstat/procstat_vm.c#3 integrate
.. //depot/projects/mpsafetty/usr.sbin/Makefile#15 integrate
.. //depot/projects/mpsafetty/usr.sbin/burncd/Makefile#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/burncd/burncd.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/makefs/Makefile#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/compat/pwcache.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/compat/pwcache.h#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/compat/strsuftoll.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/ffs.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/buf.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/buf.h#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ffs_alloc.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ffs_balloc.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ffs_bswap.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ffs_extern.h#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ffs_subr.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/mkfs.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/newfs_extern.h#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ufs_bmap.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ufs_bswap.h#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ufs_inode.h#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/getid.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/makefs.8#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/makefs.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/makefs.h#1 branch
.. //depot/projects/mpsafetty/usr.sbin/makefs/walk.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/nscd/nscd.conf.5#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/ppp/route.c#3 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/Makefile#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/config.c#4 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/devices.c#5 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/dispatch.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/dist.c#4 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/dist.h#3 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/media.c#3 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/menus.c#4 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/options.c#3 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/sysinstall.8#3 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/sysinstall.h#6 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/system.c#4 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/tape.c#3 delete
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/user.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/syslogd/Makefile#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/syslogd/syslogd.c#5 integrate
Differences ...
==== //depot/projects/mpsafetty/UPDATING#17 (text+ko) ====
@@ -22,6 +22,14 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20081219:
+ With __FreeBSD_version 800060 the makefs tool is part of
+ the base system (it was a port).
+
+20081216:
+ The afdata and ifnet locks have been changed from mutexes to
+ rwlocks, network modules will need to be re-compiled.
+
20081214:
__FreeBSD_version 800059 incorporates the new arp-v2 rewrite.
RTF_CLONING, RTF_LLINFO and RTF_WASCLONED flags are eliminated.
@@ -1187,4 +1195,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.553 2008/12/15 06:10:57 qingli Exp $
+$FreeBSD: src/UPDATING,v 1.556 2008/12/19 23:12:14 sam Exp $
==== //depot/projects/mpsafetty/contrib/netcat/FREEBSD-vendor#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/contrib/netcat/FREEBSD-vendor,v 1.1 2008/04/21 18:36:52 delphij Exp $
+# $FreeBSD: src/contrib/netcat/FREEBSD-vendor,v 1.2 2008/12/19 23:00:23 delphij Exp $
Project: netcat (aka src/usr.bin/nc in OpenBSD)
ProjectURL: http://www.openbsd.org/
-Version: 4.3
+Version: 4.4
VendorTag: OPENBSD
-VersionTag: OPENBSD_4_3
+VersionTag: OPENBSD_4_4
License: BSD
==== //depot/projects/mpsafetty/contrib/netcat/nc.1#2 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nc.1,v 1.45 2007/05/31 19:20:13 jmc Exp $
+.\" $OpenBSD: nc.1,v 1.47 2008/05/06 16:21:03 jmc Exp $
.\"
.\" Copyright (c) 1996 David Sacerdote
.\" All rights reserved.
@@ -25,9 +25,9 @@
.\" (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/contrib/netcat/nc.1,v 1.10 2008/05/10 18:50:45 antoine Exp $
+.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.11 2008/12/19 23:00:23 delphij Exp $
.\"
-.Dd $Mdocdate$
+.Dd $Mdocdate: May 6 2008 $
.Dt NC 1
.Os
.Sh NAME
@@ -36,9 +36,12 @@
.Sh SYNOPSIS
.Nm nc
.Bk -words
-.Op Fl 46DdEhklnOorStUuvz
+.Op Fl 46DdEhklnorStUuvz
.Op Fl e Ar IPsec_policy
+.Op Fl I Ar length
.Op Fl i Ar interval
+.Op Fl -no-tcpopt
+.Op Fl O Ar length
.Op Fl P Ar proxy_username
.Op Fl p Ar source_port
.Op Fl s Ar source_ip_address
@@ -118,6 +121,8 @@
Prints out
.Nm
help.
+.It Fl I Ar length
+Specifies the size of the TCP receive buffer.
.It Fl i Ar interval
Specifies a delay time interval between lines of text sent and received.
Also causes a delay time between connections to multiple ports.
@@ -146,10 +151,13 @@
.It Fl n
Do not do any DNS or service lookups on any specified addresses,
hostnames or ports.
-.It Fl O
+.It Fl -no-tcpopt
Disables the use of TCP options on the socket, by setting the boolean
TCP_NOOPT
socket option.
+.It Fl O Ar length
+Specifies the size of the TCP send buffer.
+When
.It Fl o
.Dq Once-only mode .
By default,
==== //depot/projects/mpsafetty/contrib/netcat/netcat.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.89 2007/02/20 14:11:17 jmc Exp $ */
+/* $OpenBSD: netcat.c,v 1.91 2008/05/09 09:00:11 markus Exp $ */
/*
* Copyright (c) 2001 Eric Jackson <ericj at monkey.org>
*
@@ -25,7 +25,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/contrib/netcat/netcat.c,v 1.8 2008/05/10 18:50:45 antoine Exp $
+ * $FreeBSD: src/contrib/netcat/netcat.c,v 1.9 2008/12/19 23:00:23 delphij Exp $
*/
/*
@@ -50,6 +50,7 @@
#include <err.h>
#include <errno.h>
+#include <getopt.h>
#include <netdb.h>
#include <poll.h>
#include <stdarg.h>
@@ -78,7 +79,7 @@
int lflag; /* Bind to local port */
int nflag; /* Don't do name look up */
int oflag; /* Once only: stop on EOF */
-int Oflag; /* Do not use TCP options */
+int FreeBSD_Oflag; /* Do not use TCP options */
char *Pflag; /* Proxy username */
char *pflag; /* Localport flag */
int rflag; /* Random ports flag */
@@ -89,6 +90,8 @@
int xflag; /* Socks proxy */
int zflag; /* Port Scan Flag */
int Dflag; /* sodebug */
+int Iflag; /* TCP receive buffer size */
+int Oflag; /* TCP send buffer size */
int Sflag; /* TCP MD5 signature option */
int Tflag = -1; /* IP Type of Service */
@@ -129,6 +132,10 @@
char *proxy;
const char *errstr, *proxyhost = "", *proxyport = NULL;
struct addrinfo proxyhints;
+ struct option longopts[] = {
+ { "no-tcpopt", no_argument, &FreeBSD_Oflag, 1 },
+ { NULL, 0, NULL, 0 }
+ };
ret = 1;
ipsec_count = 0;
@@ -138,8 +145,9 @@
uport = NULL;
sv = NULL;
- while ((ch = getopt(argc, argv,
- "46e:DEdhi:jklnoOP:p:rSs:tT:Uuvw:X:x:z")) != -1) {
+ while ((ch = getopt_long(argc, argv,
+ "46e:DEdhi:jklnoI:O:P:p:rSs:tT:Uuvw:X:x:z",
+ longopts, NULL)) != -1) {
switch (ch) {
case '4':
family = AF_INET;
@@ -203,9 +211,6 @@
case 'o':
oflag = 1;
break;
- case 'O':
- Oflag = 1;
- break;
case 'P':
Pflag = optarg;
break;
@@ -244,12 +249,28 @@
case 'D':
Dflag = 1;
break;
+ case 'I':
+ Iflag = strtonum(optarg, 1, 65536 << 14, &errstr);
+ if (errstr != NULL)
+ errx(1, "TCP receive window %s: %s",
+ errstr, optarg);
+ break;
+ case 'O':
+ Oflag = strtonum(optarg, 1, 65536 << 14, &errstr);
+ if (errstr != NULL) {
+ if (strcmp(errstr, "invalid") != 0)
+ errx(1, "TCP send window %s: %s",
+ errstr, optarg);
+ }
+ break;
case 'S':
Sflag = 1;
break;
case 'T':
Tflag = parse_iptos(optarg);
break;
+ case 0:
+ break;
default:
usage(1);
}
@@ -512,7 +533,7 @@
remote_connect(const char *host, const char *port, struct addrinfo hints)
{
struct addrinfo *res, *res0;
- int s, error;
+ int s, error, on = 1;
if ((error = getaddrinfo(host, port, &hints, &res)))
errx(1, "getaddrinfo: %s", gai_strerror(error));
@@ -533,6 +554,10 @@
if (sflag || pflag) {
struct addrinfo ahints, *ares;
+#ifdef SO_BINDANY
+ /* try SO_BINDANY, but don't insist */
+ setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
+#endif
memset(&ahints, 0, sizeof(struct addrinfo));
ahints.ai_family = res0->ai_family;
ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
@@ -604,9 +629,9 @@
if (ipsec_policy[1] != NULL)
add_ipsec_policy(s, ipsec_policy[1]);
#endif
- if (Oflag) {
+ if (FreeBSD_Oflag) {
if (setsockopt(s, IPPROTO_TCP, TCP_NOOPT,
- &Oflag, sizeof(Oflag)) == -1)
+ &FreeBSD_Oflag, sizeof(FreeBSD_Oflag)) == -1)
err(1, "disable TCP options");
}
@@ -838,9 +863,19 @@
&Tflag, sizeof(Tflag)) == -1)
err(1, "set IP ToS");
}
+ if (Iflag) {
+ if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
+ &Iflag, sizeof(Iflag)) == -1)
+ err(1, "set TCP receive buffer size");
+ }
if (Oflag) {
+ if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
+ &Oflag, sizeof(Oflag)) == -1)
+ err(1, "set TCP send buffer size");
+ }
+ if (FreeBSD_Oflag) {
if (setsockopt(s, IPPROTO_TCP, TCP_NOOPT,
- &Oflag, sizeof(Oflag)) == -1)
+ &FreeBSD_Oflag, sizeof(FreeBSD_Oflag)) == -1)
err(1, "disable TCP options");
}
}
@@ -878,11 +913,13 @@
#endif
fprintf(stderr, "\
\t-h This help text\n\
+ \t-I length TCP receive buffer length\n\
\t-i secs\t Delay interval for lines sent, ports scanned\n\
\t-k Keep inbound sockets open for multiple connects\n\
\t-l Listen mode, for inbound connects\n\
\t-n Suppress name/port resolutions\n\
- \t-O Disable TCP options\n\
+ \t--no-tcpopt Disable TCP options\n\
+ \t-O length TCP send buffer length\n\
\t-o Terminate on EOF on input\n\
\t-P proxyuser\tUsername for proxy authentication\n\
\t-p port\t Specify local port for remote connects\n\
@@ -931,10 +968,11 @@
usage(int ret)
{
#ifdef IPSEC
- fprintf(stderr, "usage: nc [-46DdEhklnOorStUuvz] [-e policy] [-i interval] [-P proxy_username] [-p source_port]\n");
+ fprintf(stderr, "usage: nc [-46DdEhklnorStUuvz] [-e policy] [-I receive_buffer_len] [-i interval]\n");
#else
- fprintf(stderr, "usage: nc [-46DdhklnOorStUuvz] [-i interval] [-P proxy_username] [-p source_port]\n");
+ fprintf(stderr, "usage: nc [-46DdhklnorStUuvz] [-I receive_buffer_len] [-i interval]\n");
#endif
+ fprintf(stderr, "\t [-O send_buffer_len] [-P proxy_username] [-p source_port]\n");
fprintf(stderr, "\t [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n");
fprintf(stderr, "\t [-x proxy_address[:port]] [hostname] [port[s]]\n");
if (ret)
==== //depot/projects/mpsafetty/etc/Makefile#6 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.373 2008/10/29 18:46:47 mp Exp $
+# $FreeBSD: src/etc/Makefile,v 1.374 2008/12/17 19:12:30 thompsa Exp $
.include <bsd.own.mk>
@@ -162,6 +162,7 @@
${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
.endif
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
+ ${_+_}cd ${.CURDIR}/devd; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
==== //depot/projects/mpsafetty/etc/devd.conf#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.45 2008/11/04 23:03:36 delphij Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.46 2008/12/17 19:12:30 thompsa Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -277,29 +277,6 @@
action "mixer vol +10";
};
-# The next blocks enable volume hotkeys that can be found on the Asus EeePC
-# The four keys above the keyboard notify 0x1a through to 0x1d respectively
-notify 0 {
- match "system" "ACPI";
- match "subsystem" "ASUS-Eee";
- match "notify" "0x13";
- action "mixer 0";
-};
-
-notify 0 {
- match "system" "ACPI";
- match "subsystem" "ASUS-Eee";
- match "notify" "0x14";
- action "mixer vol -10";
-};
-
-notify 0 {
- match "system" "ACPI";
- match "subsystem" "ASUS-Eee";
- match "notify" "0x15";
- action "mixer vol +10";
-};
-
/* EXAMPLES TO END OF FILE
# The following might be an example of something that a vendor might
==== //depot/projects/mpsafetty/etc/mtree/BSD.root.dist#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.80 2008/05/26 10:39:46 bz Exp $
+# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.81 2008/12/17 19:12:30 thompsa Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -28,6 +28,8 @@
..
defaults
..
+ devd
+ ..
gnats
..
gss
==== //depot/projects/mpsafetty/etc/rc.d/defaultroute#2 (text+ko) ====
@@ -2,7 +2,7 @@
#
# Wait for the default route to be up
#
-# $FreeBSD: src/etc/rc.d/defaultroute,v 1.1 2008/06/05 17:26:47 brooks Exp $
+# $FreeBSD: src/etc/rc.d/defaultroute,v 1.2 2008/12/17 17:35:26 svn Exp $
#
# PROVIDE: defaultroute
@@ -30,7 +30,7 @@
defif=`get_default_if -inet`
if [ -n "${defif}" ]; then
if [ ${delay} -ne ${if_up_delay} ]; then
- echo "($defif)"
+ echo -n "($defif)"
fi
break
fi
@@ -42,6 +42,8 @@
sleep 1
delay=`expr $delay - 1`
done
+
+ echo
}
load_rc_config $name
==== //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_ar.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.11 2008/12/06 06:45:15 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.12 2008/12/17 19:02:42 kientzle Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -192,7 +192,7 @@
/* Verify the magic signature on the file header. */
if (strncmp(h + AR_fmag_offset, "`\n", 2) != 0) {
archive_set_error(&a->archive, EINVAL,
- "Consistency check failed");
+ "Incorrect file header signature");
return (ARCHIVE_WARN);
}
==== //depot/projects/mpsafetty/lib/libarchive/test/main.c#4 (text+ko) ====
@@ -45,7 +45,7 @@
#define EXTRA_DUMP(x) archive_error_string((struct archive *)(x))
#define EXTRA_VERSION archive_version()
#define KNOWNREF "test_compat_gtar_1.tgz.uu"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.15 2008/12/08 17:22:44 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.17 2008/12/21 00:13:50 kientzle Exp $");
/*
* "list.h" is simply created by "grep DEFINE_TEST"; it has
@@ -846,48 +846,59 @@
static char *
get_refdir(const char *tmpdir)
{
- char *ref, *p;
+ char tried[512] = { '\0' };
+ char buff[128];
+ char *pwd, *p;
/* Get the current dir. */
systemf("/bin/pwd > %s/refdir", tmpdir);
- ref = slurpfile(NULL, "%s/refdir", tmpdir);
- p = ref + strlen(ref);
- while (p[-1] == '\n') {
- --p;
- *p = '\0';
- }
+ pwd = slurpfile(NULL, "%s/refdir", tmpdir);
+ while (pwd[strlen(pwd) - 1] == '\n')
+ pwd[strlen(pwd) - 1] = '\0';
+ printf("PWD: %s\n", pwd);
systemf("rm %s/refdir", tmpdir);
+
/* Look for a known file. */
- p = slurpfile(NULL, "%s/%s", ref, KNOWNREF);
- if (p != NULL) {
- free(p);
- return (ref);
+ snprintf(buff, sizeof(buff), "%s", pwd);
+ p = slurpfile(NULL, "%s/%s", buff, KNOWNREF);
+ if (p != NULL) goto success;
+ strncat(tried, buff, sizeof(tried) - strlen(tried) - 1);
+ strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1);
+
+ snprintf(buff, sizeof(buff), "%s/test", pwd);
+ p = slurpfile(NULL, "%s/%s", buff, KNOWNREF);
+ if (p != NULL) goto success;
+ strncat(tried, buff, sizeof(tried) - strlen(tried) - 1);
+ strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1);
+
+ snprintf(buff, sizeof(buff), "%s/%s/test", pwd, LIBRARY);
+ p = slurpfile(NULL, "%s/%s", buff, KNOWNREF);
+ if (p != NULL) goto success;
+ strncat(tried, buff, sizeof(tried) - strlen(tried) - 1);
+ strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1);
+
+ if (memcmp(pwd, "/usr/obj", 8) == 0) {
+ snprintf(buff, sizeof(buff), "%s", pwd + 8);
+ p = slurpfile(NULL, "%s/%s", buff, KNOWNREF);
+ if (p != NULL) goto success;
+ strncat(tried, buff, sizeof(tried) - strlen(tried) - 1);
+ strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1);
+
+ snprintf(buff, sizeof(buff), "%s/test", pwd + 8);
+ p = slurpfile(NULL, "%s/%s", buff, KNOWNREF);
+ if (p != NULL) goto success;
+ strncat(tried, buff, sizeof(tried) - strlen(tried) - 1);
+ strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1);
}
- p = slurpfile(NULL, "%s/test/%s", ref, KNOWNREF);
- if (p != NULL) {
- free(p);
- p = malloc(strlen(ref) + strlen("/test") + 1);
- strcpy(p, ref);
- strcat(p, "/test");
- free(ref);
- return (p);
- }
- p = slurpfile(NULL, "%s/%s/test/%s", ref, LIBRARY, KNOWNREF);
- if (p != NULL) {
- free(p);
- p = malloc(strlen(ref) + 1 + strlen(LIBRARY) + strlen("/test") + 1);
- strcpy(p, ref);
- strcat(p, "/");
- strcat(p, LIBRARY);
- strcat(p, "/test");
- free(ref);
- return (p);
- }
+
printf("Unable to locate known reference file %s\n", KNOWNREF);
- printf(" Checked directory %s\n", ref);
- printf(" Checked directory %s/test\n", ref);
- printf(" Checked directory %s/%s/test\n", ref, LIBRARY);
+ printf(" Checked following directories:\n%s\n", tried);
exit(1);
+
+success:
+ free(p);
+ free(pwd);
+ return strdup(buff);
}
int main(int argc, char **argv)
@@ -897,7 +908,7 @@
time_t now;
char *refdir_alloc = NULL;
char *progname, *p;
- char *tmp;
+ const char *tmp;
char tmpdir[256];
char tmpdir_timestamp[256];
==== //depot/projects/mpsafetty/lib/libarchive/test/test_compat_gtar.c#3 (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_compat_gtar.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_gtar.c,v 1.4 2008/12/17 19:05:00 kientzle Exp $");
/*
* Verify our ability to read sample files created by GNU tar.
@@ -43,6 +43,7 @@
char name[] = "test_compat_gtar_1.tgz";
struct archive_entry *ae;
struct archive *a;
+ int r;
assert((a = archive_read_new()) != NULL);
assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a));
@@ -51,7 +52,11 @@
assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 10240));
/* Read first entry. */
- assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae));
+ if (r != ARCHIVE_OK) {
+ archive_read_finish(a);
+ return;
+ }
assertEqualString(
"12345678901234567890123456789012345678901234567890"
"12345678901234567890123456789012345678901234567890"
@@ -66,7 +71,11 @@
assertEqualInt(0100644, archive_entry_mode(ae));
/* Read second entry. */
- assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae));
+ if (r != ARCHIVE_OK) {
+ archive_read_finish(a);
+ return;
+ }
assertEqualString(
"abcdefghijabcdefghijabcdefghijabcdefghijabcdefghij"
"abcdefghijabcdefghijabcdefghijabcdefghijabcdefghij"
==== //depot/projects/mpsafetty/lib/libarchive/test/test_write_compress.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress.c,v 1.4 2008/12/17 19:05:25 kientzle Exp $");
/*
* A basic exercise of compress reading and writing.
@@ -85,11 +85,11 @@
for (i = 0; i < 100; i++) {
sprintf(path, "file%03d", i);
- assertEqualInt(0, archive_read_next_header(a, &ae));
+ if (!assertEqualInt(0, archive_read_next_header(a, &ae)))
+ break;
assertEqualString(path, archive_entry_pathname(ae));
assertEqualInt(datasize, archive_entry_size(ae));
}
-
assert(0 == archive_read_close(a));
#if ARCHIVE_VERSION_NUMBER < 2000000
archive_read_finish(a);
==== //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_ar.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_ar.c,v 1.8 2008/09/01 05:38:33 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_ar.c,v 1.9 2008/12/17 19:03:44 kientzle Exp $");
char buff[4096];
char buff2[64];
@@ -73,8 +73,8 @@
archive_entry_copy_pathname(ae, "ggghhhjjjrrrttt.o");
archive_entry_set_filetype(ae, AE_IFREG);
archive_entry_set_size(ae, 7);
- assertA(0 == archive_write_header(a, ae));
- assertA(7 == archive_write_data(a, "7777777", 7));
+ assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+ assertEqualIntA(a, 7, archive_write_data(a, "7777777", 7));
archive_entry_free(ae);
/* test full pathname */
@@ -82,8 +82,8 @@
archive_entry_copy_pathname(ae, "/usr/home/xx/iiijjjdddsssppp.o");
archive_entry_set_mode(ae, S_IFREG | 0755);
archive_entry_set_size(ae, 8);
- assertA(0 == archive_write_header(a, ae));
- assertA(8 == archive_write_data(a, "88877766", 8));
+ assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+ assertEqualIntA(a, 8, archive_write_data(a, "88877766", 8));
archive_entry_free(ae);
/* trailing "/" should be rejected */
@@ -105,46 +105,46 @@
#if ARCHIVE_VERSION_NUMBER < 2000000
archive_write_finish(a);
#else
- assert(0 == archive_write_finish(a));
+ assertEqualInt(0, archive_write_finish(a));
#endif
/*
* Now, read the data back.
*/
assert((a = archive_read_new()) != NULL);
- assertA(0 == archive_read_support_format_all(a));
- assertA(0 == archive_read_support_compression_all(a));
- assertA(0 == archive_read_open_memory(a, buff, used));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used));
- assertA(0 == archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
assertEqualInt(0, archive_entry_mtime(ae));
assertEqualString("//", archive_entry_pathname(ae));
assertEqualInt(0, archive_entry_size(ae));
- assertA(0 == archive_read_next_header(a, &ae));
- assert(1 == archive_entry_mtime(ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualInt(1, archive_entry_mtime(ae));
assertEqualString("abcdefghijklmn.o", archive_entry_pathname(ae));
- assert(8 == archive_entry_size(ae));
- assertA(8 == archive_read_data(a, buff2, 10));
- assert(0 == memcmp(buff2, "87654321", 8));
+ assertEqualInt(8, archive_entry_size(ae));
+ assertEqualIntA(a, 8, archive_read_data(a, buff2, 10));
+ assertEqualMem(buff2, "87654321", 8);
- assert(0 == archive_read_next_header(a, &ae));
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list