Date: Wed, 2 Jun 2010 12:18:13 GMT From: Garrett Cooper <gcooper@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 179090 for review Message-ID: <201006021218.o52CIDKw063392@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@179090?ac=10 Change 179090 by gcooper@gcooper-bayonetta on 2010/06/02 12:17:32 IFC Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/chio/chio.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/pax/pat_rep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/eval.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/jobs.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/main.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/parser.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/sh.1#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/archures.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/bfd-in2.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/cpu-mips.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/elfxx-mips.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/gas/config/tc-mips.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/gas/config/tc-mips.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/include/elf/mips.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/include/opcode/mips.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/opcodes/mips-dis.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/opcodes/mips-opc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/opcodes/mips16-opc.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/fixdfdi.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/fixsfdi.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/fixunsdfsi.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/fixunssfsi.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/floatdidf.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/floatdisf.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/floatundidf.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/floatundisf.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/mips/freebsd.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/mips/mips.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/mips/mips.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/gcc/config/mips/mips.md#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/man/libngatm.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/man/uniaddr.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/man/unifunc.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/man/unimsg.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/man/unisap.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/man/unistruct.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/snmp_atm/snmp_atm.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/ngatm/sscop/sscop.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/nvi/docs/help#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/nvi/ex/ex_cmd.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/nvi/vi/v_ex.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/nvi/vi/v_txt.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/opie/libopie/readrec.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/moduli.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/scp.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/sftp-server.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/sftp.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh-add.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh-agent.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh-keygen.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh-keyscan.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh-keysign.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh-pkcs11-helper.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/sshd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/games/pom/pom.6#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/Makefile.inc0#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/ld/Makefile.mips#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/libbfd/Makefile.mips#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/binutils/libbfd/bfd.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/cc/Makefile.inc#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/gnu/usr.bin/dtc/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/mount.2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libgssapi/gss_compare_name.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpmc/pmc.core.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpmc/pmc.ucf.3#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libthr/thread/thr_condattr.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/msun/man/atan2.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/msun/man/math.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/msun/man/remainder.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/libexec/rbootd/rbootd.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/powerpc/boot_crunch.conf#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/fsck_msdosfs/fsck_msdosfs.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sbin/mount/mount.8#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/doc/legal/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/doc/legal/intel_iwn/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/acpi.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/dcons.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/ddb.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/io.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/lindev.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/mpt.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/sbp_targ.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/uep.4#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man5/devfs.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/BUS_DESCRIBE_INTR.9#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/atomic.9#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man9/make_dev.9#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/mk/bsd.own.mk#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/mca.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/apicreg.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/clock.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/mca.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/include/metadata.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/bindings-gpio.txt#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/bindings-mpp.txt#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/db78100.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/db88f5182.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/db88f5281.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/db88f6281.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/mpc8555cds.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/mpc8572ds.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/dts/sheevaplug.dts#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/fdt/fdt_loader_cmd.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/powerpc/uboot/version#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/ata/ata_xpt.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cam/scsi/scsi_xpt.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/NOTES#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/files#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/conf/options#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ddb/db_command.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ddb/db_command.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ddb/db_thread.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/amdsbwd/amdsbwd.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ah_eeprom_v1.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_bus_subr.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_bus_subr.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_fdt.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_if.m#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/ofw_standard.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/sge/if_sge.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/input/uep.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/label/g_label.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/part/g_part_vtoc8.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/apic_vector.s#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/mca.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/apicreg.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/clock.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/mca.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/xen/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/trap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/include/proc.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/isa/syscons_isa.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_clock.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_proc.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_resource.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/kern_thread.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/posix4_mib.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_trap.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sys_process.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/include/asm.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/pmap.c#7 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/swtch.S#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/tick.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/uio_machdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/ehcireg.h#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/ehcivar.h#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/pcibus.c#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/perfmon.h#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/perfmon_kern.c#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/perfmon_percpu.c#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/perfmon_utils.h#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/perfmon_xlrconfig.h#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/rmi/xlr_boot1_console.c#2 delete .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/Makefile#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/iwnfw/Makefile.inc#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/linux/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/modules/usb/uep/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/if.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/if_var.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/route.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net/rtsock.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net80211/ieee80211_hwmp.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/in.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/ip_options.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet/ip_output.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/cbus/syscons_cbus.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/mmu_oea.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/mmu_oea64.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/booke/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/include/metadata.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/ofw/ofw_real.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/_task.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/kernel.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/param.h#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/pcpu.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/posix4.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/resourcevar.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/sysent.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/systm.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/taskqueue.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/user.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/pmap.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_map.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_object.c#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.c#6 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.h#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/isa/clock.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/x86/x86/local_apic.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/build/options/WITH_FDT#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/dot1.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/dot2.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/exec1.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/exec2.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/return4.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/parser/heredoc4.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/parser/heredoc5.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/parser/heredoc6.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/sockets/unix_close_race/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/sockets/unix_close_race/unix_close_race.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.bin/jot/regress.rand1.out#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.bin/jot/regress.rand2.out#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.bin/jot/regress.sh#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.bin/jot/regress.stutter2.out#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/join/join.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/jot/jot.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/jot/jot.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/mail/util.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/newkey/newkey.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/dconschat/dconschat.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/fdcontrol/fdcontrol.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/i2c/i2c.8#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/iostat/iostat.8#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/jail/jail.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/nfsd/nfsv4.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/nfsd/stablerestart.5#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/updating/pkg_updating.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/smbmsg/smbmsg.8#2 integrate Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/chio/chio.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.28 2008/10/30 19:51:02 joerg Exp $"); +__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.29 2010/06/02 09:34:41 uqs Exp $"); #include <sys/param.h> #include <sys/chio.h> @@ -1072,6 +1072,7 @@ /* Read in the changer slots */ if (cp.cp_nslots > 0) { + (void) memset(&cesr, 0, sizeof(cesr)); cesr.cesr_element_type = CHET_ST; cesr.cesr_element_base = 0; cesr.cesr_element_count = cp.cp_nslots; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/pax/pat_rep.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.27 2007/05/25 17:53:37 brian Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.28 2010/05/24 06:33:14 uqs Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -76,7 +76,7 @@ #ifdef NET2_REGEX static int resub(regexp *, char *, char *, char *); #else -static int resub(regex_t *, regmatch_t *, char *, char *, char *); +static int resub(regex_t *, regmatch_t *, char *, char *, char *, char *); #endif /* @@ -929,7 +929,7 @@ # ifdef NET2_REGEX if ((res = resub(pt->rcmp,pt->nstr,outpt,endpt)) < 0) { # else - if ((res = resub(&(pt->rcmp),pm,pt->nstr,outpt,endpt)) + if ((res = resub(&(pt->rcmp),pm,inpt,pt->nstr,outpt,endpt)) < 0) { # endif if (prnt) @@ -1071,7 +1071,7 @@ */ static int -resub(regex_t *rp, regmatch_t *pm, char *src, char *dest, +resub(regex_t *rp, regmatch_t *pm, char *orig, char *src, char *dest, char *destend) { char *spt; @@ -1121,7 +1121,7 @@ */ if (len > (destend - dpt)) len = destend - dpt; - if (l_strncpy(dpt, src + pmpt->rm_so, len) != len) + if (l_strncpy(dpt, orig + pmpt->rm_so, len) != len) return(-1); dpt += len; } ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/eval.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.82 2010/05/08 14:00:01 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.83 2010/05/28 22:40:24 jilles Exp $"); #include <paths.h> #include <signal.h> @@ -1170,6 +1170,12 @@ int execcmd(int argc, char **argv) { + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + if (argc > 1 && strcmp(argv[1], "--") == 0) + argc--, argv++; if (argc > 1) { struct strlist *sp; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/jobs.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.75 2009/12/27 18:04:05 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.76 2010/05/24 10:35:57 jilles Exp $"); #include <fcntl.h> #include <signal.h> @@ -91,6 +91,7 @@ STATIC struct job *getjob(char *); STATIC pid_t dowait(int, struct job *); STATIC pid_t waitproc(int, int *); +STATIC void checkzombies(void); STATIC void cmdtxt(union node *); STATIC void cmdputs(const char *); #if JOBS @@ -400,7 +401,7 @@ struct job *jp; TRACE(("showjobs(%d) called\n", change)); - while (dowait(0, (struct job *)NULL) > 0); + checkzombies(); for (jobno = 1, jp = jobtab ; jobno <= njobs ; jobno++, jp++) { if (! jp->used) continue; @@ -742,6 +743,8 @@ TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; + if (mode == FORK_BG) + checkzombies(); flushall(); pid = fork(); if (pid == -1) { @@ -1056,6 +1059,15 @@ return (0); } + +STATIC void +checkzombies(void) +{ + while (njobs > 0 && dowait(0, NULL) > 0) + ; +} + + /* * Return a string identifying a command (to be printed by the * jobs command. ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/main.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.38 2010/04/17 14:35:46 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.39 2010/05/28 22:40:24 jilles Exp $"); #include <stdio.h> #include <signal.h> @@ -314,14 +314,20 @@ int dotcmd(int argc, char **argv) { - char *fullname; + char *filename, *fullname; if (argc < 2) error("missing filename"); exitstatus = 0; - fullname = find_dot_file(argv[1]); + /* + * Because we have historically not supported any options, + * only treat "--" specially. + */ + filename = argc > 2 && strcmp(argv[1], "--") == 0 ? argv[2] : argv[1]; + + fullname = find_dot_file(filename); setinputfile(fullname, 1); commandname = fullname; cmdloop(0); ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/parser.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.78 2010/04/11 12:24:47 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.80 2010/05/30 14:20:32 jilles Exp $"); #include <stdlib.h> #include <unistd.h> @@ -203,6 +203,7 @@ * which could happen if we add command substitution on PS1/PS2. */ parser_temp_free_all(); + heredoclist = NULL; tokpushback = 0; doprompt = interact; @@ -973,6 +974,8 @@ const int bq_startlinno = plinno; char *volatile ostr = NULL; struct parsefile *const savetopfile = getcurrentfile(); + struct heredoc *const saveheredoclist = heredoclist; + struct heredoc *here; str = NULL; if (setjmp(jmploc.loc)) { @@ -981,6 +984,7 @@ ckfree(str); if (ostr) ckfree(ostr); + heredoclist = saveheredoclist; handler = savehandler; if (exception == EXERROR) { startlinno = bq_startlinno; @@ -995,6 +999,7 @@ memcpy(str, stackblock(), savelen); } handler = &jmploc; + heredoclist = NULL; INTON; if (oldstyle) { /* We must read until the closing backquote, giving special @@ -1091,21 +1096,26 @@ while (stackblocksize() <= savelen) growstackblock(); STARTSTACKSTR(out); + INTOFF; if (str) { memcpy(out, str, savelen); STADJUST(savelen, out); - INTOFF; ckfree(str); str = NULL; - INTON; } if (ostr) { - INTOFF; ckfree(ostr); ostr = NULL; - INTON; + } + here = saveheredoclist; + if (here != NULL) { + while (here->next != NULL) + here = here->next; + here->next = heredoclist; + heredoclist = saveheredoclist; } handler = savehandler; + INTON; if (quoted) USTPUTC(CTLBACKQ | CTLQUOTE, out); else ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/sh.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.139 2010/05/09 22:03:18 jilles Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.141 2010/05/24 15:12:12 jilles Exp $ .\" -.Dd May 9, 2010 +.Dd May 24, 2010 .Dt SH 1 .Os .Sh NAME @@ -665,11 +665,11 @@ performing any searches. .It The shell searches each entry in the -.Ev PATH -environment variable +.Va PATH +variable in turn for the command. The value of the -.Ev PATH +.Va PATH variable should be a series of entries separated by colons. Each entry consists of a @@ -1040,13 +1040,9 @@ .Ic set built-in command can also be used to set or reset them. .Ss Special Parameters -A special parameter is a parameter denoted by a special one-character -name. -The special parameters recognized by the -.Nm -shell of -.Fx -are shown in the following list, exactly as they would appear in input +Special parameters are parameters denoted by a single special character +or the digit zero. +They are shown in the following list, exactly as they would appear in input typed by the user or in the source of a shell script. .Bl -hang .It Li $* @@ -1113,6 +1109,84 @@ .It Li $0 (zero) Expands to the name of the shell or shell script. .El +.Ss Special Variables +The following variables are set by the shell or +have special meaning to it: +.Bl -tag -width ".Va HISTSIZE" +.It Va CDPATH +The search path used with the +.Ic cd +built-in. +.It Va EDITOR +The fallback editor used with the +.Ic fc +built-in. +If not set, the default editor is +.Xr ed 1 . +.It Va FCEDIT +The default editor used with the +.Ic fc +built-in. +.It Va HISTSIZE +The number of previous commands that are accessible. +.It Va HOME +The user's home directory, +used in tilde expansion and as a default directory for the +.Ic cd +built-in. +.It Va IFS +Input Field Separators. +This is normally set to +.Aq space , +.Aq tab , +and +.Aq newline . +See the +.Sx White Space Splitting +section for more details. +.It Va LINENO +The current line number in the script or function. +.It Va MAIL +The name of a mail file, that will be checked for the arrival of new +mail. +Overridden by +.Va MAILPATH . +.It Va MAILPATH +A colon +.Pq Ql \&: +separated list of file names, for the shell to check for incoming +mail. +This variable overrides the +.Va MAIL +setting. +There is a maximum of 10 mailboxes that can be monitored at once. +.It Va PATH +The default search path for executables. +See the +.Sx Path Search +section for details. +.It Va PPID +The parent process ID of the invoked shell. +This is set at startup +unless this variable is in the environment. +A later change of parent process ID is not reflected. +A subshell retains the same value of +.Va PPID . +.It Va PS1 +The primary prompt string, which defaults to +.Dq Li "$ " , +unless you are the superuser, in which case it defaults to +.Dq Li "# " . +.It Va PS2 +The secondary prompt string, which defaults to +.Dq Li "> " . +.It Va PS4 +The prefix for the trace output (if +.Fl x +is active). +The default is +.Dq Li "+ " . +.El .Ss Word Expansions This clause describes the various expansions that are performed on words. @@ -1166,7 +1240,7 @@ username is missing (as in .Pa ~/foobar ) , the tilde is replaced with the value of the -.Ev HOME +.Va HOME variable (the current user's home directory). .Ss Parameter Expansion The format for parameter expansion is as follows: @@ -1491,10 +1565,10 @@ .Ql / characters, it is used as is. Otherwise, the shell searches the -.Ev PATH +.Va PATH for the file. If it is not found in the -.Ev PATH , +.Va PATH , it is sought in the current working directory. .It Ic \&[ A built-in equivalent of @@ -1538,7 +1612,7 @@ Switch to the specified .Ar directory , or to the directory specified in the -.Ev HOME +.Va HOME environment variable if no .Ar directory is specified. @@ -1549,17 +1623,17 @@ or .Pa .. , then the directories listed in the -.Ev CDPATH +.Va CDPATH variable will be searched for the specified .Ar directory . If -.Ev CDPATH +.Va CDPATH is unset, the current directory is searched. The format of -.Ev CDPATH +.Va CDPATH is the same as that of -.Ev PATH . +.Va PATH . In an interactive shell, the .Ic cd @@ -1567,7 +1641,7 @@ that it actually switched to if this is different from the name that the user gave. These may be different either because the -.Ev CDPATH +.Va CDPATH mechanism was used or because a symbolic link was crossed. .Pp If the @@ -1601,7 +1675,7 @@ .Fl p option is specified, the command search is performed using a default value of -.Ev PATH +.Va PATH that is guaranteed to find all of the standard utilities. .Pp If the @@ -1760,20 +1834,20 @@ .Ar editor string is a command name, subject to search via the -.Ev PATH +.Va PATH variable. The value in the -.Ev FCEDIT +.Va FCEDIT variable is used as a default when .Fl e is not specified. If -.Ev FCEDIT +.Va FCEDIT is null or unset, the value of the -.Ev EDITOR +.Va EDITOR variable is used. If -.Ev EDITOR +.Va EDITOR is null or unset, .Xr ed 1 is used as the editor. @@ -1807,7 +1881,7 @@ Select the commands to list or edit. The number of previous commands that can be accessed are determined by the value of the -.Ev HISTSIZE +.Va HISTSIZE variable. The value of .Ar first @@ -1838,12 +1912,12 @@ .El .El .Pp -The following environment variables affect the execution of +The following variables affect the execution of .Ic fc : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev FCEDIT +.Bl -tag -width ".Va HISTSIZE" +.It Va FCEDIT Name of the editor to use for history editing. -.It Ev HISTSIZE +.It Va HISTSIZE The number of previous commands that are accessible. .El .It Ic fg Op Ar job @@ -2309,74 +2383,27 @@ .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : -.Bl -tag -width ".Ev HISTSIZE" -.It Ev CDPATH -The search path used with the -.Ic cd -built-in. -.It Ev EDITOR -The fallback editor used with the -.Ic fc -built-in. -If not set, the default editor is -.Xr ed 1 . -.It Ev FCEDIT -The default editor used with the -.Ic fc -built-in. -.It Ev HISTSIZE -The number of previous commands that are accessible. -.It Ev HOME -The starting directory of -.Nm . -.It Ev IFS -Input Field Separators. -This is normally set to -.Aq space , -.Aq tab , -and -.Aq newline . -See the -.Sx White Space Splitting -section for more details. -.It Ev MAIL -The name of a mail file, that will be checked for the arrival of new -mail. -Overridden by -.Ev MAILPATH . -.It Ev MAILPATH -A colon -.Pq Ql \&: -separated list of file names, for the shell to check for incoming -mail. -This environment setting overrides the -.Ev MAIL -setting. -There is a maximum of 10 mailboxes that can be monitored at once. -.It Ev PATH -The default search path for executables. -See the -.Sx Path Search -section for details. -.It Ev PS1 -The primary prompt string, which defaults to -.Dq Li "$ " , -unless you are the superuser, in which case it defaults to -.Dq Li "# " . -.It Ev PS2 -The secondary prompt string, which defaults to -.Dq Li "> " . -.It Ev PS4 -The prefix for the trace output (if -.Fl x -is active). -The default is -.Dq Li "+ " . +.Bl -tag -width ".Ev LANGXXXXXX" +.It Ev ENV +Initialization file for interactive shells. +.It Ev LANG , Ev LC_* +Locale settings. +These are inherited by children of the shell, +and is used in a limited manner by the shell itself. +.It Ev PWD +An absolute pathname for the current directory, +possibly containing symbolic links. +This is used and updated by the shell. .It Ev TERM The default terminal setting for the shell. This is inherited by children of the shell, and is used in the history editing modes. .El +.Pp +Additionally, all environment variables are turned into shell variables +at startup, +which may affect the shell as described under +.Sx Special Variables . .Sh EXIT STATUS Errors that are detected by the shell, such as a syntax error, will cause the shell to exit with a non-zero exit status. ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#4 (text+ko) ==== @@ -1791,7 +1791,6 @@ /* We don't support those properties on FreeBSD. */ switch (prop) { case ZFS_PROP_DEVICES: - case ZFS_PROP_ZONED: case ZFS_PROP_SHAREISCSI: case ZFS_PROP_ISCSIOPTIONS: case ZFS_PROP_XATTR: ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/archures.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* BFD library support routines for architectures. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003 + 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Hacked by John Gilmore and Steve Chamberlain of Cygnus Support. @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ #include "bfd.h" #include "sysdep.h" @@ -141,10 +141,12 @@ .#define bfd_mach_mips6000 6000 .#define bfd_mach_mips7000 7000 .#define bfd_mach_mips8000 8000 +.#define bfd_mach_mips9000 9000 .#define bfd_mach_mips10000 10000 .#define bfd_mach_mips12000 12000 .#define bfd_mach_mips16 16 .#define bfd_mach_mips5 5 +.#define bfd_mach_mips_octeon 6502 .#define bfd_mach_mips_sb1 12310201 {* octal 'SB', 01 *} .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa32r2 33 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/bfd-in2.h#2 (text+ko) ==== @@ -8,7 +8,8 @@ /* Main header file for the bfd library -- portable access to object files. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. Contributed by Cygnus Support. @@ -26,7 +27,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef __BFD_H_SEEN__ #define __BFD_H_SEEN__ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/binutils/bfd/cpu-mips.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006021218.o52CIDKw063392>