Date: Sat, 4 Apr 2009 14:42:02 GMT From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 160201 for review Message-ID: <200904041442.n34Eg23Z070834@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=160201 Change 160201 by nwhitehorn@nwhitehorn_comporellon on 2009/04/04 14:41:42 IFC after integration of 64-bit bridge code to HEAD. Affected files ... .. //depot/projects/ppc-g5/Makefile#5 integrate .. //depot/projects/ppc-g5/ObsoleteFiles.inc#12 integrate .. //depot/projects/ppc-g5/contrib/csup/rcsfile.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/rcsfile.h#2 integrate .. //depot/projects/ppc-g5/contrib/csup/rcsparse.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/updater.c#5 integrate .. //depot/projects/ppc-g5/contrib/gcc/c-decl.c#3 integrate .. //depot/projects/ppc-g5/contrib/libpcap/pcap.h#3 integrate .. //depot/projects/ppc-g5/contrib/libpcap/pcap/pcap.h#2 integrate .. //depot/projects/ppc-g5/etc/rc.d/ipfw#2 integrate .. //depot/projects/ppc-g5/include/dlfcn.h#2 integrate .. //depot/projects/ppc-g5/include/mpool.h#2 integrate .. //depot/projects/ppc-g5/include/stdio.h#4 integrate .. //depot/projects/ppc-g5/lib/libc/db/README#2 integrate .. //depot/projects/ppc-g5/lib/libc/db/Symbol.map#2 integrate .. //depot/projects/ppc-g5/lib/libc/db/btree/bt_debug.c#4 integrate .. //depot/projects/ppc-g5/lib/libc/db/btree/bt_open.c#4 integrate .. //depot/projects/ppc-g5/lib/libc/db/btree/bt_page.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/btree/bt_put.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/btree/bt_split.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/db/db.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/README#2 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash.h#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash_bigkey.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash_buf.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash_func.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash_log2.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/hash/hash_page.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/man/mpool.3#2 integrate .. //depot/projects/ppc-g5/lib/libc/db/mpool/Makefile.inc#2 integrate .. //depot/projects/ppc-g5/lib/libc/db/mpool/mpool-compat.c#1 branch .. //depot/projects/ppc-g5/lib/libc/db/mpool/mpool.c#4 integrate .. //depot/projects/ppc-g5/lib/libc/db/recno/rec_close.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/db/recno/rec_put.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/ppc-g5/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/ppc-g5/lib/libc/gen/dlfcn.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/gen/dlfunc.c#2 delete .. //depot/projects/ppc-g5/lib/libc/gen/dlopen.3#2 integrate .. //depot/projects/ppc-g5/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/i386/sys/Makefile.inc#3 integrate .. //depot/projects/ppc-g5/lib/libc/net/getaddrinfo.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/nls/Makefile.inc#3 integrate .. //depot/projects/ppc-g5/lib/libc/nls/be_BY.UTF-8.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/de_DE.ISO8859-1.msg#2 integrate .. //depot/projects/ppc-g5/lib/libc/rpc/getnetconfig.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/ppc-g5/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.h#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmclog.h#2 integrate .. //depot/projects/ppc-g5/lib/libstand/gets.c#2 integrate .. //depot/projects/ppc-g5/lib/libthr/Makefile#4 integrate .. //depot/projects/ppc-g5/lib/libufs/block.c#2 integrate .. //depot/projects/ppc-g5/libexec/bootpd/rtmsg.c#3 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/Symbol.map#3 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.1#3 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/ppc-g5/release/picobsd/bridge/PICOBSD#4 integrate .. //depot/projects/ppc-g5/release/picobsd/bridge/config#2 integrate .. //depot/projects/ppc-g5/release/picobsd/bridge/crunch.conf#3 integrate .. //depot/projects/ppc-g5/release/picobsd/build/picobsd#5 integrate .. //depot/projects/ppc-g5/release/picobsd/floppy.tree/etc/rc1#2 integrate .. //depot/projects/ppc-g5/release/sparc64/mkisoimages.sh#2 integrate .. //depot/projects/ppc-g5/sbin/geom/class/label/glabel.8#2 integrate .. //depot/projects/ppc-g5/sbin/gvinum/gvinum.8#2 integrate .. //depot/projects/ppc-g5/sbin/gvinum/gvinum.c#2 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifieee80211.c#7 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw2.h#3 integrate .. //depot/projects/ppc-g5/sbin/ipfw/main.c#3 integrate .. //depot/projects/ppc-g5/share/man/man3/pthread.3#2 integrate .. //depot/projects/ppc-g5/share/man/man4/Makefile#12 integrate .. //depot/projects/ppc-g5/share/man/man4/ath.4#3 integrate .. //depot/projects/ppc-g5/share/man/man4/ath_hal.4#3 integrate .. //depot/projects/ppc-g5/share/man/man4/ed.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/fla.4#2 delete .. //depot/projects/ppc-g5/share/man/man4/lagg.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/malo.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/man4.i386/fe.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/uath.4#1 branch .. //depot/projects/ppc-g5/share/man/man4/wlan.4#2 integrate .. //depot/projects/ppc-g5/share/man/man9/Makefile#9 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_ACCESS.9#3 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_ATTRIB.9#3 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_CREATE.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_FSYNC.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_INACTIVE.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_IOCTL.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_LINK.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_LOOKUP.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_OPENCLOSE.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_RDWR.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_READDIR.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_READLINK.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_REMOVE.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_RENAME.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/VOP_VPTOCNP.9#3 integrate .. //depot/projects/ppc-g5/share/man/man9/refcount.9#1 branch .. //depot/projects/ppc-g5/share/man/man9/vm_map_lock.9#2 integrate .. //depot/projects/ppc-g5/share/mk/bsd.cpu.mk#4 integrate .. //depot/projects/ppc-g5/share/skel/dot.login#2 integrate .. //depot/projects/ppc-g5/share/skel/dot.profile#2 integrate .. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_switch.S#2 integrate .. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_wakecode.S#3 integrate .. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/cpu_switch.S#6 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/db_trace.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/ppc-g5/sys/amd64/ia32/ia32_sigtramp.S#3 integrate .. //depot/projects/ppc-g5/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/frame.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/ppc-g5/sys/amd64/include/pcb.h#5 integrate .. //depot/projects/ppc-g5/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/ppc-g5/sys/amd64/include/proc.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/reg.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/segments.h#3 integrate .. //depot/projects/ppc-g5/sys/amd64/include/signal.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux.h#7 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_locore.s#4 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/ppc-g5/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/arm/locore.S#3 integrate .. //depot/projects/ppc-g5/sys/arm/conf/AVILA#7 integrate .. //depot/projects/ppc-g5/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/ppc-g5/sys/arm/include/atomic.h#4 integrate .. //depot/projects/ppc-g5/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/ppc-g5/sys/cddl/dev/dtnfsclient/dtnfsclient.c#2 delete .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_ioctl.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_ioctl.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/ppc-g5/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/linprocfs/linprocfs.c#13 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/ppc-g5/sys/conf/files#15 integrate .. //depot/projects/ppc-g5/sys/conf/files.amd64#10 integrate .. //depot/projects/ppc-g5/sys/conf/files.i386#11 integrate .. //depot/projects/ppc-g5/sys/conf/files.ia64#6 integrate .. //depot/projects/ppc-g5/sys/conf/files.powerpc#17 integrate .. //depot/projects/ppc-g5/sys/conf/newvers.sh#4 integrate .. //depot/projects/ppc-g5/sys/conf/options#12 integrate .. //depot/projects/ppc-g5/sys/contrib/dev/uath/ar5523.bin.uu#1 branch .. //depot/projects/ppc-g5/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/age/if_age.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/age/if_agereg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.h#10 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-sata.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-ahci.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-intel.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-jmicron.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-marvell.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-nvidia.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-promise.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-serverworks.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-sis.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-via.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/ppc-g5/sys/dev/drm/ati_pcigart.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drmP.h#7 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_irq.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_pci.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_scatter.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_dma.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_irq.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/drm/r600_cp.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/radeon_cp.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/ed/ax88x90reg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ed/dl100xxreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ed/if_edreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/fe/if_fe_pccard.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/hptiop/hptiop.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/ppc-g5/sys/dev/ipmi/ipmi_linux.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/malo/if_malo.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/malo/if_malo_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/malo/if_malohal.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mii/axphy.c#1 branch .. //depot/projects/ppc-g5/sys/dev/mii/axphyreg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/mii/miidevs#5 integrate .. //depot/projects/ppc-g5/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_standard.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/ppc-g5/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/pci/pci.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/re/if_re.c#9 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pci/hda/hdac.c#15 integrate .. //depot/projects/ppc-g5/sys/dev/uart/uart_cpu_powerpc.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/ohci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_uath.c#1 branch .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_uathreg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_uathvar.h#1 branch .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/wlan/usb_wlan.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/xen/balloon/balloon.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/xen/console/console.c#6 integrate .. //depot/projects/ppc-g5/sys/geom/geom.h#3 integrate .. //depot/projects/ppc-g5/sys/geom/geom_disk.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/geom_disk.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/geom_subr.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/ppc-g5/sys/geom/label/g_label.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/label/g_label.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part.c#10 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_apm.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_bsd.c#9 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_ebr.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_pc98.c#8 integrate .. //depot/projects/ppc-g5/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum.h#4 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_create.c#1 branch .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_drive.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_events.c#1 branch .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_init.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_list.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_move.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_rename.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_rm.c#5 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_share.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_state.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_var.h#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_volume.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/cpufreq/hwpstate.c#1 branch .. //depot/projects/ppc-g5/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/ppc-g5/sys/i386/include/signal.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/ucontext.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/xen/xenpmap.h#4 integrate .. //depot/projects/ppc-g5/sys/i386/include/xen/xenvar.h#3 integrate .. //depot/projects/ppc-g5/sys/i386/isa/npx.c#4 integrate .. //depot/projects/ppc-g5/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/xen/pmap.c#6 integrate .. //depot/projects/ppc-g5/sys/i386/xen/xen_machdep.c#8 integrate .. //depot/projects/ppc-g5/sys/ia64/ia32/ia32_misc.c#1 branch .. //depot/projects/ppc-g5/sys/kern/kern_jail.c#11 integrate .. //depot/projects/ppc-g5/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/ppc-g5/sys/kern/subr_bus.c#8 integrate .. //depot/projects/ppc-g5/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_cache.c#10 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_lookup.c#8 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/ppc-g5/sys/mips/include/bus.h#2 integrate .. //depot/projects/ppc-g5/sys/modules/ath/Makefile#4 integrate .. //depot/projects/ppc-g5/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/dtrace/dtnfsclient/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/geom/geom_vinum/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/ipmi/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/ipmi/ipmi_linux/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/linprocfs/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/mii/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/usb/uath/Makefile#1 branch .. //depot/projects/ppc-g5/sys/net/bpf.h#2 integrate .. //depot/projects/ppc-g5/sys/net/if.c#13 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211.c#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211.h#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_adhoc.c#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ddb.c#10 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_freebsd.h#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_hostap.c#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_input.c#7 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_input.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ioctl.c#9 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_node.c#9 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_output.c#10 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_proto.c#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_scan.c#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_scan.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_sta.c#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_superg.c#1 branch .. //depot/projects/ppc-g5/sys/net80211/ieee80211_superg.h#1 branch .. //depot/projects/ppc-g5/sys/net80211/ieee80211_tdma.c#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_tdma.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_var.h#9 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_wds.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw.h#9 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw_pfil.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/sctputil.c#8 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_kdtrace.c#1 branch .. //depot/projects/ppc-g5/sys/nfsclient/nfs_kdtrace.h#1 branch .. //depot/projects/ppc-g5/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/ppc-g5/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#12 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea.c#7 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/mp_cpudep.c#5 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#11 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/trap_subr.S#7 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/uma_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/vm_machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/booke/machdep.c#8 integrate .. //depot/projects/ppc-g5/sys/powerpc/booke/uio_machdep.c#2 delete .. //depot/projects/ppc-g5/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/md_var.h#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/sf_buf.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/spr.h#6 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_syscons.c#7 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_macio.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/bus_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/cpu.c#6 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/dump_machdep.c#1 branch .. //depot/projects/ppc-g5/sys/powerpc/powerpc/mem.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/pmap_dispatch.c#7 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/uio_machdep.c#1 branch .. //depot/projects/ppc-g5/sys/ppc64/ppc64/atomic.S#1 add .. //depot/projects/ppc-g5/sys/ppc64/ppc64/copyinout.c#1 add .. //depot/projects/ppc-g5/sys/ppc64/ppc64/locore.S#1 add .. //depot/projects/ppc-g5/sys/ppc64/ppc64/machdep.c#1 add .. //depot/projects/ppc-g5/sys/ppc64/ppc64/mmu_oea64.c#1 add .. //depot/projects/ppc-g5/sys/ppc64/ppc64/swtch.S#1 add .. //depot/projects/ppc-g5/sys/ppc64/ppc64/trap_subr.S#1 add .. //depot/projects/ppc-g5/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/ppc-g5/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate .. //depot/projects/ppc-g5/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/ppc-g5/sys/sys/dtrace_bsd.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/elf_common.h#6 integrate .. //depot/projects/ppc-g5/sys/sys/jail.h#6 integrate .. //depot/projects/ppc-g5/sys/sys/kerneldump.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/systm.h#6 integrate .. //depot/projects/ppc-g5/sys/sys/vnode.h#11 integrate .. //depot/projects/ppc-g5/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/ppc-g5/sys/vm/vm_extern.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/evtchn/evtchn.c#6 integrate .. //depot/projects/ppc-g5/sys/xen/reboot.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/cut/cut.1#2 integrate .. //depot/projects/ppc-g5/usr.bin/locate/locate/fastfind.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/locate/locate/util.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/login/login.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/chown/chgrp.1#2 integrate .. //depot/projects/ppc-g5/usr.sbin/portsnap/phttpget/phttpget.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/uathload/Makefile#1 branch .. //depot/projects/ppc-g5/usr.sbin/uathload/uathload.c#1 branch Differences ... ==== //depot/projects/ppc-g5/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.357 2009/03/13 07:23:58 imp Exp $ +# $FreeBSD: src/Makefile,v 1.358 2009/04/01 17:11:50 bz Exp $ # # The user-driven targets are: # @@ -279,7 +279,7 @@ # existing system is. # .if make(universe) || make(tinderbox) -TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v +TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v .if defined(DOING_TINDERBOX) FAILFILE=tinderbox.failed ==== //depot/projects/ppc-g5/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.178 2009/03/19 20:33:26 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.180 2009/04/01 09:37:00 trhodes Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -1440,6 +1440,8 @@ OLD_FILES+=lib/geom/geom_label.so.1 OLD_FILES+=lib/geom/geom_nop.so.1 OLD_FILES+=lib/geom/geom_stripe.so.1 +# 20040713: fla(4) removed. +OLD_FILES+=usr/share/man/man4/fla.4.gz # 200407XX OLD_FILES+=usr/sbin/kernbb OLD_FILES+=usr/sbin/ntp-genkeys ==== //depot/projects/ppc-g5/contrib/csup/rcsfile.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/rcsfile.c,v 1.1 2009/01/05 15:18:16 lulf Exp $ + * $FreeBSD: src/contrib/csup/rcsfile.c,v 1.2 2009/03/25 20:15:48 lulf Exp $ */ #include <assert.h> @@ -140,7 +140,7 @@ struct delta *); static struct stream *rcsfile_getdeltatext(struct rcsfile *, struct delta *, struct buf **); -static void rcsdelta_writestring(char *, size_t, struct stream *); +static int rcsdelta_writestring(char *, size_t, struct stream *); static void rcsdelta_insertbranch(struct delta *, struct branch *); /* Space formatting of RCS file. */ @@ -308,14 +308,19 @@ /* First write head. */ d = LIST_FIRST(&rf->trunk->deltalist); - stream_printf(dest, "head%s%s;\n", head_space, d->revnum); + if (stream_printf(dest, "head%s%s;\n", head_space, d->revnum) < 0) + return (-1); /* Write branch, if we have. */ - if (rf->branch != NULL) - stream_printf(dest, "branch%s%s;\n", branch_space, rf->branch); + if (rf->branch != NULL) { + if (stream_printf(dest, "branch%s%s;\n", branch_space, + rf->branch) < 0) + return (-1); + } /* Write access. */ - stream_printf(dest, "access"); + if (stream_printf(dest, "access") < 0) + return (-1); #if 0 if (!STAILQ_EMPTY(&rf->accesslist)) { /* @@ -324,32 +329,44 @@ */ } #endif - stream_printf(dest, ";\n"); + if (stream_printf(dest, ";\n") < 0) + return (-1); /* Write out taglist. */ - stream_printf(dest, "symbols"); + if (stream_printf(dest, "symbols") < 0) + return (-1); if (!STAILQ_EMPTY(&rf->taglist)) { STAILQ_FOREACH(t, &rf->taglist, tag_next) { - stream_printf(dest, "\n%s%s:%s", tag_space, t->tag, - t->revnum); + if (stream_printf(dest, "\n%s%s:%s", tag_space, t->tag, + t->revnum) < 0) + return (-1); } } - stream_printf(dest, ";\n"); /* Write out locks and strict. */ - stream_printf(dest, "locks;"); - if (rf->strictlock) - stream_printf(dest, " strict;"); - stream_printf(dest, "\n"); + if (stream_printf(dest, ";\nlocks;") < 0) + return (-1); + if (rf->strictlock) { + if (stream_printf(dest, " strict;") < 0) + return (-1); + } + if (stream_printf(dest, "\n") < 0) + return (-1); /* Write out the comment. */ - if (rf->comment != NULL) - stream_printf(dest, "comment%s%s;\n", comment_space, rf->comment); - if (rf->expand != EXPAND_DEFAULT) - stream_printf(dest, "expand%s@%s@;\n", expand_space, - keyword_encode_expand(rf->expand)); + if (rf->comment != NULL) { + if (stream_printf(dest, "comment%s%s;\n", comment_space, + rf->comment) < 0) + return (-1); + } + if (rf->expand != EXPAND_DEFAULT) { + if (stream_printf(dest, "expand%s@%s@;\n", expand_space, + keyword_encode_expand(rf->expand)) < 0) + return (-1); + } - stream_printf(dest, "\n\n"); + if (stream_printf(dest, "\n\n") < 0) + return (-1); /* * Write out deltas. We use a stack where we push the appropriate deltas @@ -364,14 +381,18 @@ /* Do not write out placeholders just to be safe. */ if (d->placeholder) continue; - stream_printf(dest, "%s\n", d->revnum); - stream_printf(dest, "date%s%s;%sauthor %s;%sstate", + if (stream_printf(dest, "%s\n", d->revnum) < 0) + return (-1); + if (stream_printf(dest, "date%s%s;%sauthor %s;%sstate", date_space, d->revdate, auth_space, d->author, - state_space); - if (d->state != NULL) - stream_printf(dest, " %s", d->state); - stream_printf(dest, ";\n"); - stream_printf(dest, "branches"); + state_space) < 0) + return (-1); + if (d->state != NULL) { + if (stream_printf(dest, " %s", d->state) < 0) + return (-1); + } + if (stream_printf(dest, ";\nbranches") < 0) + return (-1); /* * Write out our branches. Add them to a reversed list for use * later when we write out the text. @@ -385,30 +406,36 @@ /* Push branch heads on stack. */ STAILQ_FOREACH(d_tmp, &deltalist_inverted, delta_prev) { - if (d_tmp == NULL) - err(1, "empty branch!"); - stream_printf(dest, "\n%s%s", branches_space, - d_tmp->revnum); + if (d_tmp == NULL) { + lprintf(2, "Empty branch!\n"); + return (-1); + } + if (stream_printf(dest, "\n%s%s", branches_space, + d_tmp->revnum) < 0) + return (-1); } - stream_printf(dest, ";\n"); - stream_printf(dest, "next%s", next_space); + if (stream_printf(dest, ";\nnext%s", next_space) < 0) + return (-1); /* Push next delta on stack. */ d_next = LIST_NEXT(d, delta_next); if (d_next != NULL) { - stream_printf(dest, "%s", d_next->revnum); + if (stream_printf(dest, "%s", d_next->revnum) < 0) + return (-1); STAILQ_INSERT_HEAD(&deltastack, d_next, stack_next); } - stream_printf(dest, ";\n\n"); + if (stream_printf(dest, ";\n\n") < 0) + return (-1); } - stream_printf(dest, "\n"); /* Write out desc. */ - stream_printf(dest, "desc\n@@"); + if (stream_printf(dest, "\ndesc\n@@") < 0) + return (-1); d = LIST_FIRST(&rf->trunk->deltalist); /* Write out deltatexts. */ error = rcsfile_write_deltatext(rf, dest); - stream_printf(dest, "\n"); + if (stream_printf(dest, "\n") < 0) + return (-1); return (error); } @@ -438,21 +465,25 @@ /* Do not write out placeholders just to be safe. */ if (d->placeholder) return (0); - stream_printf(dest, "\n\n\n%s\n", d->revnum); - stream_printf(dest, "log\n@"); + if (stream_printf(dest, "\n\n\n%s\n", d->revnum) < 0) + return (-1); + if (stream_printf(dest, "log\n@") < 0) + return (-1); in = stream_open_buf(d->log); line = stream_getln(in, &size); while (line != NULL) { - stream_write(dest, line, size); + if (stream_write(dest, line, size) == -1) + return (-1); line = stream_getln(in, &size); } stream_close(in); - stream_printf(dest, "@\n"); - stream_printf(dest, "text\n@"); + if (stream_printf(dest, "@\ntext\n@") < 0) + return (-1); error = rcsfile_puttext(rf, dest, d, d->prev); if (error) return (error); - stream_printf(dest, "@"); + if (stream_printf(dest, "@") < 0) + return (-1); LIST_INIT(&branchlist_datesorted); d_next = LIST_NEXT(d, delta_next); @@ -535,7 +566,10 @@ in = stream_open_buf(d->text); line = stream_getln(in, &size); while (line != NULL) { - stream_write(dest, line, size); + if (stream_write(dest, line, size) == -1) { + error = -1; + goto cleanup; + } line = stream_getln(in, &size); } stream_close(in); @@ -549,7 +583,10 @@ } line = stream_getln(orig, &size); while (line != NULL) { - stream_write(dest, line, size); + if (stream_write(dest, line, size) == -1) { + error = -1; + goto cleanup; + } line = stream_getln(orig, &size); } stream_close(orig); @@ -1261,6 +1298,7 @@ rcsdelta_addlog(struct delta *d, char *log, int len) { struct stream *dest; + int nbytes; assert(d != NULL); /* Strip away '@' at beginning and end. */ @@ -1268,9 +1306,9 @@ len--; log[len - 1] = '\0'; dest = stream_open_buf(d->log); - stream_write(dest, log, len - 1); + nbytes = stream_write(dest, log, len - 1); stream_close(dest); - return (0); + return ((nbytes == -1) ? -1 : 0); } /* Add deltatext to a delta. Assume the delta already exists. */ @@ -1278,6 +1316,7 @@ rcsdelta_addtext(struct delta *d, char *text, int len) { struct stream *dest; + int nbytes; assert(d != NULL); /* Strip away '@' at beginning and end. */ @@ -1286,36 +1325,40 @@ text[len - 1] = '\0'; dest = stream_open_buf(d->text); - stream_write(dest, text, len - 1); + nbytes = stream_write(dest, text, len - 1); stream_close(dest); - return (0); + return ((nbytes == -1) ? -1 : 0); } /* Add a deltatext logline to a delta. */ -void +int rcsdelta_appendlog(struct delta *d, char *logline, size_t size) { struct stream *dest; + int error; assert(d != NULL); dest = stream_open_buf(d->log); - rcsdelta_writestring(logline, size, dest); + error = rcsdelta_writestring(logline, size, dest); stream_close(dest); + return (error); } /* Add a deltatext textline to a delta. */ -void +int rcsdelta_appendtext(struct delta *d, char *textline, size_t size) { struct stream *dest; + int error; assert(d != NULL); dest = stream_open_buf(d->text); - rcsdelta_writestring(textline, size, dest); + error = rcsdelta_writestring(textline, size, dest); stream_close(dest); + return (error); } -static void +static int rcsdelta_writestring(char *textline, size_t size, struct stream *dest) { char buf[3]; @@ -1332,8 +1375,10 @@ buf[2] = '\0'; count = 2; } - stream_write(dest, buf, count); + if (stream_write(dest, buf, count) == -1) + return (-1); } + return (0); } /* Set delta state. */ ==== //depot/projects/ppc-g5/contrib/csup/rcsfile.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/rcsfile.h,v 1.1 2009/01/05 15:18:16 lulf Exp $ + * $FreeBSD: src/contrib/csup/rcsfile.h,v 1.2 2009/03/25 20:15:48 lulf Exp $ */ #ifndef _RCSFILE_H_ @@ -65,8 +65,8 @@ int rcsdelta_addlog(struct delta *, char *, int); int rcsdelta_addtext(struct delta *, char *, int); -void rcsdelta_appendlog(struct delta *, char *, size_t); -void rcsdelta_appendtext(struct delta *, char *, size_t); +int rcsdelta_appendlog(struct delta *, char *, size_t); +int rcsdelta_appendtext(struct delta *, char *, size_t); void rcsdelta_setstate(struct delta *, char *); void rcsdelta_truncatetext(struct delta *, off_t); void rcsdelta_truncatelog(struct delta *, off_t); ==== //depot/projects/ppc-g5/contrib/csup/rcsparse.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/rcsparse.c,v 1.1 2009/01/05 15:18:16 lulf Exp $ + * $FreeBSD: src/contrib/csup/rcsparse.c,v 1.2 2009/03/25 20:15:48 lulf Exp $ */ #include <assert.h> @@ -309,7 +309,7 @@ error = 0; /* In case we don't have deltatexts. */ if (token != NUM) - return (token); + return (-1); do { /* num */ assert(token == NUM); ==== //depot/projects/ppc-g5/contrib/csup/updater.c#5 (text) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/updater.c,v 1.4 2009/03/06 20:17:16 lulf Exp $ + * $FreeBSD: src/contrib/csup/updater.c,v 1.6 2009/03/25 20:15:48 lulf Exp $ */ #include <sys/types.h> @@ -1385,8 +1385,11 @@ do { nread = stream_read(up->rd, buf, (BUFSIZE > remains ? remains : BUFSIZE)); + if (nread == -1) + return (UPDATER_ERR_PROTO); remains -= nread; - stream_write(to, buf, nread); + if (stream_write(to, buf, nread) == -1) + goto bad; } while (remains > 0); stream_close(to); line = stream_getln(up->rd, NULL); @@ -1411,9 +1414,11 @@ FA_MODTIME | FA_MASK); error = updater_updatefile(up, fup, md5, isfixup); fup->wantmd5 = NULL; /* So that it doesn't get freed. */ - if (error) - return (error); - return (0); + return (error); +bad: + xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath, + strerror(errno)); + return (UPDATER_ERR_MSG); } static int @@ -1469,7 +1474,9 @@ if (nbytes == -1) goto bad; } - stream_write(to, line, size); + nbytes = stream_write(to, line, size); + if (nbytes == -1) + goto bad; line = stream_getln(up->rd, &size); first = 0; } @@ -1661,6 +1668,7 @@ else lprintf(1, " Touch %s", fup->coname); /* Install new attributes. */ + fattr_umask(sr->sr_serverattr, coll->co_umask); fattr_install(sr->sr_serverattr, fup->destpath, NULL); if (fup->attic) lprintf(1, " -> Attic"); @@ -1681,8 +1689,11 @@ error = rcsfile_write(rf, dest); stream_close(dest); rcsfile_free(rf); - if (error) - lprintf(-1, "Error writing %s\n", name); + if (error) { + xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath, + strerror(errno)); + return (UPDATER_ERR_MSG); + } finish: sr->sr_clientattr = fattr_frompath(path, FATTR_NOFOLLOW); @@ -1767,7 +1778,9 @@ size--; logline++; } - rcsdelta_appendlog(d, logline, size); + if (rcsdelta_appendlog(d, logline, size) + < 0) + return (-1); logline = stream_getln(rd, &size); } break; @@ -1798,7 +1811,9 @@ size--; textline++; } - rcsdelta_appendtext(d, textline, size); + if (rcsdelta_appendtext(d, textline, + size) < 0) + return (-1); textline = stream_getln(rd, &size); } break; @@ -1838,8 +1853,15 @@ stream_filter_start(to, STREAM_FILTER_MD5, md5); /* First write the existing content. */ - while ((nread = read(fd, buf, BUFSIZE)) > 0) - stream_write(to, buf, nread); + while ((nread = read(fd, buf, BUFSIZE)) > 0) { + if (stream_write(to, buf, nread) == -1) + goto bad; + } + if (nread == -1) { + xasprintf(&up->errmsg, "%s: Error reading: %s", + strerror(errno)); + return (UPDATER_ERR_MSG); + } close(fd); bytes = fattr_filesize(fa) - pos; @@ -1847,8 +1869,11 @@ do { nread = stream_read(up->rd, buf, (BUFSIZE > bytes) ? bytes : BUFSIZE); + if (nread == -1) + return (UPDATER_ERR_PROTO); bytes -= nread; - stream_write(to, buf, nread); + if (stream_write(to, buf, nread) == -1) + goto bad; } while (bytes > 0); stream_close(to); @@ -1874,9 +1899,11 @@ FA_MODTIME | FA_MASK); error = updater_updatefile(up, fup, md5, 0); fup->wantmd5 = NULL; /* So that it doesn't get freed. */ - if (error) - return (error); - return (0); + return (error); +bad: + xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath, + strerror(errno)); + return (UPDATER_ERR_MSG); } /* ==== //depot/projects/ppc-g5/contrib/gcc/c-decl.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/c-decl.c,v 1.16 2009/03/14 19:36:13 das Exp $ */ +/* $FreeBSD: src/contrib/gcc/c-decl.c,v 1.17 2009/03/25 05:10:32 das Exp $ */ /* Merged C99 inline changes from gcc trunk 122565 2007-03-05 */ /* Fixed problems with compiling inline-25.c and inline-26.c */ /* XXX still fails inline-29.c, inline-31.c, and inline-32.c */ @@ -798,7 +798,9 @@ && DECL_ABSTRACT_ORIGIN (p) != p) TREE_ADDRESSABLE (DECL_ABSTRACT_ORIGIN (p)) = 1; if (!DECL_EXTERNAL (p) - && DECL_INITIAL (p) == 0) + && DECL_INITIAL (p) == 0 + && scope != file_scope + && scope != external_scope) { error ("nested function %q+D declared but never defined", p); undef_nested_function = true; ==== //depot/projects/ppc-g5/contrib/libpcap/pcap.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.15 2009/03/21 22:58:08 rpaulo Exp $ + * $FreeBSD: src/contrib/libpcap/pcap.h,v 1.17 2009/04/02 13:04:17 rpaulo Exp $ * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.59 2006/10/04 18:09:22 guy Exp $ (LBL) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904041442.n34Eg23Z070834>