Date: Mon, 13 Sep 2010 00:38:47 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r212509 - in user/imp/tbemd: . bin/expr bin/pax bin/sh bin/test cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libdtrace/common cddl/co... Message-ID: <201009130038.o8D0clWN040057@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Sep 13 00:38:46 2010 New Revision: 212509 URL: http://svn.freebsd.org/changeset/base/212509 Log: Merge head @r212508 Added: user/imp/tbemd/lib/libc/sys/sigwait.c - copied unchanged from r212508, head/lib/libc/sys/sigwait.c user/imp/tbemd/sbin/hastd/event.c - copied unchanged from r212508, head/sbin/hastd/event.c user/imp/tbemd/sbin/hastd/event.h - copied unchanged from r212508, head/sbin/hastd/event.h user/imp/tbemd/share/man/man4/aesni.4 - copied unchanged from r212508, head/share/man/man4/aesni.4 user/imp/tbemd/share/mk/bsd.dtrace.mk - copied unchanged from r212508, head/share/mk/bsd.dtrace.mk user/imp/tbemd/sys/arm/conf/DOCKSTAR - copied unchanged from r212508, head/sys/arm/conf/DOCKSTAR user/imp/tbemd/sys/boot/fdt/dts/dockstar.dts - copied unchanged from r212508, head/sys/boot/fdt/dts/dockstar.dts user/imp/tbemd/sys/dev/mps/ - copied from r212508, head/sys/dev/mps/ user/imp/tbemd/sys/mips/rmi/dev/xlr/debug.h - copied unchanged from r212508, head/sys/mips/rmi/dev/xlr/debug.h user/imp/tbemd/sys/mips/rmi/rmi_boot_info.h - copied unchanged from r212508, head/sys/mips/rmi/rmi_boot_info.h user/imp/tbemd/sys/modules/mps/ - copied from r212508, head/sys/modules/mps/ user/imp/tbemd/sys/powerpc/powermac/platform_powermac.c - copied unchanged from r212508, head/sys/powerpc/powermac/platform_powermac.c user/imp/tbemd/tools/regression/bin/Makefile - copied unchanged from r212508, head/tools/regression/bin/Makefile user/imp/tbemd/tools/regression/bin/pax/ - copied from r212508, head/tools/regression/bin/pax/ user/imp/tbemd/tools/regression/bin/sh/builtins/command4.0 - copied unchanged from r212508, head/tools/regression/bin/sh/builtins/command4.0 user/imp/tbemd/tools/regression/bin/sh/builtins/read2.0 - copied unchanged from r212508, head/tools/regression/bin/sh/builtins/read2.0 user/imp/tbemd/tools/regression/bin/sh/builtins/read3.0 - copied unchanged from r212508, head/tools/regression/bin/sh/builtins/read3.0 user/imp/tbemd/tools/regression/bin/sh/builtins/read3.0.stdout - copied unchanged from r212508, head/tools/regression/bin/sh/builtins/read3.0.stdout user/imp/tbemd/tools/regression/bin/sh/builtins/read4.0 - copied unchanged from r212508, head/tools/regression/bin/sh/builtins/read4.0 user/imp/tbemd/tools/regression/bin/sh/builtins/read4.0.stdout - copied unchanged from r212508, head/tools/regression/bin/sh/builtins/read4.0.stdout user/imp/tbemd/tools/regression/bin/sh/builtins/return6.4 - copied unchanged from r212508, head/tools/regression/bin/sh/builtins/return6.4 user/imp/tbemd/tools/regression/bin/sh/builtins/return7.4 - copied unchanged from r212508, head/tools/regression/bin/sh/builtins/return7.4 user/imp/tbemd/tools/regression/bin/sh/execution/var-assign1.0 - copied unchanged from r212508, head/tools/regression/bin/sh/execution/var-assign1.0 user/imp/tbemd/usr.sbin/pc-sysinstall/backend/installimage.sh - copied unchanged from r212508, head/usr.sbin/pc-sysinstall/backend/installimage.sh Deleted: user/imp/tbemd/sys/mips/rmi/clock.c user/imp/tbemd/sys/mips/rmi/clock.h user/imp/tbemd/sys/mips/rmi/debug.h user/imp/tbemd/sys/mips/rmi/shared_structs.h user/imp/tbemd/sys/mips/rmi/shared_structs_func.h user/imp/tbemd/sys/mips/rmi/shared_structs_offsets.h user/imp/tbemd/sys/mips/rmi/xlrconfig.h user/imp/tbemd/sys/powerpc/aim/platform_chrp.c user/imp/tbemd/sys/powerpc/aim/trap_subr.S user/imp/tbemd/tools/regression/bin/sh/builtins/command4.127 Modified: user/imp/tbemd/Makefile.inc1 user/imp/tbemd/ObsoleteFiles.inc user/imp/tbemd/bin/expr/expr.1 user/imp/tbemd/bin/pax/pax.1 user/imp/tbemd/bin/pax/tar.c user/imp/tbemd/bin/sh/eval.c user/imp/tbemd/bin/sh/expand.c user/imp/tbemd/bin/sh/miscbltin.c user/imp/tbemd/bin/sh/mksyntax.c user/imp/tbemd/bin/sh/parser.c user/imp/tbemd/bin/sh/sh.1 user/imp/tbemd/bin/sh/var.c user/imp/tbemd/bin/test/test.1 user/imp/tbemd/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/imp/tbemd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c user/imp/tbemd/cddl/contrib/opensolaris/lib/pyzfs/common/ioctl.c user/imp/tbemd/etc/mtree/BSD.var.dist user/imp/tbemd/etc/rc.d/cleartmp user/imp/tbemd/games/fortune/datfiles/fortunes user/imp/tbemd/gnu/lib/libobjc/Makefile user/imp/tbemd/gnu/lib/libstdc++/Makefile user/imp/tbemd/gnu/lib/libstdc++/config.h user/imp/tbemd/include/limits.h user/imp/tbemd/lib/libc/db/man/dbopen.3 user/imp/tbemd/lib/libc/net/sctp_send.3 user/imp/tbemd/lib/libc/net/sctp_sendmsg.3 user/imp/tbemd/lib/libc/posix1e/acl_strip.c user/imp/tbemd/lib/libc/stdio/printf.3 user/imp/tbemd/lib/libc/stdlib/Makefile.inc user/imp/tbemd/lib/libc/stdlib/malloc.3 user/imp/tbemd/lib/libc/sys/Makefile.inc user/imp/tbemd/lib/libc/sys/Symbol.map user/imp/tbemd/lib/libc/sys/connect.2 user/imp/tbemd/lib/libc/sys/cpuset_getaffinity.2 user/imp/tbemd/lib/libc/sys/sigaltstack.2 user/imp/tbemd/lib/libedit/common.c user/imp/tbemd/lib/libedit/term.c user/imp/tbemd/lib/libedit/term.h user/imp/tbemd/lib/libelf/elf_update.c user/imp/tbemd/lib/libjail/jail.3 user/imp/tbemd/lib/libjail/jail.c user/imp/tbemd/lib/libpmc/libpmc.c user/imp/tbemd/lib/libstand/nfs.c user/imp/tbemd/lib/libthr/thread/thr_cancel.c user/imp/tbemd/lib/libthr/thread/thr_cond.c user/imp/tbemd/lib/libthr/thread/thr_create.c user/imp/tbemd/lib/libthr/thread/thr_exit.c user/imp/tbemd/lib/libthr/thread/thr_fork.c user/imp/tbemd/lib/libthr/thread/thr_init.c user/imp/tbemd/lib/libthr/thread/thr_join.c user/imp/tbemd/lib/libthr/thread/thr_kern.c user/imp/tbemd/lib/libthr/thread/thr_mutex.c user/imp/tbemd/lib/libthr/thread/thr_private.h user/imp/tbemd/lib/libthr/thread/thr_rtld.c user/imp/tbemd/lib/libthr/thread/thr_sig.c user/imp/tbemd/lib/libthr/thread/thr_syscalls.c user/imp/tbemd/lib/libthr/thread/thr_umtx.c user/imp/tbemd/lib/libthr/thread/thr_umtx.h user/imp/tbemd/libexec/rtld-elf/powerpc64/reloc.c user/imp/tbemd/libexec/rtld-elf/rtld.c user/imp/tbemd/libexec/rtld-elf/rtld.h user/imp/tbemd/release/doc/share/misc/dev.archlist.txt user/imp/tbemd/sbin/dhclient/dhclient-script.8 user/imp/tbemd/sbin/fdisk/fdisk.c user/imp/tbemd/sbin/geom/class/sched/gsched.8 user/imp/tbemd/sbin/geom/core/geom.8 user/imp/tbemd/sbin/hastd/Makefile user/imp/tbemd/sbin/hastd/control.c user/imp/tbemd/sbin/hastd/hast.conf.5 user/imp/tbemd/sbin/hastd/hast.h user/imp/tbemd/sbin/hastd/hast_proto.c user/imp/tbemd/sbin/hastd/hast_proto.h user/imp/tbemd/sbin/hastd/hastd.c user/imp/tbemd/sbin/hastd/hooks.c user/imp/tbemd/sbin/hastd/hooks.h user/imp/tbemd/sbin/hastd/pjdlog.c user/imp/tbemd/sbin/hastd/primary.c user/imp/tbemd/sbin/hastd/proto.c user/imp/tbemd/sbin/hastd/proto.h user/imp/tbemd/sbin/hastd/proto_socketpair.c user/imp/tbemd/sbin/hastd/secondary.c user/imp/tbemd/sbin/hastd/synch.h user/imp/tbemd/sbin/kldload/kldload.8 user/imp/tbemd/sbin/kldload/kldload.c user/imp/tbemd/sbin/mount_nfs/mount_nfs.c user/imp/tbemd/sbin/mount_unionfs/mount_unionfs.8 user/imp/tbemd/sbin/newfs/newfs.8 user/imp/tbemd/secure/lib/libcrypto/man/BIO_s_bio.3 user/imp/tbemd/share/examples/etc/make.conf user/imp/tbemd/share/man/man3/Makefile user/imp/tbemd/share/man/man3/siginfo.3 user/imp/tbemd/share/man/man4/Makefile user/imp/tbemd/share/man/man4/ata.4 user/imp/tbemd/share/man/man4/axe.4 user/imp/tbemd/share/man/man4/bwn.4 user/imp/tbemd/share/man/man4/crypto.4 user/imp/tbemd/share/man/man4/ddb.4 user/imp/tbemd/share/man/man4/man4.powerpc/powermac_nvram.4 user/imp/tbemd/share/man/man4/ng_hci.4 user/imp/tbemd/share/man/man4/psm.4 user/imp/tbemd/share/man/man4/sis.4 user/imp/tbemd/share/man/man5/rc.conf.5 user/imp/tbemd/share/man/man7/hier.7 user/imp/tbemd/share/man/man9/Makefile user/imp/tbemd/share/man/man9/devclass_get_maxunit.9 user/imp/tbemd/share/man/man9/locking.9 user/imp/tbemd/share/man/man9/make_dev.9 user/imp/tbemd/share/man/man9/rmlock.9 user/imp/tbemd/share/man/man9/sbuf.9 user/imp/tbemd/share/misc/committers-ports.dot user/imp/tbemd/share/misc/committers-src.dot user/imp/tbemd/share/mk/Makefile user/imp/tbemd/share/mk/bsd.lib.mk user/imp/tbemd/share/mk/bsd.prog.mk user/imp/tbemd/share/mk/sys.mk user/imp/tbemd/sys/amd64/amd64/cpu_switch.S user/imp/tbemd/sys/amd64/amd64/legacy.c user/imp/tbemd/sys/amd64/amd64/nexus.c user/imp/tbemd/sys/amd64/conf/GENERIC user/imp/tbemd/sys/amd64/include/cpufunc.h user/imp/tbemd/sys/arm/arm/nexus.c user/imp/tbemd/sys/arm/arm/pmap.c user/imp/tbemd/sys/arm/xscale/ixp425/ixp425.c user/imp/tbemd/sys/boot/forth/beastie.4th user/imp/tbemd/sys/boot/i386/boot2/Makefile user/imp/tbemd/sys/boot/i386/efi/Makefile user/imp/tbemd/sys/boot/i386/libi386/pxe.c user/imp/tbemd/sys/boot/i386/loader/Makefile user/imp/tbemd/sys/boot/i386/zfsloader/Makefile user/imp/tbemd/sys/boot/ofw/libofw/ofw_copy.c user/imp/tbemd/sys/boot/pc98/boot2/Makefile user/imp/tbemd/sys/boot/pc98/boot2/boot2.c user/imp/tbemd/sys/boot/zfs/zfsimpl.c user/imp/tbemd/sys/cam/ata/ata_da.c user/imp/tbemd/sys/cam/scsi/scsi_da.c user/imp/tbemd/sys/cddl/boot/zfs/zfsimpl.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c user/imp/tbemd/sys/cddl/dev/dtrace/dtrace_load.c user/imp/tbemd/sys/compat/linux/linux_ioctl.c user/imp/tbemd/sys/conf/files user/imp/tbemd/sys/conf/files.powerpc user/imp/tbemd/sys/contrib/pf/net/pf.c user/imp/tbemd/sys/dev/acpi_support/acpi_hp.c user/imp/tbemd/sys/dev/acpi_support/acpi_wmi.c user/imp/tbemd/sys/dev/acpica/acpi.c user/imp/tbemd/sys/dev/acpica/acpi_cpu.c user/imp/tbemd/sys/dev/acpica/acpi_hpet.c user/imp/tbemd/sys/dev/ata/ata-all.h user/imp/tbemd/sys/dev/ata/ata-lowlevel.c user/imp/tbemd/sys/dev/ata/chipsets/ata-ahci.c user/imp/tbemd/sys/dev/ata/chipsets/ata-serverworks.c user/imp/tbemd/sys/dev/ata/chipsets/ata-siliconimage.c user/imp/tbemd/sys/dev/atkbdc/atkbdc_isa.c user/imp/tbemd/sys/dev/atkbdc/psm.c user/imp/tbemd/sys/dev/bge/if_bge.c user/imp/tbemd/sys/dev/bge/if_bgereg.h user/imp/tbemd/sys/dev/cxgb/cxgb_sge.c user/imp/tbemd/sys/dev/e1000/if_em.c user/imp/tbemd/sys/dev/e1000/if_em.h user/imp/tbemd/sys/dev/fb/vesa.c user/imp/tbemd/sys/dev/firewire/firewire.c user/imp/tbemd/sys/dev/firewire/fwohci_pci.c user/imp/tbemd/sys/dev/hwpmc/hwpmc_core.c user/imp/tbemd/sys/dev/if_ndis/if_ndis_usb.c user/imp/tbemd/sys/dev/iicbus/iicbus.c user/imp/tbemd/sys/dev/iscsi/initiator/iscsi.c user/imp/tbemd/sys/dev/iscsi/initiator/iscsivar.h user/imp/tbemd/sys/dev/led/led.c user/imp/tbemd/sys/dev/malo/if_malo_pci.c user/imp/tbemd/sys/dev/mii/brgphy.c user/imp/tbemd/sys/dev/mii/brgphyreg.h user/imp/tbemd/sys/dev/msk/if_msk.c user/imp/tbemd/sys/dev/mwl/if_mwl_pci.c user/imp/tbemd/sys/dev/ofw/ofw_fdt.c user/imp/tbemd/sys/dev/ofw/ofw_if.m user/imp/tbemd/sys/dev/ofw/ofw_iicbus.c user/imp/tbemd/sys/dev/ofw/ofw_standard.c user/imp/tbemd/sys/dev/ofw/openfirm.c user/imp/tbemd/sys/dev/pci/pcireg.h user/imp/tbemd/sys/dev/powermac_nvram/powermac_nvram.c user/imp/tbemd/sys/dev/powermac_nvram/powermac_nvramvar.h user/imp/tbemd/sys/dev/ppbus/ppbconf.c user/imp/tbemd/sys/dev/siba/siba.c user/imp/tbemd/sys/dev/sis/if_sis.c user/imp/tbemd/sys/dev/sis/if_sisreg.h user/imp/tbemd/sys/dev/spibus/spibus.c user/imp/tbemd/sys/dev/twa/tw_cl.h user/imp/tbemd/sys/dev/twa/tw_cl_externs.h user/imp/tbemd/sys/dev/twa/tw_cl_fwif.h user/imp/tbemd/sys/dev/twa/tw_cl_init.c user/imp/tbemd/sys/dev/twa/tw_cl_intr.c user/imp/tbemd/sys/dev/twa/tw_cl_io.c user/imp/tbemd/sys/dev/twa/tw_cl_misc.c user/imp/tbemd/sys/dev/twa/tw_cl_share.h user/imp/tbemd/sys/dev/twa/tw_osl.h user/imp/tbemd/sys/dev/twa/tw_osl_cam.c user/imp/tbemd/sys/dev/twa/tw_osl_freebsd.c user/imp/tbemd/sys/dev/twa/tw_osl_share.h user/imp/tbemd/sys/dev/usb/controller/ehci.c user/imp/tbemd/sys/dev/usb/controller/ohci.c user/imp/tbemd/sys/dev/usb/controller/uhci.c user/imp/tbemd/sys/dev/usb/input/atp.c user/imp/tbemd/sys/dev/usb/input/uep.c user/imp/tbemd/sys/dev/usb/input/uhid.c user/imp/tbemd/sys/dev/usb/input/ukbd.c user/imp/tbemd/sys/dev/usb/input/ums.c user/imp/tbemd/sys/dev/usb/misc/udbp.c user/imp/tbemd/sys/dev/usb/misc/ufm.c user/imp/tbemd/sys/dev/usb/net/if_aue.c user/imp/tbemd/sys/dev/usb/net/if_axe.c user/imp/tbemd/sys/dev/usb/net/if_axereg.h user/imp/tbemd/sys/dev/usb/net/if_cdce.c user/imp/tbemd/sys/dev/usb/net/if_cue.c user/imp/tbemd/sys/dev/usb/net/if_kue.c user/imp/tbemd/sys/dev/usb/net/if_rue.c user/imp/tbemd/sys/dev/usb/net/if_udav.c user/imp/tbemd/sys/dev/usb/net/uhso.c user/imp/tbemd/sys/dev/usb/serial/u3g.c user/imp/tbemd/sys/dev/usb/serial/uark.c user/imp/tbemd/sys/dev/usb/serial/ubsa.c user/imp/tbemd/sys/dev/usb/serial/ubser.c user/imp/tbemd/sys/dev/usb/serial/uchcom.c user/imp/tbemd/sys/dev/usb/serial/ucycom.c user/imp/tbemd/sys/dev/usb/serial/ufoma.c user/imp/tbemd/sys/dev/usb/serial/uftdi.c user/imp/tbemd/sys/dev/usb/serial/ugensa.c user/imp/tbemd/sys/dev/usb/serial/uipaq.c user/imp/tbemd/sys/dev/usb/serial/ulpt.c user/imp/tbemd/sys/dev/usb/serial/umct.c user/imp/tbemd/sys/dev/usb/serial/umoscom.c user/imp/tbemd/sys/dev/usb/serial/uvisor.c user/imp/tbemd/sys/dev/usb/storage/umass.c user/imp/tbemd/sys/dev/usb/storage/urio.c user/imp/tbemd/sys/dev/usb/usb_compat_linux.c user/imp/tbemd/sys/dev/usb/usb_controller.h user/imp/tbemd/sys/dev/usb/usb_device.c user/imp/tbemd/sys/dev/usb/usb_generic.c user/imp/tbemd/sys/dev/usb/usb_hub.c user/imp/tbemd/sys/dev/usb/usb_transfer.c user/imp/tbemd/sys/dev/usb/usb_transfer.h user/imp/tbemd/sys/dev/usb/usbdi.h user/imp/tbemd/sys/dev/usb/usbdi_util.h user/imp/tbemd/sys/dev/usb/wlan/if_rum.c user/imp/tbemd/sys/dev/usb/wlan/if_run.c user/imp/tbemd/sys/dev/usb/wlan/if_uath.c user/imp/tbemd/sys/dev/usb/wlan/if_upgt.c user/imp/tbemd/sys/dev/usb/wlan/if_ural.c user/imp/tbemd/sys/dev/usb/wlan/if_urtw.c user/imp/tbemd/sys/dev/usb/wlan/if_zyd.c user/imp/tbemd/sys/fs/ext2fs/ext2_alloc.c user/imp/tbemd/sys/fs/nfs/nfsdport.h user/imp/tbemd/sys/fs/nfsclient/nfs_clbio.c user/imp/tbemd/sys/fs/nfsclient/nfs_clrpcops.c user/imp/tbemd/sys/fs/nfsclient/nfs_clvnops.c user/imp/tbemd/sys/fs/nfsclient/nfsnode.h user/imp/tbemd/sys/fs/nfsserver/nfs_nfsdstate.c user/imp/tbemd/sys/fs/nullfs/null_vnops.c user/imp/tbemd/sys/fs/tmpfs/tmpfs_vnops.c user/imp/tbemd/sys/fs/unionfs/union_vfsops.c user/imp/tbemd/sys/geom/geom_io.c user/imp/tbemd/sys/geom/sched/subr_disk.c user/imp/tbemd/sys/i386/i386/legacy.c user/imp/tbemd/sys/i386/i386/nexus.c user/imp/tbemd/sys/i386/include/cpufunc.h user/imp/tbemd/sys/ia64/ia64/nexus.c user/imp/tbemd/sys/isa/isa_common.c user/imp/tbemd/sys/kern/bus_if.m user/imp/tbemd/sys/kern/init_sysent.c user/imp/tbemd/sys/kern/kern_et.c user/imp/tbemd/sys/kern/kern_exec.c user/imp/tbemd/sys/kern/kern_fork.c user/imp/tbemd/sys/kern/kern_jail.c user/imp/tbemd/sys/kern/kern_malloc.c user/imp/tbemd/sys/kern/kern_rmlock.c user/imp/tbemd/sys/kern/kern_sig.c user/imp/tbemd/sys/kern/kern_sysctl.c user/imp/tbemd/sys/kern/sched_4bsd.c user/imp/tbemd/sys/kern/sched_ule.c user/imp/tbemd/sys/kern/subr_acl_nfs4.c user/imp/tbemd/sys/kern/subr_acl_posix1e.c user/imp/tbemd/sys/kern/subr_bus.c user/imp/tbemd/sys/kern/subr_disk.c user/imp/tbemd/sys/kern/subr_lock.c user/imp/tbemd/sys/kern/subr_sbuf.c user/imp/tbemd/sys/kern/subr_sleepqueue.c user/imp/tbemd/sys/kern/subr_witness.c user/imp/tbemd/sys/kern/syscalls.c user/imp/tbemd/sys/kern/syscalls.master user/imp/tbemd/sys/kern/systrace_args.c user/imp/tbemd/sys/kern/uipc_syscalls.c user/imp/tbemd/sys/kern/vfs_mount.c user/imp/tbemd/sys/kern/vfs_subr.c user/imp/tbemd/sys/mips/adm5120/obio.c user/imp/tbemd/sys/mips/alchemy/obio.c user/imp/tbemd/sys/mips/atheros/apb.c user/imp/tbemd/sys/mips/idt/obio.c user/imp/tbemd/sys/mips/include/pmap.h user/imp/tbemd/sys/mips/include/pte.h user/imp/tbemd/sys/mips/mips/busdma_machdep.c user/imp/tbemd/sys/mips/mips/mainbus.c user/imp/tbemd/sys/mips/mips/nexus.c user/imp/tbemd/sys/mips/mips/pmap.c user/imp/tbemd/sys/mips/rmi/board.c user/imp/tbemd/sys/mips/rmi/board.h user/imp/tbemd/sys/mips/rmi/dev/nlge/if_nlge.c user/imp/tbemd/sys/mips/rmi/dev/xlr/rge.c user/imp/tbemd/sys/mips/rmi/fmn.c user/imp/tbemd/sys/mips/rmi/interrupt.h user/imp/tbemd/sys/mips/rmi/intr_machdep.c user/imp/tbemd/sys/mips/rmi/iodi.c user/imp/tbemd/sys/mips/rmi/iomap.h user/imp/tbemd/sys/mips/rmi/msgring.h user/imp/tbemd/sys/mips/rmi/pic.h user/imp/tbemd/sys/mips/rmi/rmi_mips_exts.h user/imp/tbemd/sys/mips/rmi/xlr_machdep.c user/imp/tbemd/sys/mips/rmi/xlr_pci.c user/imp/tbemd/sys/mips/sibyte/sb_zbbus.c user/imp/tbemd/sys/modules/Makefile user/imp/tbemd/sys/modules/crypto/Makefile user/imp/tbemd/sys/net/if.c user/imp/tbemd/sys/net/if_epair.c user/imp/tbemd/sys/net/if_lagg.c user/imp/tbemd/sys/netinet/in.c user/imp/tbemd/sys/netinet/ip_carp.c user/imp/tbemd/sys/netinet/ip_input.c user/imp/tbemd/sys/netinet/ip_var.h user/imp/tbemd/sys/netinet/ipfw/ip_fw_log.c user/imp/tbemd/sys/netinet/ipfw/ip_fw_nat.c user/imp/tbemd/sys/netinet/raw_ip.c user/imp/tbemd/sys/netinet/sctp_crc32.c user/imp/tbemd/sys/netinet/sctp_crc32.h user/imp/tbemd/sys/netinet/sctp_input.c user/imp/tbemd/sys/netinet/sctp_os_bsd.h user/imp/tbemd/sys/netinet/sctp_output.c user/imp/tbemd/sys/netinet/sctp_pcb.c user/imp/tbemd/sys/netinet/sctp_sysctl.c user/imp/tbemd/sys/netinet/sctp_sysctl.h user/imp/tbemd/sys/netinet/sctp_timer.c user/imp/tbemd/sys/netinet/sctp_uio.h user/imp/tbemd/sys/netinet/sctputil.c user/imp/tbemd/sys/netinet6/ip6_input.c user/imp/tbemd/sys/netinet6/ip6_var.h user/imp/tbemd/sys/netinet6/sctp6_usrreq.c user/imp/tbemd/sys/nfsclient/nfs.h user/imp/tbemd/sys/nfsclient/nfs_diskless.c user/imp/tbemd/sys/nfsclient/nfs_nfsiod.c user/imp/tbemd/sys/nfsclient/nfs_subs.c user/imp/tbemd/sys/nfsclient/nfs_vnops.c user/imp/tbemd/sys/nfsclient/nfsnode.h user/imp/tbemd/sys/pc98/pc98/canbus.c user/imp/tbemd/sys/powerpc/aim/clock.c user/imp/tbemd/sys/powerpc/aim/interrupt.c user/imp/tbemd/sys/powerpc/aim/machdep.c user/imp/tbemd/sys/powerpc/aim/mmu_oea.c user/imp/tbemd/sys/powerpc/aim/mmu_oea64.c user/imp/tbemd/sys/powerpc/aim/nexus.c user/imp/tbemd/sys/powerpc/aim/ofw_machdep.c user/imp/tbemd/sys/powerpc/aim/vm_machdep.c user/imp/tbemd/sys/powerpc/booke/clock.c user/imp/tbemd/sys/powerpc/booke/interrupt.c user/imp/tbemd/sys/powerpc/booke/platform_bare.c user/imp/tbemd/sys/powerpc/conf/GENERIC64 user/imp/tbemd/sys/powerpc/include/intr_machdep.h user/imp/tbemd/sys/powerpc/include/md_var.h user/imp/tbemd/sys/powerpc/include/ofw_machdep.h user/imp/tbemd/sys/powerpc/include/param.h user/imp/tbemd/sys/powerpc/include/smp.h user/imp/tbemd/sys/powerpc/mpc85xx/mpc85xx.c user/imp/tbemd/sys/powerpc/ofw/ofw_real.c user/imp/tbemd/sys/powerpc/powermac/ata_kauai.c user/imp/tbemd/sys/powerpc/powermac/cuda.c user/imp/tbemd/sys/powerpc/powermac/pmu.c user/imp/tbemd/sys/powerpc/powermac/smu.c user/imp/tbemd/sys/powerpc/powerpc/intr_machdep.c user/imp/tbemd/sys/powerpc/powerpc/mp_machdep.c user/imp/tbemd/sys/powerpc/powerpc/platform.c user/imp/tbemd/sys/powerpc/powerpc/platform_if.m user/imp/tbemd/sys/security/audit/audit_bsm_klib.c user/imp/tbemd/sys/sparc64/conf/GENERIC user/imp/tbemd/sys/sparc64/pci/schizo.c user/imp/tbemd/sys/sparc64/sparc64/machdep.c user/imp/tbemd/sys/sparc64/sparc64/nexus.c user/imp/tbemd/sys/sun4v/sun4v/nexus.c user/imp/tbemd/sys/sun4v/sun4v/vnex.c user/imp/tbemd/sys/sys/_rmlock.h user/imp/tbemd/sys/sys/bio.h user/imp/tbemd/sys/sys/bus.h user/imp/tbemd/sys/sys/copyright.h user/imp/tbemd/sys/sys/elf_common.h user/imp/tbemd/sys/sys/lock.h user/imp/tbemd/sys/sys/mount.h user/imp/tbemd/sys/sys/param.h user/imp/tbemd/sys/sys/rmlock.h user/imp/tbemd/sys/sys/sbuf.h user/imp/tbemd/sys/sys/syscall.h user/imp/tbemd/sys/sys/syscall.mk user/imp/tbemd/sys/sys/sysctl.h user/imp/tbemd/sys/sys/sysproto.h user/imp/tbemd/sys/sys/time.h user/imp/tbemd/sys/vm/memguard.c user/imp/tbemd/sys/vm/memguard.h user/imp/tbemd/sys/vm/uma_core.c user/imp/tbemd/sys/vm/vm_mmap.c user/imp/tbemd/sys/vm/vm_page.c user/imp/tbemd/sys/vm/vm_pageout.c user/imp/tbemd/sys/vm/vm_phys.c user/imp/tbemd/sys/vm/vm_reserv.c user/imp/tbemd/sys/x86/pci/qpi.c user/imp/tbemd/sys/x86/x86/local_apic.c user/imp/tbemd/tools/tools/nanobsd/nanobsd.sh user/imp/tbemd/tools/tools/sysbuild/sysbuild.sh user/imp/tbemd/usr.bin/calendar/calendar.1 user/imp/tbemd/usr.bin/calendar/calendar.h user/imp/tbemd/usr.bin/calendar/calendars/calendar.freebsd user/imp/tbemd/usr.bin/calendar/calendars/calendar.judaic user/imp/tbemd/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes user/imp/tbemd/usr.bin/calendar/parsedata.c user/imp/tbemd/usr.bin/cpio/bsdcpio.1 user/imp/tbemd/usr.bin/ncal/ncal.c user/imp/tbemd/usr.bin/printf/printf.1 user/imp/tbemd/usr.bin/split/split.1 user/imp/tbemd/usr.bin/systat/vmstat.c user/imp/tbemd/usr.bin/usbhidaction/usbhidaction.c user/imp/tbemd/usr.sbin/apmd/apmd.c user/imp/tbemd/usr.sbin/bluetooth/bthidcontrol/sdp.c user/imp/tbemd/usr.sbin/bluetooth/bthidd/hid.c user/imp/tbemd/usr.sbin/freebsd-update/freebsd-update.8 user/imp/tbemd/usr.sbin/freebsd-update/freebsd-update.sh user/imp/tbemd/usr.sbin/pc-sysinstall/backend-query/disk-list.sh user/imp/tbemd/usr.sbin/pc-sysinstall/backend/Makefile user/imp/tbemd/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh user/imp/tbemd/usr.sbin/pc-sysinstall/backend/functions-disk.sh user/imp/tbemd/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh user/imp/tbemd/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh user/imp/tbemd/usr.sbin/pc-sysinstall/backend/functions-packages.sh user/imp/tbemd/usr.sbin/pc-sysinstall/backend/functions-parse.sh user/imp/tbemd/usr.sbin/pc-sysinstall/backend/functions.sh user/imp/tbemd/usr.sbin/pc-sysinstall/backend/parseconfig.sh user/imp/tbemd/usr.sbin/pc-sysinstall/doc/help-index user/imp/tbemd/usr.sbin/pc-sysinstall/examples/README user/imp/tbemd/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh user/imp/tbemd/usr.sbin/pciconf/cap.c user/imp/tbemd/usr.sbin/pciconf/pciconf.8 user/imp/tbemd/usr.sbin/pciconf/pciconf.c user/imp/tbemd/usr.sbin/pkg_install/add/main.c user/imp/tbemd/usr.sbin/pmcstat/pmcpl_callgraph.c user/imp/tbemd/usr.sbin/pmcstat/pmcpl_calltree.c user/imp/tbemd/usr.sbin/pmcstat/pmcstat_log.c user/imp/tbemd/usr.sbin/pmcstat/pmcstat_log.h Directory Properties: user/imp/tbemd/ (props changed) user/imp/tbemd/cddl/contrib/opensolaris/ (props changed) user/imp/tbemd/contrib/bind9/ (props changed) user/imp/tbemd/contrib/ee/ (props changed) user/imp/tbemd/contrib/expat/ (props changed) user/imp/tbemd/contrib/file/ (props changed) user/imp/tbemd/contrib/gdb/ (props changed) user/imp/tbemd/contrib/gdtoa/ (props changed) user/imp/tbemd/contrib/gnu-sort/ (props changed) user/imp/tbemd/contrib/groff/ (props changed) user/imp/tbemd/contrib/less/ (props changed) user/imp/tbemd/contrib/libpcap/ (props changed) user/imp/tbemd/contrib/llvm/ (props changed) user/imp/tbemd/contrib/llvm/tools/clang/ (props changed) user/imp/tbemd/contrib/ncurses/ (props changed) user/imp/tbemd/contrib/netcat/ (props changed) user/imp/tbemd/contrib/ntp/ (props changed) user/imp/tbemd/contrib/one-true-awk/ (props changed) user/imp/tbemd/contrib/openbsm/ (props changed) user/imp/tbemd/contrib/openpam/ (props changed) user/imp/tbemd/contrib/pf/ (props changed) user/imp/tbemd/contrib/sendmail/ (props changed) user/imp/tbemd/contrib/tcpdump/ (props changed) user/imp/tbemd/contrib/tcsh/ (props changed) user/imp/tbemd/contrib/top/ (props changed) user/imp/tbemd/contrib/top/install-sh (props changed) user/imp/tbemd/contrib/tzcode/stdtime/ (props changed) user/imp/tbemd/contrib/tzcode/zic/ (props changed) user/imp/tbemd/contrib/tzdata/ (props changed) user/imp/tbemd/contrib/wpa/ (props changed) user/imp/tbemd/crypto/openssh/ (props changed) user/imp/tbemd/crypto/openssl/ (props changed) user/imp/tbemd/lib/libc/ (props changed) user/imp/tbemd/lib/libc/stdtime/ (props changed) user/imp/tbemd/lib/libutil/ (props changed) user/imp/tbemd/lib/libz/ (props changed) user/imp/tbemd/sbin/ (props changed) user/imp/tbemd/sbin/ipfw/ (props changed) user/imp/tbemd/share/zoneinfo/ (props changed) user/imp/tbemd/sys/ (props changed) user/imp/tbemd/sys/amd64/include/xen/ (props changed) user/imp/tbemd/sys/cddl/contrib/opensolaris/ (props changed) user/imp/tbemd/sys/contrib/dev/acpica/ (props changed) user/imp/tbemd/sys/contrib/pf/ (props changed) user/imp/tbemd/sys/contrib/x86emu/ (props changed) user/imp/tbemd/sys/dev/xen/xenpci/ (props changed) user/imp/tbemd/usr.bin/calendar/ (props changed) user/imp/tbemd/usr.bin/csup/ (props changed) user/imp/tbemd/usr.bin/procstat/ (props changed) user/imp/tbemd/usr.sbin/zic/ (props changed) Modified: user/imp/tbemd/Makefile.inc1 ============================================================================== --- user/imp/tbemd/Makefile.inc1 Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/Makefile.inc1 Mon Sep 13 00:38:46 2010 (r212509) @@ -161,7 +161,7 @@ BUILD_ARCH!= uname -p .error To cross-build, set TARGET_ARCH. .endif .endif -.if ${MACHINE} == ${TARGET} && !defined(CROSS_BUILD_TESTING) +.if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING) OBJTREE= ${MAKEOBJDIRPREFIX} .else OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} Modified: user/imp/tbemd/ObsoleteFiles.inc ============================================================================== --- user/imp/tbemd/ObsoleteFiles.inc Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/ObsoleteFiles.inc Mon Sep 13 00:38:46 2010 (r212509) @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100910: renamed sbuf_overflowed to sbuf_error +OLD_FILES+=usr/share/man/man9/sbuf_overflowed.9.gz # 20100815: retired last traces of chooseproc(9) OLD_FILES+=usr/share/man/man9/chooseproc.9.gz # 20100806: removal of unused libcompat routines Modified: user/imp/tbemd/bin/expr/expr.1 ============================================================================== --- user/imp/tbemd/bin/expr/expr.1 Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/bin/expr/expr.1 Mon Sep 13 00:38:46 2010 (r212509) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 12, 2004 +.Dd September 9, 2010 .Dt EXPR 1 .Os .Sh NAME @@ -217,6 +217,9 @@ command, one might rearrange the express More generally, parenthesize possibly-negative values: .Dl "a=$(expr \e( $a \e) + 1)" .It +With shell arithmetic, no escaping is required: +.Dl "a=$((a + 1))" +.It This example prints the filename portion of a pathname stored in variable .Va a . @@ -229,6 +232,12 @@ The .Li // characters resolve this ambiguity. .Dl "expr \*q//$a\*q \&: '.*/\e(.*\e)'" +.It +With modern +.Xr sh 1 +syntax, +.Dl "\*q${a##*/}\*q" +expands to the same value. .El .Pp The following examples output the number of characters in variable @@ -237,19 +246,21 @@ Again, if .Va a might begin with a hyphen, it is necessary to prevent it from being interpreted as an option to -.Nm . +.Nm , +and +.Va a +might be interpreted as an operator. .Bl -bullet .It -If the -.Nm -command conforms to -.St -p1003.1-2001 , -this is simple: -.Dl "expr -- \*q$a\*q \&: \*q.*\*q" -.It -For portability to older systems, however, a more complicated command +To deal with all of this, a complicated command is required: .Dl "expr \e( \*qX$a\*q \&: \*q.*\*q \e) - 1" +.It +With modern +.Xr sh 1 +syntax, this can be done much more easily: +.Dl "${#a}" +expands to the required number. .El .Sh SEE ALSO .Xr sh 1 , Modified: user/imp/tbemd/bin/pax/pax.1 ============================================================================== --- user/imp/tbemd/bin/pax/pax.1 Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/bin/pax/pax.1 Mon Sep 13 00:38:46 2010 (r212509) @@ -33,7 +33,7 @@ .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd July 3, 2004 +.Dd August 29, 2010 .Dt PAX 1 .Os .Sh NAME @@ -748,7 +748,9 @@ The extended tar interchange format spec .St -p1003.2 standard. The default blocksize for this format is 10240 bytes. -Pathnames stored by this format must be 250 characters or less in length. +Pathnames stored by this format must be 255 characters or less in length. +The directory part may be at most 155 characters and each path component +must be less than 100 characters. .El .Pp The Modified: user/imp/tbemd/bin/pax/tar.c ============================================================================== --- user/imp/tbemd/bin/pax/tar.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/bin/pax/tar.c Mon Sep 13 00:38:46 2010 (r212509) @@ -1086,7 +1086,7 @@ name_split(char *name, int len) */ if (len <= TNMSZ) return(name); - if (len > (TPFSZ + TNMSZ + 1)) + if (len > TPFSZ + TNMSZ) return(NULL); /* Modified: user/imp/tbemd/bin/sh/eval.c ============================================================================== --- user/imp/tbemd/bin/sh/eval.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/bin/sh/eval.c Mon Sep 13 00:38:46 2010 (r212509) @@ -305,6 +305,8 @@ skipping: if (evalskip == SKIPCONT && } if (evalskip == SKIPBREAK && --skipcount <= 0) evalskip = 0; + if (evalskip == SKIPFUNC || evalskip == SKIPFILE) + status = exitstatus; break; } if (n->type == NWHILE) { @@ -995,7 +997,7 @@ cmddone: goto out; parent: /* parent process gets here (if we forked) */ - if (mode == 0) { /* argument to fork */ + if (mode == FORK_FG) { /* argument to fork */ INTOFF; exitstatus = waitforjob(jp, &realstatus); INTON; @@ -1003,7 +1005,7 @@ parent: /* parent process gets here (if evalskip = SKIPBREAK; skipcount = loopnest; } - } else if (mode == 2) { + } else if (mode == FORK_NOJOB) { backcmd->fd = pip[0]; close(pip[1]); backcmd->jp = jp; Modified: user/imp/tbemd/bin/sh/expand.c ============================================================================== --- user/imp/tbemd/bin/sh/expand.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/bin/sh/expand.c Mon Sep 13 00:38:46 2010 (r212509) @@ -138,12 +138,18 @@ expandhere(union node *arg, int fd) /* - * Perform variable substitution and command substitution on an argument, - * placing the resulting list of arguments in arglist. If EXP_FULL is true, - * perform splitting and file name expansion. When arglist is NULL, perform - * here document expansion. + * Perform expansions on an argument, placing the resulting list of arguments + * in arglist. Parameter expansion, command substitution and arithmetic + * expansion are always performed; additional expansions can be requested + * via flag (EXP_*). + * The result is left in the stack string. + * When arglist is NULL, perform here document expansion. A partial result + * may be written to herefd, which is then not included in the stack string. + * + * Caution: this function uses global state and is not reentrant. + * However, a new invocation after an interrupted invocation is safe + * and will reset the global state for the new call. */ - void expandarg(union node *arg, struct arglist *arglist, int flag) { @@ -195,11 +201,14 @@ expandarg(union node *arg, struct arglis /* - * Perform variable and command substitution. If EXP_FULL is set, output CTLESC - * characters to allow for further processing. Otherwise treat - * $@ like $* since no splitting will be performed. + * Perform parameter expansion, command substitution and arithmetic + * expansion, and tilde expansion if requested via EXP_TILDE/EXP_VARTILDE. + * Processing ends at a CTLENDVAR character as well as '\0'. + * This is used to expand word in ${var+word} etc. + * If EXP_FULL, EXP_CASE or EXP_REDIR are set, keep and/or generate CTLESC + * characters to allow for further processing. + * If EXP_FULL is set, also preserve CTLQUOTEMARK characters. */ - STATIC void argstr(char *p, int flag) { @@ -212,7 +221,7 @@ argstr(char *p, int flag) for (;;) { switch (c = *p++) { case '\0': - case CTLENDVAR: /* ??? */ + case CTLENDVAR: goto breakloop; case CTLQUOTEMARK: /* "$@" syntax adherence hack */ @@ -262,6 +271,10 @@ argstr(char *p, int flag) breakloop:; } +/* + * Perform tilde expansion, placing the result in the stack string and + * returning the next position in the input string to process. + */ STATIC char * exptilde(char *p, int flag) { @@ -367,12 +380,11 @@ expari(int flag) int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); int quoted; - /* * This routine is slightly over-complicated for * efficiency. First we make sure there is * enough space for the result, which may be bigger - * than the expression if we add exponentiation. Next we + * than the expression. Next we * scan backwards looking for the start of arithmetic. If the * next previous character is a CTLESC character, then we * have to rescan starting from the beginning since CTLESC @@ -413,9 +425,8 @@ expari(int flag) /* - * Expand stuff in backwards quotes. + * Perform command substitution. */ - STATIC void expbackq(union node *cmd, int quoted, int flag) { @@ -974,6 +985,12 @@ recordregion(int start, int end, int inq * Break the argument string into pieces based upon IFS and add the * strings to the argument list. The regions of the string to be * searched for IFS characters have been stored by recordregion. + * CTLESC characters are preserved but have little effect in this pass + * other than escaping CTL* characters. In particular, they do not escape + * IFS characters: that should be done with the ifsregion mechanism. + * CTLQUOTEMARK characters are used to preserve empty quoted strings. + * This pass treats them as a regular character, making the string non-empty. + * Later, they are removed along with the other CTL* characters. */ STATIC void ifsbreakup(char *string, struct arglist *arglist) @@ -1075,15 +1092,14 @@ ifsbreakup(char *string, struct arglist } - -/* - * Expand shell metacharacters. At this point, the only control characters - * should be escapes. The results are stored in the list exparg. - */ - STATIC char expdir[PATH_MAX]; #define expdir_end (expdir + sizeof(expdir)) +/* + * Perform pathname generation and remove control characters. + * At this point, the only control characters should be CTLESC and CTLQUOTEMARK. + * The results are stored in the list exparg. + */ STATIC void expandmeta(struct strlist *str, int flag __unused) { @@ -1469,7 +1485,7 @@ breakloop: /* - * Remove any CTLESC characters from a string. + * Remove any CTLESC and CTLQUOTEMARK characters from a string. */ void Modified: user/imp/tbemd/bin/sh/miscbltin.c ============================================================================== --- user/imp/tbemd/bin/sh/miscbltin.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/bin/sh/miscbltin.c Mon Sep 13 00:38:46 2010 (r212509) @@ -174,6 +174,7 @@ readcmd(int argc __unused, char **argv _ continue; if (backslash) { backslash = 0; + startword = 0; if (c != '\n') STPUTC(c, p); continue; Modified: user/imp/tbemd/bin/sh/mksyntax.c ============================================================================== --- user/imp/tbemd/bin/sh/mksyntax.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/bin/sh/mksyntax.c Mon Sep 13 00:38:46 2010 (r212509) @@ -338,12 +338,12 @@ print(const char *name) */ static const char *macro[] = { - "#define is_digit(c)\t((is_type+SYNBASE)[c] & ISDIGIT)", + "#define is_digit(c)\t((is_type+SYNBASE)[(int)c] & ISDIGIT)", "#define is_eof(c)\t((c) == PEOF)", - "#define is_alpha(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && isalpha((unsigned char) (c)))", - "#define is_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && ((c) == '_' || isalpha((unsigned char) (c))))", - "#define is_in_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && ((c) == '_' || isalnum((unsigned char) (c))))", - "#define is_special(c)\t((is_type+SYNBASE)[c] & (ISSPECL|ISDIGIT))", + "#define is_alpha(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))", + "#define is_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER))", + "#define is_in_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))", + "#define is_special(c)\t((is_type+SYNBASE)[(int)c] & (ISSPECL|ISDIGIT))", NULL }; Modified: user/imp/tbemd/bin/sh/parser.c ============================================================================== --- user/imp/tbemd/bin/sh/parser.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/bin/sh/parser.c Mon Sep 13 00:38:46 2010 (r212509) @@ -118,8 +118,8 @@ STATIC int readtoken(void); STATIC int xxreadtoken(void); STATIC int readtoken1(int, char const *, char *, int); STATIC int noexpand(char *); -STATIC void synexpect(int); -STATIC void synerror(const char *); +STATIC void synexpect(int) __dead2; +STATIC void synerror(const char *) __dead2; STATIC void setprompt(int); Modified: user/imp/tbemd/bin/sh/sh.1 ============================================================================== --- user/imp/tbemd/bin/sh/sh.1 Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/bin/sh/sh.1 Mon Sep 13 00:38:46 2010 (r212509) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd August 22, 2010 +.Dd September 10, 2010 .Dt SH 1 .Os .Sh NAME @@ -2455,8 +2455,6 @@ will return the argument. .Xr echo 1 , .Xr ed 1 , .Xr emacs 1 , -.Xr expr 1 , -.Xr getopt 1 , .Xr pwd 1 , .Xr test 1 , .Xr vi 1 , Modified: user/imp/tbemd/bin/sh/var.c ============================================================================== --- user/imp/tbemd/bin/sh/var.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/bin/sh/var.c Mon Sep 13 00:38:46 2010 (r212509) @@ -431,11 +431,15 @@ bltinlookup(const char *name, int doall) { struct strlist *sp; struct var *v; + char *result; + result = NULL; for (sp = cmdenviron ; sp ; sp = sp->next) { if (varequal(sp->text, name)) - return strchr(sp->text, '=') + 1; + result = strchr(sp->text, '=') + 1; } + if (result != NULL) + return result; for (v = *hashvar(name) ; v ; v = v->next) { if (varequal(v->text, name)) { if ((v->flags & VUNSET) Modified: user/imp/tbemd/bin/test/test.1 ============================================================================== --- user/imp/tbemd/bin/test/test.1 Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/bin/test/test.1 Mon Sep 13 00:38:46 2010 (r212509) @@ -32,7 +32,7 @@ .\" @(#)test.1 8.1 (Berkeley) 5/31/93 .\" $FreeBSD$ .\" -.Dd July 31, 2006 +.Dd September 10, 2010 .Dt TEST 1 .Os .Sh NAME @@ -282,7 +282,7 @@ True if either or .Ar expression2 are true. -.It Cm \&( Ns Ar expression Ns Cm \&) +.It Cm \&( Ar expression Cm \&) True if expression is true. .El .Pp @@ -302,7 +302,7 @@ manual page. The .Nm grammar is inherently ambiguous. -In order to ensure a degree of consistency, +In order to assure a degree of consistency, the cases described in the .St -p1003.2 , section D11.2/4.62.4, standard @@ -310,6 +310,14 @@ are evaluated consistently according to standards document. All other cases are subject to the ambiguity in the command semantics. +.Pp +In particular, only expressions containing +.Fl a , +.Fl o , +.Cm \&( +or +.Cm \&) +can be ambiguous. .Sh EXIT STATUS The .Nm @@ -338,12 +346,11 @@ specification. Both sides are always evaluated in .Fl a and -.Fl o , -unlike in the logical operators of -.Xr sh 1 . +.Fl o . For instance, the writable status of .Pa file will be tested by the following command even though the former expression indicated false, which results in a gratuitous access to the file system: -.Pp .Dl "[ -z abc -a -w file ]" +To avoid this, write +.Dl "[ -z abc ] && [ -w file ]" Modified: user/imp/tbemd/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- user/imp/tbemd/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Sep 13 00:38:46 2010 (r212509) @@ -1733,9 +1733,10 @@ zfs_do_userspace(int argc, char **argv) */ (void) execv(pypath, argv-1); - (void) printf("internal error: %s not found\n" + (void) fprintf(stderr, "internal error: %s not found\n" "falling back on built-in implementation, " "some features will not work\n", pypath); + (void) fprintf(stderr, " install sysutils/py-zfs port to correct this\n"); if ((zhp = zfs_open(g_zfs, argv[argc-1], ZFS_TYPE_DATASET)) == NULL) return (1); @@ -3797,7 +3798,8 @@ static int zfs_do_python(int argc, char **argv) { (void) execv(pypath, argv-1); - (void) printf("internal error: %s not found\n", pypath); + (void) fprintf(stderr, "internal error: %s not found\n", pypath); + (void) fprintf(stderr, " install sysutils/py-zfs port to correct this\n"); return (-1); } Modified: user/imp/tbemd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- user/imp/tbemd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Mon Sep 13 00:38:46 2010 (r212509) @@ -3333,12 +3333,38 @@ typedef struct upgrade_cbdata { int cb_all; int cb_first; int cb_newer; + char cb_poolname[ZPOOL_MAXNAMELEN]; int cb_argc; uint64_t cb_version; char **cb_argv; } upgrade_cbdata_t; static int +is_root_pool(zpool_handle_t *zhp) +{ + static struct statfs sfs; + static char *poolname = NULL; + static boolean_t stated = B_FALSE; + char *slash; + + if (!stated) { + stated = B_TRUE; + if (statfs("/", &sfs) == -1) { + (void) fprintf(stderr, + "Unable to stat root file system: %s.\n", + strerror(errno)); + return (0); + } + if (strcmp(sfs.f_fstypename, "zfs") != 0) + return (0); + poolname = sfs.f_mntfromname; + if ((slash = strchr(poolname, '/')) != NULL) + *slash = '\0'; + } + return (poolname != NULL && strcmp(poolname, zpool_get_name(zhp)) == 0); +} + +static int upgrade_cb(zpool_handle_t *zhp, void *arg) { upgrade_cbdata_t *cbp = arg; @@ -3371,6 +3397,12 @@ upgrade_cb(zpool_handle_t *zhp, void *ar if (!ret) { (void) printf(gettext("Successfully upgraded " "'%s'\n\n"), zpool_get_name(zhp)); + if (cbp->cb_poolname[0] == '\0' && + is_root_pool(zhp)) { + (void) strlcpy(cbp->cb_poolname, + zpool_get_name(zhp), + sizeof(cbp->cb_poolname)); + } } } } else if (cbp->cb_newer && version > SPA_VERSION) { @@ -3428,6 +3460,10 @@ upgrade_one(zpool_handle_t *zhp, void *d "from version %llu to version %llu\n\n"), zpool_get_name(zhp), (u_longlong_t)cur_version, (u_longlong_t)cbp->cb_version); + if (cbp->cb_poolname[0] == '\0' && is_root_pool(zhp)) { + (void) strlcpy(cbp->cb_poolname, zpool_get_name(zhp), + sizeof(cbp->cb_poolname)); + } } return (ret != 0); @@ -3569,6 +3605,16 @@ zpool_do_upgrade(int argc, char **argv) upgrade_one, &cb); } + if (cb.cb_poolname[0] != '\0') { + (void) printf( + "If you boot from pool '%s', don't forget to update boot code.\n" + "Assuming you use GPT partitioning and da0 is your boot disk\n" + "the following command will do it:\n" + "\n" + "\tgpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 da0\n\n", + cb.cb_poolname); + } + return (ret); } Modified: user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Mon Sep 13 00:38:46 2010 (r212509) @@ -64,7 +64,7 @@ static int gen; /* DOF helper generati #if defined(sun) extern dof_hdr_t __SUNW_dof; /* DOF defined in the .SUNW_dof section */ #endif -static boolean_t dof_init_debug = B_TRUE; /* From DTRACE_DOF_INIT_DEBUG */ +static boolean_t dof_init_debug = B_FALSE; /* From DTRACE_DOF_INIT_DEBUG */ static void dprintf(int debug, const char *fmt, ...) Modified: user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Mon Sep 13 00:38:46 2010 (r212509) @@ -1616,6 +1616,18 @@ dtrace_program_link(dtrace_hdl_t *dtp, d int eprobes = 0, ret = 0; #if !defined(sun) + if (access(file, R_OK) == 0) { + fprintf(stderr, "dtrace: target object (%s) already exists. " + "Please remove the target\ndtrace: object and rebuild all " + "the source objects if you wish to run the DTrace\n" + "dtrace: linking process again\n", file); + /* + * Several build infrastructures run DTrace twice (e.g. + * postgres) and we don't want the build to fail. Return + * 0 here since this isn't really a fatal error. + */ + return (0); + } /* XXX Should get a temp file name here. */ snprintf(tfile, sizeof(tfile), "%s.tmp", file); #endif Modified: user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Mon Sep 13 00:38:46 2010 (r212509) @@ -1103,7 +1103,7 @@ alloc: #if defined(sun) dtp->dt_prcmode = DT_PROC_STOP_PREINIT; #else - dtp->dt_prcmode = DT_PROC_STOP_POSTINIT; + dtp->dt_prcmode = DT_PROC_STOP_MAIN; #endif dtp->dt_linkmode = DT_LINK_KERNEL; dtp->dt_linktype = DT_LTYP_ELF; Modified: user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c ============================================================================== --- user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Mon Sep 13 00:38:46 2010 (r212509) @@ -641,7 +641,6 @@ dt_pid_create_usdt_probes(dtrace_probede assert(DT_MUTEX_HELD(&dpr->dpr_lock)); #if defined(sun) (void) Pupdate_maps(P); -#endif if (Pobject_iter(P, dt_pid_usdt_mapping, P) != 0) { ret = -1; (void) dt_pid_error(dtp, pcb, dpr, NULL, D_PROC_USDT, @@ -652,6 +651,9 @@ dt_pid_create_usdt_probes(dtrace_probede (int)proc_getpid(P), strerror(errno)); #endif } +#else + ret = 0; +#endif /* * Put the module name in its canonical form. Modified: user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c ============================================================================== --- user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c Mon Sep 13 00:38:46 2010 (r212509) @@ -557,6 +557,10 @@ dt_header_provider(dtrace_hdl_t *dtp, dt info.dthi_pfname = alloca(strlen(pvp->pv_desc.dtvd_name) + 1 + i); dt_header_fmt_func(info.dthi_pfname, pvp->pv_desc.dtvd_name); +#ifdef __FreeBSD__ + if (fprintf(out, "#include <sys/sdt.h>\n\n") < 0) + return (dt_set_errno(dtp, errno)); +#endif if (fprintf(out, "#if _DTRACE_VERSION\n\n") < 0) return (dt_set_errno(dtp, errno)); Modified: user/imp/tbemd/cddl/contrib/opensolaris/lib/pyzfs/common/ioctl.c ============================================================================== --- user/imp/tbemd/cddl/contrib/opensolaris/lib/pyzfs/common/ioctl.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/cddl/contrib/opensolaris/lib/pyzfs/common/ioctl.c Mon Sep 13 00:38:46 2010 (r212509) @@ -33,6 +33,7 @@ #include <zone.h> #include <libintl.h> #include <libzfs.h> +#include <libzfs_impl.h> #include "zfs_prop.h" static PyObject *ZFSError; Modified: user/imp/tbemd/etc/mtree/BSD.var.dist ============================================================================== --- user/imp/tbemd/etc/mtree/BSD.var.dist Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/etc/mtree/BSD.var.dist Mon Sep 13 00:38:46 2010 (r212509) @@ -64,6 +64,8 @@ .. ppp gname=network mode=0770 .. + wpa_supplicant + .. .. rwho gname=daemon mode=0775 .. Modified: user/imp/tbemd/etc/rc.d/cleartmp ============================================================================== --- user/imp/tbemd/etc/rc.d/cleartmp Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/etc/rc.d/cleartmp Mon Sep 13 00:38:46 2010 (r212509) @@ -36,7 +36,10 @@ cleartmp_start() # it can prevent foot-shooting in future. # + /tmp/lost+found is preserved, but its contents are removed. # + lost+found and quota.* in subdirectories are removed. + # + .sujournal and .snap are preserved. find -x ${tmp}/. ! -name . \ + ! \( -name .sujournal -type f -user root \) \ + ! \( -name .snap -type d -user root \) \ ! \( -name lost+found -type d -user root \) \ ! \( \( -name quota.user -or -name quota.group \) \ -type f -user root \) \ Modified: user/imp/tbemd/games/fortune/datfiles/fortunes ============================================================================== --- user/imp/tbemd/games/fortune/datfiles/fortunes Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/games/fortune/datfiles/fortunes Mon Sep 13 00:38:46 2010 (r212509) @@ -45221,7 +45221,7 @@ of their own homes. 1: P-Q4, Kt-KB3 2: Kt-Q2, P-K4 3: PxP, Kt-Kt5 - 4: P-K6, Kt-K6/ + 4: P-KR3, Kt-K6/ White then resigns on realizing that a fifth move would involve either a Q-KR5 check or the loss of his queen. -- Stephen Pile, "The Book of Heroic Failures" Modified: user/imp/tbemd/gnu/lib/libobjc/Makefile ============================================================================== --- user/imp/tbemd/gnu/lib/libobjc/Makefile Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/gnu/lib/libobjc/Makefile Mon Sep 13 00:38:46 2010 (r212509) @@ -16,7 +16,9 @@ SRCS= archive.c class.c encoding.c gc.c selector.c sendmsg.c thr.c thr-objc.c exception.c # XXX: clang cannot compile libobjc yet -CC:=${CC:C/^cc|^clang/gcc/} +.if ${CC:T:Mclang} == "clang" +CC=gcc +.endif INCS= encoding.h hash.h objc-api.h objc-decls.h objc-list.h objc.h runtime.h \ sarray.h thr.h typedstream.h NXConstStr.h Object.h Protocol.h Modified: user/imp/tbemd/gnu/lib/libstdc++/Makefile ============================================================================== --- user/imp/tbemd/gnu/lib/libstdc++/Makefile Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/gnu/lib/libstdc++/Makefile Mon Sep 13 00:38:46 2010 (r212509) @@ -83,7 +83,7 @@ ATOMICITY_H= ${SRCDIR}/config/cpu/${MARC ATOMICITY_H= ${SRCDIR}/config/cpu/generic/atomicity_mutex/atomicity.h .endif -.if ${MACHINE_CPUARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" .if exists(${SRCDIR}/config/cpu/generic/atomicity_builtins/atomicity.h) ATOMICITY_H= ${SRCDIR}/config/cpu/generic/atomicity_builtins/atomicity.h .endif Modified: user/imp/tbemd/gnu/lib/libstdc++/config.h ============================================================================== --- user/imp/tbemd/gnu/lib/libstdc++/config.h Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/gnu/lib/libstdc++/config.h Mon Sep 13 00:38:46 2010 (r212509) @@ -671,7 +671,7 @@ /* #undef VERSION */ /* Define if builtin atomic operations are supported on this host. */ -#if defined(__amd64__) +#if defined(__amd64__) || defined(__i386__) #define _GLIBCXX_ATOMIC_BUILTINS 1 #endif Modified: user/imp/tbemd/include/limits.h ============================================================================== --- user/imp/tbemd/include/limits.h Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/include/limits.h Mon Sep 13 00:38:46 2010 (r212509) @@ -70,7 +70,7 @@ #endif #if __POSIX_VISIBLE >= 199309 -#define _POSIX_AIO_LISTIO_MAX 16 +#define _POSIX_AIO_LISTIO_MAX 2 #define _POSIX_AIO_MAX 1 #define _POSIX_DELAYTIMER_MAX 32 #define _POSIX_MQ_OPEN_MAX 8 Modified: user/imp/tbemd/lib/libc/db/man/dbopen.3 ============================================================================== --- user/imp/tbemd/lib/libc/db/man/dbopen.3 Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libc/db/man/dbopen.3 Mon Sep 13 00:38:46 2010 (r212509) @@ -28,7 +28,7 @@ .\" @(#)dbopen.3 8.5 (Berkeley) 1/2/94 .\" $FreeBSD$ .\" -.Dd January 2, 1994 +.Dd September 10, 2010 .Dt DBOPEN 3 .Os .Sh NAME @@ -78,8 +78,8 @@ arguments are as specified to the .Xr open 2 routine, however, only the -.Dv O_CREAT , O_EXCL , O_EXLOCK , O_NONBLOCK , -.Dv O_RDONLY , O_RDWR , O_SHLOCK +.Dv O_CREAT , O_EXCL , O_EXLOCK , O_NOFOLLOW , O_NONBLOCK , +.Dv O_RDONLY , O_RDWR , O_SHLOCK , O_SYNC and .Dv O_TRUNC flags are meaningful. Modified: user/imp/tbemd/lib/libc/net/sctp_send.3 ============================================================================== --- user/imp/tbemd/lib/libc/net/sctp_send.3 Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libc/net/sctp_send.3 Mon Sep 13 00:38:46 2010 (r212509) @@ -191,7 +191,7 @@ If that many milliseconds elapse and the peer has not acknowledged the data, the data will be skipped and no longer transmitted. Note that this policy does -not even ensure that the data will ever be sent. +not even assure that the data will ever be sent. In times of a congestion with large amounts of data being queued, the .Fa sinfo->sinfo_timetolive @@ -218,7 +218,7 @@ policy transforms the .Fa sinfo->sinfo_timetolive into a number of retransmissions to allow. This policy -always ensures that at a minimum one send attempt is +always assures that at a minimum one send attempt is made of the data. After which no more than .Fa sinfo->sinfo_timetolive Modified: user/imp/tbemd/lib/libc/net/sctp_sendmsg.3 ============================================================================== --- user/imp/tbemd/lib/libc/net/sctp_sendmsg.3 Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libc/net/sctp_sendmsg.3 Mon Sep 13 00:38:46 2010 (r212509) @@ -203,7 +203,7 @@ If that many milliseconds elapse and the peer has not acknowledged the data, the data will be skipped and no longer transmitted. Note that this policy does -not even ensure that the data will ever be sent. +not even assure that the data will ever be sent. In times of a congestion with large amounts of data being queued, the .Fa timetolive @@ -230,7 +230,7 @@ policy transforms the .Fa timetolive into a number of retransmissions to allow. This policy -always ensures that at a minimum one send attempt is +always assures that at a minimum one send attempt is made of the data. After which no more than .Fa timetolive Modified: user/imp/tbemd/lib/libc/posix1e/acl_strip.c ============================================================================== --- user/imp/tbemd/lib/libc/posix1e/acl_strip.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libc/posix1e/acl_strip.c Mon Sep 13 00:38:46 2010 (r212509) @@ -176,6 +176,15 @@ acl_is_trivial_np(const acl_t aclp, int case ACL_BRAND_NFS4: /* + * If the ACL has more than canonical six entries, + * it's non trivial by definition. + */ + if (aclp->ats_acl.acl_cnt > 6) { + *trivialp = 0; + return (0); + } + + /* * Calculate trivial ACL - using acl_strip_np - and compare * with the original. */ Modified: user/imp/tbemd/lib/libc/stdio/printf.3 ============================================================================== --- user/imp/tbemd/lib/libc/stdio/printf.3 Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libc/stdio/printf.3 Mon Sep 13 00:38:46 2010 (r212509) @@ -849,7 +849,7 @@ and .Fn vsprintf assume an infinitely long string, callers must be careful not to overflow the actual space; -this is often hard to ensure. +this is often hard to assure. For safety, programmers should use the .Fn snprintf interface instead. Modified: user/imp/tbemd/lib/libc/stdlib/Makefile.inc ============================================================================== --- user/imp/tbemd/lib/libc/stdlib/Makefile.inc Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libc/stdlib/Makefile.inc Mon Sep 13 00:38:46 2010 (r212509) @@ -9,7 +9,7 @@ MISRCS+=_Exit.c a64l.c abort.c abs.c ate getsubopt.c hcreate.c heapsort.c imaxabs.c imaxdiv.c \ insque.c l64a.c labs.c ldiv.c llabs.c lldiv.c lsearch.c malloc.c \ merge.c ptsname.c qsort.c qsort_r.c radixsort.c rand.c random.c \ - reallocf.c realpath.c remque.c strfmon.c strtoimax.c \ + reallocf.c realpath.c remque.c sigwait.c strfmon.c strtoimax.c \ strtol.c strtoll.c strtoq.c strtoul.c strtonum.c strtoull.c \ strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c Modified: user/imp/tbemd/lib/libc/stdlib/malloc.3 ============================================================================== --- user/imp/tbemd/lib/libc/stdlib/malloc.3 Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libc/stdlib/malloc.3 Mon Sep 13 00:38:46 2010 (r212509) @@ -266,7 +266,7 @@ options are enabled, the allocator prefe but allocation only fails if memory cannot be acquired via either method. If neither option is enabled, then the .Dq M -option is implicitly enabled in order to ensure that there is a method for +option is implicitly enabled in order to assure that there is a method for acquiring memory. .It N Double/halve the number of arenas. @@ -437,7 +437,7 @@ rounded up to the nearest multiple of th .Pp Allocations are packed tightly together, which can be an issue for multi-threaded applications. -If you need to ensure that allocations do not suffer from cacheline sharing, +If you need to assure that allocations do not suffer from cacheline sharing, round your allocation requests up to the nearest multiple of the cacheline size. .Sh DEBUGGING MALLOC PROBLEMS Modified: user/imp/tbemd/lib/libc/sys/Makefile.inc ============================================================================== --- user/imp/tbemd/lib/libc/sys/Makefile.inc Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libc/sys/Makefile.inc Mon Sep 13 00:38:46 2010 (r212509) @@ -21,6 +21,9 @@ SRCS+= stack_protector.c stack_protector SRCS+= fcntl.c ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c PSEUDO+= _fcntl.o .endif +SRCS+= sigwait.c +NOASM+= sigwait.o +PSEUDO+= _sigwait.o # Add machine dependent asm sources: SRCS+=${MDASM} Modified: user/imp/tbemd/lib/libc/sys/Symbol.map ============================================================================== --- user/imp/tbemd/lib/libc/sys/Symbol.map Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libc/sys/Symbol.map Mon Sep 13 00:38:46 2010 (r212509) @@ -919,6 +919,7 @@ FBSDprivate_1.0 { _sigtimedwait; __sys_sigtimedwait; _sigwait; + __sigwait; __sys_sigwait; _sigwaitinfo; __sys_sigwaitinfo; Modified: user/imp/tbemd/lib/libc/sys/connect.2 ============================================================================== --- user/imp/tbemd/lib/libc/sys/connect.2 Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libc/sys/connect.2 Mon Sep 13 00:38:46 2010 (r212509) @@ -28,7 +28,7 @@ .\" @(#)connect.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd August 16, 2006 +.Dd September 5, 2010 .Dt CONNECT 2 .Os .Sh NAME @@ -95,6 +95,8 @@ The socket is already connected. Connection establishment timed out without establishing a connection. .It Bq Er ECONNREFUSED The attempt to connect was forcefully rejected. +.It Bq Er ECONNRESET +The connection was reset by the remote host. .It Bq Er ENETUNREACH The network is not reachable from this host. .It Bq Er EHOSTUNREACH Modified: user/imp/tbemd/lib/libc/sys/cpuset_getaffinity.2 ============================================================================== --- user/imp/tbemd/lib/libc/sys/cpuset_getaffinity.2 Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libc/sys/cpuset_getaffinity.2 Mon Sep 13 00:38:46 2010 (r212509) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 8, 2010 +.Dd September 10, 2010 .Dt CPUSET 2 .Os .Sh NAME @@ -121,6 +121,12 @@ The or .Fa which argument was not a valid value. +.It Bq Er EINVAL +The +.Fa mask +argument specified when calling +.Fn cpuset_setaffinity +was not a valid value. .It Bq Er EDEADLK The .Fn cpuset_setaffinity Modified: user/imp/tbemd/lib/libc/sys/sigaltstack.2 ============================================================================== --- user/imp/tbemd/lib/libc/sys/sigaltstack.2 Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libc/sys/sigaltstack.2 Mon Sep 13 00:38:46 2010 (r212509) @@ -104,7 +104,7 @@ if ((sigstk.ss_sp = malloc(SIGSTKSZ)) == /* error return */ sigstk.ss_size = SIGSTKSZ; sigstk.ss_flags = 0; -if (sigaltstack(&sigstk,0) < 0) +if (sigaltstack(&sigstk, NULL) < 0) perror("sigaltstack"); .Ed An alternative approach is provided for programs with signal handlers Copied: user/imp/tbemd/lib/libc/sys/sigwait.c (from r212508, head/lib/libc/sys/sigwait.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/imp/tbemd/lib/libc/sys/sigwait.c Mon Sep 13 00:38:46 2010 (r212509, copy of r212508, head/lib/libc/sys/sigwait.c) @@ -0,0 +1,46 @@ +/*- + * Copyright (c) 2010 davidxu@freebsd.org + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <errno.h> +#include <signal.h> + +int __sys_sigwait(const sigset_t * restrict, int * restrict); + +__weak_reference(__sigwait, sigwait); + +int +__sigwait(const sigset_t * restrict set, int * restrict sig) +{ + int ret; + + /* POSIX does not allow EINTR to be returned */ + do { + ret = __sys_sigwait(set, sig); + } while (ret == EINTR); + return (ret); +} Modified: user/imp/tbemd/lib/libedit/common.c ============================================================================== --- user/imp/tbemd/lib/libedit/common.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libedit/common.c Mon Sep 13 00:38:46 2010 (r212509) @@ -163,15 +163,12 @@ ed_delete_next_char(EditLine *el, int c) return (CC_ERROR); #endif } - } else { - if (el->el_line.cursor != el->el_line.buffer) - el->el_line.cursor--; - else - return (CC_ERROR); - } + } else + return (CC_ERROR); } c_delafter(el, el->el_state.argument); /* delete after dot */ - if (el->el_line.cursor >= el->el_line.lastchar && + if (el->el_map.type == MAP_VI && + el->el_line.cursor >= el->el_line.lastchar && el->el_line.cursor > el->el_line.buffer) /* bounds check */ el->el_line.cursor = el->el_line.lastchar - 1; Modified: user/imp/tbemd/lib/libedit/term.c ============================================================================== --- user/imp/tbemd/lib/libedit/term.c Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libedit/term.c Mon Sep 13 00:38:46 2010 (r212509) @@ -223,7 +223,9 @@ private const struct termcapstr { { "kh", "send cursor home" }, #define T_at7 37 { "@7", "send cursor end" }, -#define T_str 38 +#define T_kD 38 + { "kD", "send cursor delete" }, +#define T_str 39 { NULL, NULL } }; @@ -1062,6 +1064,11 @@ term_init_arrow(EditLine *el) arrow[A_K_EN].key = T_at7; arrow[A_K_EN].fun.cmd = ED_MOVE_TO_END; arrow[A_K_EN].type = XK_CMD; + + arrow[A_K_DE].name = "delete"; + arrow[A_K_DE].key = T_kD; + arrow[A_K_DE].fun.cmd = ED_DELETE_NEXT_CHAR; + arrow[A_K_DE].type = XK_CMD; } Modified: user/imp/tbemd/lib/libedit/term.h ============================================================================== --- user/imp/tbemd/lib/libedit/term.h Sun Sep 12 22:00:31 2010 (r212508) +++ user/imp/tbemd/lib/libedit/term.h Mon Sep 13 00:38:46 2010 (r212509) @@ -79,7 +79,8 @@ typedef struct { #define A_K_RT 3 #define A_K_HO 4 #define A_K_EN 5 -#define A_K_NKEYS 6 +#define A_K_DE 6 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009130038.o8D0clWN040057>