Date: Wed, 18 Feb 2015 19:31:01 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278966 - in projects/release-install-debug: . bin/ln bin/pkill/tests bin/sh bin/sh/tests/expansion cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io cddl/contrib/opensolaris/lib/l... Message-ID: <201502181931.t1IJV1k1057777@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Feb 18 19:31:00 2015 New Revision: 278966 URL: https://svnweb.freebsd.org/changeset/base/278966 Log: MFH: r278710-r278965 Sponsored by: The FreeBSD Foundation Added: projects/release-install-debug/bin/sh/tests/expansion/ifs5.0 - copied unchanged from r278964, head/bin/sh/tests/expansion/ifs5.0 projects/release-install-debug/bin/sh/tests/expansion/pathname5.0 - copied unchanged from r278964, head/bin/sh/tests/expansion/pathname5.0 projects/release-install-debug/lib/libc/sparc64/sys/sigaction1.S - copied unchanged from r278964, head/lib/libc/sparc64/sys/sigaction1.S projects/release-install-debug/share/man/man4/udl.4 - copied unchanged from r278964, head/share/man/man4/udl.4 projects/release-install-debug/sys/arm/arm/unwind.c - copied unchanged from r278964, head/sys/arm/arm/unwind.c projects/release-install-debug/sys/conf/config.mk - copied unchanged from r278964, head/sys/conf/config.mk projects/release-install-debug/sys/dev/usb/video/ - copied from r278964, head/sys/dev/usb/video/ projects/release-install-debug/sys/dev/videomode/ - copied from r278964, head/sys/dev/videomode/ projects/release-install-debug/sys/modules/usb/udl/ - copied from r278964, head/sys/modules/usb/udl/ projects/release-install-debug/sys/modules/videomode/ - copied from r278964, head/sys/modules/videomode/ projects/release-install-debug/sys/ofed/drivers/infiniband/core/peer_mem.c - copied unchanged from r278964, head/sys/ofed/drivers/infiniband/core/peer_mem.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c - copied unchanged from r278964, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h - copied unchanged from r278964, head/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_exp.h projects/release-install-debug/sys/ofed/include/linux/printk.h - copied unchanged from r278964, head/sys/ofed/include/linux/printk.h projects/release-install-debug/sys/ofed/include/rdma/ib_peer_mem.h - copied unchanged from r278964, head/sys/ofed/include/rdma/ib_peer_mem.h projects/release-install-debug/sys/ofed/include/rdma/ib_user_verbs_exp.h - copied unchanged from r278964, head/sys/ofed/include/rdma/ib_user_verbs_exp.h projects/release-install-debug/sys/ofed/include/rdma/ib_verbs_exp.h - copied unchanged from r278964, head/sys/ofed/include/rdma/ib_verbs_exp.h projects/release-install-debug/sys/ofed/include/rdma/peer_mem.h - copied unchanged from r278964, head/sys/ofed/include/rdma/peer_mem.h Deleted: projects/release-install-debug/lib/libc/sparc64/sys/sigaction.S projects/release-install-debug/lib/libiconv/ projects/release-install-debug/sys/dev/ic/hd64570.h projects/release-install-debug/sys/ofed/drivers/infiniband/core/Makefile projects/release-install-debug/sys/ofed/drivers/infiniband/core/local_sa.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/notice.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/ipoib/Makefile Modified: projects/release-install-debug/Makefile.inc1 projects/release-install-debug/ObsoleteFiles.inc projects/release-install-debug/UPDATING projects/release-install-debug/bin/ln/symlink.7 projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh projects/release-install-debug/bin/pkill/tests/pkill-j_test.sh projects/release-install-debug/bin/sh/cd.c projects/release-install-debug/bin/sh/eval.c projects/release-install-debug/bin/sh/expand.c projects/release-install-debug/bin/sh/mail.c projects/release-install-debug/bin/sh/memalloc.c projects/release-install-debug/bin/sh/memalloc.h projects/release-install-debug/bin/sh/miscbltin.c projects/release-install-debug/bin/sh/nodetypes projects/release-install-debug/bin/sh/parser.c projects/release-install-debug/bin/sh/tests/expansion/Makefile projects/release-install-debug/bin/sh/var.c projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c projects/release-install-debug/contrib/elftoolchain/addr2line/addr2line.c projects/release-install-debug/contrib/elftoolchain/common/_elftc.h projects/release-install-debug/contrib/elftoolchain/common/elfdefinitions.h projects/release-install-debug/contrib/elftoolchain/elfcopy/main.c projects/release-install-debug/contrib/elftoolchain/elfcopy/sections.c projects/release-install-debug/contrib/elftoolchain/libdwarf/_libdwarf.h projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_attrval.c projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_get_section_max_offsets.3 projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_reloc.c projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.c projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.h projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_reloc.c projects/release-install-debug/contrib/elftoolchain/libelf/_libelf_config.h projects/release-install-debug/contrib/elftoolchain/libelf/elf.3 projects/release-install-debug/contrib/elftoolchain/libelf/elf_scn.c projects/release-install-debug/contrib/elftoolchain/libelf/libelf_ar_util.c projects/release-install-debug/contrib/elftoolchain/libelf/libelf_convert.m4 projects/release-install-debug/contrib/elftoolchain/nm/nm.1 projects/release-install-debug/contrib/elftoolchain/nm/nm.c projects/release-install-debug/contrib/elftoolchain/readelf/readelf.c projects/release-install-debug/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp projects/release-install-debug/etc/network.subr projects/release-install-debug/lib/libc/gen/_spinlock_stub.c projects/release-install-debug/lib/libc/gen/dlopen.3 projects/release-install-debug/lib/libc/gen/fstab.c projects/release-install-debug/lib/libc/gen/getgrent.c projects/release-install-debug/lib/libc/gen/getpwent.c projects/release-install-debug/lib/libc/gen/ulimit.c projects/release-install-debug/lib/libc/include/libc_private.h projects/release-install-debug/lib/libc/regex/regcomp.c projects/release-install-debug/lib/libc/rpc/clnt_dg.c projects/release-install-debug/lib/libc/rpc/rpc_soc.c projects/release-install-debug/lib/libc/sparc64/sys/Makefile.inc projects/release-install-debug/lib/libc/stdio/xprintf_float.c projects/release-install-debug/lib/libc/sys/Makefile.inc projects/release-install-debug/lib/libc/sys/interposing_table.c projects/release-install-debug/lib/libcompat/4.3/rexec.c projects/release-install-debug/lib/libelftc/elftc_version.c projects/release-install-debug/lib/liblzma/config.h projects/release-install-debug/lib/libthr/thread/thr_private.h projects/release-install-debug/lib/libthr/thread/thr_spinlock.c projects/release-install-debug/lib/libthr/thread/thr_syscalls.c projects/release-install-debug/release/Makefile projects/release-install-debug/release/Makefile.vm projects/release-install-debug/sbin/camcontrol/camcontrol.c projects/release-install-debug/share/man/man4/Makefile projects/release-install-debug/share/man/man4/wlan.4 projects/release-install-debug/share/mk/bsd.dep.mk projects/release-install-debug/share/mk/bsd.libnames.mk projects/release-install-debug/share/mk/bsd.own.mk projects/release-install-debug/sys/amd64/amd64/mp_machdep.c projects/release-install-debug/sys/arm/arm/cpuinfo.c projects/release-install-debug/sys/arm/arm/db_trace.c projects/release-install-debug/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/release-install-debug/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h projects/release-install-debug/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/release-install-debug/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h projects/release-install-debug/sys/arm/include/stack.h projects/release-install-debug/sys/boot/fdt/dts/arm/bcm2835.dtsi projects/release-install-debug/sys/cam/cam_ccb.h projects/release-install-debug/sys/cam/scsi/scsi_da.c projects/release-install-debug/sys/cam/scsi/scsi_enc_ses.c projects/release-install-debug/sys/conf/files projects/release-install-debug/sys/conf/files.arm projects/release-install-debug/sys/conf/kern.mk projects/release-install-debug/sys/conf/kern.pre.mk projects/release-install-debug/sys/conf/kmod.mk projects/release-install-debug/sys/conf/options projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_gpio.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_keycache.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_osprey22.ini projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9340.ini projects/release-install-debug/sys/contrib/dev/ath/ath_hal/ar9300/ar9580.ini projects/release-install-debug/sys/contrib/rdma/krping/krping.c projects/release-install-debug/sys/dev/acpica/acpi_pcib.c projects/release-install-debug/sys/dev/ath/if_ath_pci.c projects/release-install-debug/sys/dev/atkbdc/atkbd.c projects/release-install-debug/sys/dev/atkbdc/atkbdc.c projects/release-install-debug/sys/dev/atkbdc/atkbdcreg.h projects/release-install-debug/sys/dev/atkbdc/psm.c projects/release-install-debug/sys/dev/cardbus/cardbus.c projects/release-install-debug/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/release-install-debug/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c projects/release-install-debug/sys/dev/cxgbe/iw_cxgbe/cq.c projects/release-install-debug/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/release-install-debug/sys/dev/cxgbe/iw_cxgbe/mem.c projects/release-install-debug/sys/dev/fb/fbd.c projects/release-install-debug/sys/dev/iicbus/lm75.c projects/release-install-debug/sys/dev/lmc/if_lmc.h projects/release-install-debug/sys/dev/mpr/mpr_sas.c projects/release-install-debug/sys/dev/mps/mps_sas.c projects/release-install-debug/sys/dev/netmap/netmap.c projects/release-install-debug/sys/dev/pccbb/pccbb.c projects/release-install-debug/sys/dev/pci/pci.c projects/release-install-debug/sys/dev/random/dummy_rng.c projects/release-install-debug/sys/dev/random/fortuna.c projects/release-install-debug/sys/dev/random/random_adaptors.c projects/release-install-debug/sys/dev/random/randomdev.c projects/release-install-debug/sys/dev/random/randomdev.h projects/release-install-debug/sys/dev/random/yarrow.c projects/release-install-debug/sys/dev/sfxge/common/efx_ev.c projects/release-install-debug/sys/dev/sfxge/common/efx_mac.c projects/release-install-debug/sys/dev/sfxge/common/efx_mcdi.c projects/release-install-debug/sys/dev/sfxge/common/efx_mcdi.h projects/release-install-debug/sys/dev/sfxge/common/efx_nic.c projects/release-install-debug/sys/dev/sfxge/common/efx_regs_mcdi.h projects/release-install-debug/sys/dev/sfxge/common/efx_rx.c projects/release-install-debug/sys/dev/sfxge/common/efx_tx.c projects/release-install-debug/sys/dev/sfxge/common/siena_mon.c projects/release-install-debug/sys/dev/sfxge/common/siena_nic.c projects/release-install-debug/sys/dev/sfxge/common/siena_nvram.c projects/release-install-debug/sys/dev/sfxge/common/siena_phy.c projects/release-install-debug/sys/dev/sfxge/common/siena_vpd.c projects/release-install-debug/sys/dev/sfxge/sfxge.h projects/release-install-debug/sys/dev/sfxge/sfxge_ev.c projects/release-install-debug/sys/dev/sfxge/sfxge_port.c projects/release-install-debug/sys/dev/sfxge/sfxge_rx.c projects/release-install-debug/sys/dev/sfxge/sfxge_tx.c projects/release-install-debug/sys/dev/sfxge/sfxge_tx.h projects/release-install-debug/sys/dev/spibus/spi.h projects/release-install-debug/sys/dev/spibus/spibus.c projects/release-install-debug/sys/dev/spibus/spibusvar.h projects/release-install-debug/sys/dev/usb/controller/musb_otg.c projects/release-install-debug/sys/dev/usb/controller/uhci.c projects/release-install-debug/sys/dev/usb/usbdevs projects/release-install-debug/sys/dev/vt/vt_core.c projects/release-install-debug/sys/dev/wpi/if_wpi.c projects/release-install-debug/sys/dev/wpi/if_wpireg.h projects/release-install-debug/sys/dev/xen/xenstore/xenstore_dev.c projects/release-install-debug/sys/fs/ext2fs/ext2_htree.c projects/release-install-debug/sys/fs/ext2fs/ext2_vfsops.c projects/release-install-debug/sys/i386/i386/mp_machdep.c projects/release-install-debug/sys/kern/imgact_elf.c projects/release-install-debug/sys/kern/kern_descrip.c projects/release-install-debug/sys/kern/kern_procctl.c projects/release-install-debug/sys/kern/subr_taskqueue.c projects/release-install-debug/sys/kern/sys_generic.c projects/release-install-debug/sys/kern/sysv_shm.c projects/release-install-debug/sys/kern/tty.c projects/release-install-debug/sys/kern/uipc_mbuf.c projects/release-install-debug/sys/kern/uipc_socket.c projects/release-install-debug/sys/kern/uipc_syscalls.c projects/release-install-debug/sys/kern/vfs_subr.c projects/release-install-debug/sys/kern/vfs_syscalls.c projects/release-install-debug/sys/mips/conf/AR71XX_BASE projects/release-install-debug/sys/modules/Makefile projects/release-install-debug/sys/modules/cxgbe/if_cxgbe/Makefile projects/release-install-debug/sys/modules/dpt/Makefile projects/release-install-debug/sys/modules/drm2/radeonkms/Makefile projects/release-install-debug/sys/modules/ed/Makefile projects/release-install-debug/sys/modules/ep/Makefile projects/release-install-debug/sys/modules/ibcore/Makefile projects/release-install-debug/sys/modules/if_gif/Makefile projects/release-install-debug/sys/modules/if_gre/Makefile projects/release-install-debug/sys/modules/ipoib/Makefile projects/release-install-debug/sys/modules/mlx4/Makefile projects/release-install-debug/sys/modules/mlx4ib/Makefile projects/release-install-debug/sys/modules/mlxen/Makefile projects/release-install-debug/sys/modules/mthca/Makefile projects/release-install-debug/sys/modules/si/Makefile projects/release-install-debug/sys/modules/vx/Makefile projects/release-install-debug/sys/net/if_bridge.c projects/release-install-debug/sys/net/pfvar.h projects/release-install-debug/sys/netinet6/frag6.c projects/release-install-debug/sys/netinet6/ip6_output.c projects/release-install-debug/sys/netinet6/ip6_var.h projects/release-install-debug/sys/netpfil/pf/pf.c projects/release-install-debug/sys/netpfil/pf/pf.h projects/release-install-debug/sys/netpfil/pf/pf_mtag.h projects/release-install-debug/sys/netpfil/pf/pf_norm.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/addr.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/cache.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/cm.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/cm_msgs.h projects/release-install-debug/sys/ofed/drivers/infiniband/core/cma.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/core_priv.h projects/release-install-debug/sys/ofed/drivers/infiniband/core/device.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/fmr_pool.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/iwcm.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/mad.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/mad_priv.h projects/release-install-debug/sys/ofed/drivers/infiniband/core/mad_rmpp.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/multicast.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/packer.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/sa.h projects/release-install-debug/sys/ofed/drivers/infiniband/core/sa_query.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/smi.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/sysfs.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/ucm.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/ucma.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/ud_header.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/umem.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/user_mad.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/uverbs.h projects/release-install-debug/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/uverbs_marshall.c projects/release-install-debug/sys/ofed/drivers/infiniband/core/verbs.c projects/release-install-debug/sys/ofed/drivers/infiniband/debug/memtrack.c projects/release-install-debug/sys/ofed/drivers/infiniband/debug/memtrack.h projects/release-install-debug/sys/ofed/drivers/infiniband/debug/mtrack.h projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/doorbell.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/release-install-debug/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/release-install-debug/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c projects/release-install-debug/sys/ofed/drivers/net/mlx4/Makefile projects/release-install-debug/sys/ofed/drivers/net/mlx4/en_rx.c projects/release-install-debug/sys/ofed/include/linux/device.h projects/release-install-debug/sys/ofed/include/linux/file.h projects/release-install-debug/sys/ofed/include/linux/linux_compat.c projects/release-install-debug/sys/ofed/include/net/ip.h projects/release-install-debug/sys/ofed/include/rdma/ib_addr.h projects/release-install-debug/sys/ofed/include/rdma/ib_cache.h projects/release-install-debug/sys/ofed/include/rdma/ib_cm.h projects/release-install-debug/sys/ofed/include/rdma/ib_mad.h projects/release-install-debug/sys/ofed/include/rdma/ib_pack.h projects/release-install-debug/sys/ofed/include/rdma/ib_sa.h projects/release-install-debug/sys/ofed/include/rdma/ib_umem.h projects/release-install-debug/sys/ofed/include/rdma/ib_user_verbs.h projects/release-install-debug/sys/ofed/include/rdma/ib_verbs.h projects/release-install-debug/sys/ofed/include/rdma/iw_cm.h projects/release-install-debug/sys/ofed/include/rdma/rdma_cm.h projects/release-install-debug/sys/ofed/include/rdma/rdma_user_cm.h projects/release-install-debug/sys/powerpc/powermac/atibl.c projects/release-install-debug/sys/powerpc/powermac/nvbl.c projects/release-install-debug/sys/powerpc/powerpc/db_trace.c projects/release-install-debug/sys/sparc64/include/asm.h projects/release-install-debug/sys/sys/fbio.h projects/release-install-debug/sys/sys/file.h projects/release-install-debug/sys/sys/filedesc.h projects/release-install-debug/sys/sys/mbuf.h projects/release-install-debug/sys/sys/param.h projects/release-install-debug/sys/sys/sockbuf.h projects/release-install-debug/sys/sys/taskqueue.h projects/release-install-debug/sys/vm/memguard.c projects/release-install-debug/sys/x86/acpica/acpi_wakeup.c projects/release-install-debug/sys/x86/acpica/madt.c projects/release-install-debug/sys/x86/include/vmware.h projects/release-install-debug/sys/x86/x86/local_apic.c projects/release-install-debug/sys/x86/xen/pvcpu_enum.c projects/release-install-debug/sys/x86/xen/xen_intr.c projects/release-install-debug/usr.bin/compress/compress.c projects/release-install-debug/usr.bin/du/du.c projects/release-install-debug/usr.bin/gcore/elfcore.c projects/release-install-debug/usr.bin/gzip/gzip.c projects/release-install-debug/usr.bin/kdump/kdump.c projects/release-install-debug/usr.bin/ministat/ministat.c projects/release-install-debug/usr.bin/timeout/timeout.c projects/release-install-debug/usr.bin/touch/touch.c projects/release-install-debug/usr.sbin/binmiscctl/binmiscctl.8 projects/release-install-debug/usr.sbin/binmiscctl/binmiscctl.c projects/release-install-debug/usr.sbin/devctl/Makefile projects/release-install-debug/usr.sbin/flowctl/flowctl.c projects/release-install-debug/usr.sbin/freebsd-update/freebsd-update.sh projects/release-install-debug/usr.sbin/pw/tests/pw_useradd.sh projects/release-install-debug/usr.sbin/pw/tests/pw_usernext.sh Directory Properties: projects/release-install-debug/ (props changed) projects/release-install-debug/cddl/ (props changed) projects/release-install-debug/cddl/contrib/opensolaris/ (props changed) projects/release-install-debug/contrib/elftoolchain/ (props changed) projects/release-install-debug/contrib/llvm/ (props changed) projects/release-install-debug/contrib/llvm/tools/lldb/ (props changed) projects/release-install-debug/etc/ (props changed) projects/release-install-debug/lib/libc/ (props changed) projects/release-install-debug/sbin/ (props changed) projects/release-install-debug/share/ (props changed) projects/release-install-debug/share/man/man4/ (props changed) projects/release-install-debug/sys/ (props changed) projects/release-install-debug/sys/boot/ (props changed) projects/release-install-debug/sys/conf/ (props changed) Modified: projects/release-install-debug/Makefile.inc1 ============================================================================== --- projects/release-install-debug/Makefile.inc1 Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/Makefile.inc1 Wed Feb 18 19:31:00 2015 (r278966) @@ -343,16 +343,15 @@ WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="$ SIZE="${XSIZE}" .if ${XCC:M/*} -XFLAGS= --sysroot=${WORLDTMP} .if defined(CROSS_BINUTILS_PREFIX) # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a # directory, but the compiler will look in the right place for it's # tools so we don't need to tell it where to look. .if exists(${CROSS_BINUTILS_PREFIX}) -XFLAGS+= -B${CROSS_BINUTILS_PREFIX} +BFLAGS+= -B${CROSS_BINUTILS_PREFIX} .endif .else -XFLAGS+= -B${WORLDTMP}/usr/bin +BFLAGS+= -B${WORLDTMP}/usr/bin .endif .if ${TARGET} == "arm" .if ${TARGET_ARCH:M*hf*} != "" @@ -369,6 +368,8 @@ DEPFLAGS+= -I${WORLDTMP}/usr/include/c++ TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XCFLAGS+= -target ${TARGET_TRIPLE} +XCFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} +XCXXFLAGS+= --sysroot=${WORLDTMP} ${BFLAGS} .endif .endif @@ -912,25 +913,25 @@ packageworld: .for dist in base ${EXTRA_DISTRIBUTIONS} .if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug \ - @${DESTDIR}/${DISTDIR}/${dist}.meta + tar cvf - --exclude usr/lib/debug \ + @${DESTDIR}/${DISTDIR}/${dist}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ - --exclude usr/lib/debug . + tar cvf - --exclude usr/lib/debug . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}.txz .endif .endfor .for dist in ${DEBUG_DISTRIBUTIONS} . if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta + tar cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz . else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \ - usr/lib/debug + tar cvLf - usr/lib/debug | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz . endif .endfor @@ -1138,41 +1139,37 @@ distributekernel distributekernel.debug: packagekernel: .if defined(NO_ROOT) cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \ - --exclude '*.symbols' \ - @${DESTDIR}/${DISTDIR}/kernel.meta + tar cvf - --exclude '*.symbols' \ + @${DESTDIR}/${DISTDIR}/kernel.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel-dbg.txz \ - --include '*/*/*.symbols' \ - @${DESTDIR}/${DISTDIR}/kernel.meta + tar cvf - --include '*/*/*.symbols' \ + @${DESTDIR}/${DISTDIR}/kernel.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \ - --exclude '*.symbols' \ - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta + tar cvf - --exclude '*.symbols' \ + @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz \ - --include '*/*/*.symbols' \ - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta + tar cvf - --include '*/*/*.symbols' \ + @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz .endfor .else cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \ - --exclude '*.symbols' \ - . + tar cvf - --exclude '*.symbols' . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.txz cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel-dbg.txz \ - --include '*/*/*.symbols' \ - $$(eval find .) + tar cvf - --include '*/*/*.symbols' $$(eval find .) | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \ - --exclude '*.symbols' \ - . + tar cvf - --exclude '*.symbols' . | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz \ - --include '*/*/*.symbols' \ - $$(eval find .) + tar cvf - --include '*/*/*.symbols' $$(eval find .) \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz .endfor .endif Modified: projects/release-install-debug/ObsoleteFiles.inc ============================================================================== --- projects/release-install-debug/ObsoleteFiles.inc Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/ObsoleteFiles.inc Wed Feb 18 19:31:00 2015 (r278966) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20150217: Removed remnants of ar(4) driver +OLD_FILES+=usr/include/sys/dev/ic/hd64570.h # 20150212: /usr/games moving into /usr/bin OLD_FILES+=usr/games/bcd OLD_FILES+=usr/games/caesar Modified: projects/release-install-debug/UPDATING ============================================================================== --- projects/release-install-debug/UPDATING Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/UPDATING Wed Feb 18 19:31:00 2015 (r278966) @@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150217: + If you are running a -CURRENT kernel since r273872 (Oct 30th, 2014), + but before r278950, the RNG was not seeded properly. Immediately + upgrade the kernel to r278950 or later and regenerate any keys (e.g. + ssh keys or openssl keys) that were generated w/ a kernel from that + range. This does not effect programs that directly used /dev/random + or /dev/urandom. All userland uses of arc4random(3) are effected. + 20150210: The autofs(4) ABI was changed in order to restore binary compatibility with 10.1-RELEASE. The automountd(8) daemon needs to be rebuilt to work Modified: projects/release-install-debug/bin/ln/symlink.7 ============================================================================== --- projects/release-install-debug/bin/ln/symlink.7 Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/ln/symlink.7 Wed Feb 18 19:31:00 2015 (r278966) @@ -29,7 +29,7 @@ .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" $FreeBSD$ .\" -.Dd January 23, 2015 +.Dd February 16, 2015 .Dt SYMLINK 7 .Os .Sh NAME @@ -146,6 +146,7 @@ The following system calls follow symbol unless given the .Dv AT_SYMLINK_NOFOLLOW flag: +.Xr chflagsat 2 , .Xr fchmodat 2 , .Xr fchownat 2 , .Xr fstatat 2 Modified: projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh ============================================================================== --- projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh Wed Feb 18 19:31:00 2015 (r278966) @@ -4,17 +4,7 @@ jail_name_to_jid() { local check_name="$1" - ( - line="$(jls -n 2> /dev/null | grep name=$check_name )" - for nv in $line; do - local name="${nv%=*}" - if [ "${name}" = "jid" ]; then - eval $nv - echo $jid - break - fi - done - ) + jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g' } base=pgrep_j_test @@ -37,10 +27,19 @@ jail -c path=/ name=${base}_1_1 ip4.addr jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount & -jid1=$(jail_name_to_jid ${base}_1_1) -jid2=$(jail_name_to_jid ${base}_1_2) -jid="${jid1},${jid2}" -pid1="$(pgrep -f -x -j $jid "$sleep $sleep_amount" | sort)" +for i in `seq 1 10`; do + jid1=$(jail_name_to_jid ${base}_1_1) + jid2=$(jail_name_to_jid ${base}_1_2) + jid="${jid1},${jid2}" + case "$jid" in + [0-9]+,[0-9]+) + break + ;; + esac + sleep 0.1 +done + +pid1="$(pgrep -f -x -j "$jid" "$sleep $sleep_amount" | sort)" pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \ $(cat ${PWD}/${base}_1_2.pid) | sort) if [ "$pid1" = "$pid2" ]; then Modified: projects/release-install-debug/bin/pkill/tests/pkill-j_test.sh ============================================================================== --- projects/release-install-debug/bin/pkill/tests/pkill-j_test.sh Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/pkill/tests/pkill-j_test.sh Wed Feb 18 19:31:00 2015 (r278966) @@ -4,99 +4,90 @@ jail_name_to_jid() { local check_name="$1" - ( - line="$(jls -n 2> /dev/null | grep name=$check_name )" - for nv in $line; do - local name="${nv%=*}" - if [ "${name}" = "jid" ]; then - eval $nv - echo $jid - break - fi - done - ) + jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g' } base=pkill_j_test +if [ `id -u` -ne 0 ]; then + echo "1..0 # skip Test needs uid 0." + exit 0 +fi + echo "1..3" +sleep=$(pwd)/sleep.txt +ln -sf /bin/sleep $sleep + name="pkill -j <jid>" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & +sleep_amount=5 +jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount & - jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & +$sleep $sleep_amount & - $sleep 5 & - sleep 0.5 +for i in `seq 1 10`; do jid1=$(jail_name_to_jid ${base}_1_1) jid2=$(jail_name_to_jid ${base}_1_2) jid="${jid1},${jid2}" - if pkill -f -j "$jid" $sleep && sleep 0.5 && - ! -f ${PWD}/${base}_1_1.pid && - ! -f ${PWD}/${base}_1_2.pid ; then - echo "ok 1 - $name" - else - echo "not ok 1 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) - [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) - wait + case "$jid" in + [0-9]+,[0-9]+) + break + ;; + esac + sleep 0.1 +done + +if pkill -f -j "$jid" $sleep && sleep 0.5 && + ! -f ${PWD}/${base}_1_1.pid && + ! -f ${PWD}/${base}_1_2.pid ; then + echo "ok 1 - $name" else - echo "ok 1 - $name # skip Test needs uid 0." -fi + echo "not ok 1 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) +[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) +wait name="pkill -j any" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & - - jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & - - $sleep 5 & - sleep 0.5 - chpid3=$! - if pkill -f -j any $sleep && sleep 0.5 && - [ ! -f ${PWD}/${base}_2_1.pid -a - ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then - echo "ok 2 - $name" - else - echo "not ok 2 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) - [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) - wait +sleep_amount=6 +jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount & + +$sleep $sleep_amount & +chpid3=$! +sleep 0.5 +if pkill -f -j any $sleep && sleep 0.5 && + [ ! -f ${PWD}/${base}_2_1.pid -a + ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then + echo "ok 2 - $name" else - echo "ok 2 - $name # skip Test needs uid 0." -fi + echo "not ok 2 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) +[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) +wait name="pkill -j none" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - daemon -p ${PWD}/${base}_3_1.pid $sleep 5 - jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & - sleep 1 - if pkill -f -j none "$sleep 5" && sleep 1 && - [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then - echo "ok 3 - $name" - else - ls ${PWD}/*.pid - echo "not ok 3 - $name" - fi 2>/dev/null - rm -f $sleep - [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) - [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) +sleep_amount=7 +daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount +jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount & +sleep 1 +if pkill -f -j none "$sleep $sleep_amount" && sleep 1 && + [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then + echo "ok 3 - $name" else - echo "ok 3 - $name # skip Test needs uid 0." -fi + ls ${PWD}/*.pid + echo "not ok 3 - $name" +fi 2>/dev/null +[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid) +[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid) + +rm -f $sleep Modified: projects/release-install-debug/bin/sh/cd.c ============================================================================== --- projects/release-install-debug/bin/sh/cd.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/cd.c Wed Feb 18 19:31:00 2015 (r278966) @@ -122,7 +122,7 @@ cdcmd(int argc __unused, char **argv __u (dest[0] == '.' && (dest[1] == '/' || dest[1] == '\0')) || (dest[0] == '.' && dest[1] == '.' && (dest[2] == '/' || dest[2] == '\0')) || (path = bltinlookup("CDPATH", 1)) == NULL) - path = nullstr; + path = ""; while ((p = padvance(&path, dest)) != NULL) { if (stat(p, &statb) < 0) { if (errno != ENOENT) @@ -182,7 +182,6 @@ cdlogical(char *dest) struct stat statb; int first; int badstat; - size_t len; /* * Check each component of the path. If we find a symlink or @@ -190,9 +189,7 @@ cdlogical(char *dest) * next time we get the value of the current directory. */ badstat = 0; - len = strlen(dest); - cdcomppath = stalloc(len + 1); - memcpy(cdcomppath, dest, len + 1); + cdcomppath = stsavestr(dest); STARTSTACKSTR(p); if (*dest == '/') { STPUTC('/', p); @@ -277,7 +274,6 @@ findcwd(char *dir) { char *new; char *p; - size_t len; /* * If our argument is NULL, we don't know the current directory @@ -286,9 +282,7 @@ findcwd(char *dir) */ if (dir == NULL || curdir == NULL) return getpwd2(); - len = strlen(dir); - cdcomppath = stalloc(len + 1); - memcpy(cdcomppath, dir, len + 1); + cdcomppath = stsavestr(dir); STARTSTACKSTR(new); if (*dir != '/') { STPUTS(curdir, new); Modified: projects/release-install-debug/bin/sh/eval.c ============================================================================== --- projects/release-install-debug/bin/sh/eval.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/eval.c Wed Feb 18 19:31:00 2015 (r278966) @@ -498,7 +498,7 @@ exphere(union node *redir, struct arglis struct localvar *savelocalvars; int need_longjmp = 0; - redir->nhere.expdoc = nullstr; + redir->nhere.expdoc = ""; savelocalvars = localvars; localvars = NULL; forcelocal++; Modified: projects/release-install-debug/bin/sh/expand.c ============================================================================== --- projects/release-install-debug/bin/sh/expand.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/expand.c Wed Feb 18 19:31:00 2015 (r278966) @@ -105,11 +105,12 @@ static void expbackq(union node *, int, static int subevalvar(char *, char *, int, int, int, int, int); static char *evalvar(char *, int); static int varisset(const char *, int); +static void strtodest(const char *, int, int, int); static void varvalue(const char *, int, int, int); static void recordregion(int, int, int); static void removerecordregions(int); static void ifsbreakup(char *, struct arglist *); -static void expandmeta(struct strlist *, int); +static void expandmeta(struct strlist *); static void expmeta(char *, char *); static void addfname(char *); static struct strlist *expsort(struct strlist *); @@ -175,7 +176,7 @@ expandarg(union node *arg, struct arglis ifsbreakup(p, &exparg); *exparg.lastp = NULL; exparg.lastp = &exparg.list; - expandmeta(exparg.list, flag); + expandmeta(exparg.list); } else { sp = (struct strlist *)stalloc(sizeof (struct strlist)); sp->text = p; @@ -298,9 +299,9 @@ exptilde(char *p, int flag) char c, *startp = p; struct passwd *pw; char *home; - int quotes = flag & (EXP_FULL | EXP_CASE); - while ((c = *p) != '\0') { + for (;;) { + c = *p; switch(c) { case CTLESC: /* This means CTL* are always considered quoted. */ case CTLVAR: @@ -311,31 +312,27 @@ exptilde(char *p, int flag) case CTLQUOTEMARK: return (startp); case ':': - if (flag & EXP_VARTILDE) - goto done; - break; + if ((flag & EXP_VARTILDE) == 0) + break; + /* FALLTHROUGH */ + case '\0': case '/': case CTLENDVAR: - goto done; + *p = '\0'; + if (*(startp+1) == '\0') { + home = lookupvar("HOME"); + } else { + pw = getpwnam(startp+1); + home = pw != NULL ? pw->pw_dir : NULL; + } + *p = c; + if (home == NULL || *home == '\0') + return (startp); + strtodest(home, flag, VSNORMAL, 1); + return (p); } p++; } -done: - *p = '\0'; - if (*(startp+1) == '\0') { - home = lookupvar("HOME"); - } else { - pw = getpwnam(startp+1); - home = pw != NULL ? pw->pw_dir : NULL; - } - *p = c; - if (home == NULL || *home == '\0') - return (startp); - if (quotes) - STPUTS_QUOTES(home, DQSYNTAX, expdest); - else - STPUTS(home, expdest); - return (p); } @@ -496,6 +493,17 @@ expbackq(union node *cmd, int quoted, in +static void +recordleft(const char *str, const char *loc, char *startp) +{ + int amount; + + amount = ((str - 1) - (loc - startp)) - expdest; + STADJUST(amount, expdest); + while (loc != str - 1) + *startp++ = *loc++; +} + static int subevalvar(char *p, char *str, int strloc, int subtype, int startloc, int varflags, int quotes) @@ -530,8 +538,7 @@ subevalvar(char *p, char *str, int strlo error((char *)NULL); } error("%.*s: parameter %snot set", (int)(p - str - 1), - str, (varflags & VSNUL) ? "null or " - : nullstr); + str, (varflags & VSNUL) ? "null or " : ""); return 0; case VSTRIMLEFT: @@ -540,7 +547,8 @@ subevalvar(char *p, char *str, int strlo *loc = '\0'; if (patmatch(str, startp, quotes)) { *loc = c; - goto recordleft; + recordleft(str, loc, startp); + return 1; } *loc = c; if (quotes && *loc == CTLESC) @@ -554,7 +562,8 @@ subevalvar(char *p, char *str, int strlo *loc = '\0'; if (patmatch(str, startp, quotes)) { *loc = c; - goto recordleft; + recordleft(str, loc, startp); + return 1; } *loc = c; loc--; @@ -602,13 +611,6 @@ subevalvar(char *p, char *str, int strlo default: abort(); } - -recordleft: - amount = ((str - 1) - (loc - startp)) - expdest; - STADJUST(amount, expdest); - while (loc != str - 1) - *startp++ = *loc++; - return 1; } @@ -633,6 +635,7 @@ evalvar(char *p, int flag) int varlenb; int easy; int quotes = flag & (EXP_FULL | EXP_CASE); + int record; varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; @@ -690,22 +693,15 @@ again: /* jump here after setting a vari STADJUST(-varlenb, expdest); } } else { - char const *syntax = (varflags & VSQUOTE) ? DQSYNTAX - : BASESYNTAX; - if (subtype == VSLENGTH) { for (;*val; val++) if (!localeisutf8 || (*val & 0xC0) != 0x80) varlen++; } - else { - if (quotes) - STPUTS_QUOTES(val, syntax, expdest); - else - STPUTS(val, expdest); - - } + else + strtodest(val, flag, subtype, + varflags & VSQUOTE); } } @@ -719,15 +715,11 @@ again: /* jump here after setting a vari switch (subtype) { case VSLENGTH: expdest = cvtnum(varlen, expdest); - goto record; + record = 1; + break; case VSNORMAL: - if (!easy) - break; -record: - recordregion(startloc, expdest - stackblock(), - varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && - (*var == '@' || *var == '*'))); + record = easy; break; case VSPLUS: @@ -737,8 +729,7 @@ record: (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0)); break; } - if (easy) - goto record; + record = easy; break; case VSTRIMLEFT: @@ -760,7 +751,8 @@ record: } /* Remove any recorded regions beyond start of variable */ removerecordregions(startloc); - goto record; + record = 1; + break; case VSASSIGN: case VSQUESTION: @@ -777,8 +769,7 @@ record: } break; } - if (easy) - goto record; + record = easy; break; case VSERROR: @@ -790,6 +781,11 @@ record: abort(); } + if (record) + recordregion(startloc, expdest - stackblock(), + varflags & VSQUOTE || (ifsset() && ifsval()[0] == '\0' && + (*var == '@' || *var == '*'))); + if (subtype != VSNORMAL) { /* skip to end of alternative */ int nesting = 1; for (;;) { @@ -1093,7 +1089,7 @@ static char expdir[PATH_MAX]; * The results are stored in the list exparg. */ static void -expandmeta(struct strlist *str, int flag __unused) +expandmeta(struct strlist *str) { char *p; struct strlist **savelastp; @@ -1284,11 +1280,8 @@ addfname(char *name) { char *p; struct strlist *sp; - size_t len; - len = strlen(name); - p = stalloc(len + 1); - memcpy(p, name, len + 1); + p = stsavestr(name); sp = (struct strlist *)stalloc(sizeof *sp); sp->text = p; *exparg.lastp = sp; @@ -1478,16 +1471,14 @@ patmatch(const char *pattern, const char endp = p; if (*endp == '!' || *endp == '^') endp++; - for (;;) { + do { while (*endp == CTLQUOTEMARK) endp++; if (*endp == 0) goto dft; /* no matching ] */ if (*endp == CTLESC) endp++; - if (*++endp == ']') - break; - } + } while (*++endp != ']'); invert = 0; if (*p == '!' || *p == '^') { invert++; Modified: projects/release-install-debug/bin/sh/mail.c ============================================================================== --- projects/release-install-debug/bin/sh/mail.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/mail.c Wed Feb 18 19:31:00 2015 (r278966) @@ -85,7 +85,7 @@ chkmail(int silent) setstackmark(&smark); mpath = mpathset()? mpathval() : mailval(); for (i = 0 ; i < nmboxes ; i++) { - p = padvance(&mpath, nullstr); + p = padvance(&mpath, ""); if (p == NULL) break; if (*p == '\0') Modified: projects/release-install-debug/bin/sh/memalloc.c ============================================================================== --- projects/release-install-debug/bin/sh/memalloc.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/memalloc.c Wed Feb 18 19:31:00 2015 (r278966) @@ -180,6 +180,18 @@ stunalloc(pointer p) } +char * +stsavestr(const char *s) +{ + char *p; + size_t len; + + len = strlen(s); + p = stalloc(len + 1); + memcpy(p, s, len + 1); + return p; +} + void setstackmark(struct stackmark *mark) Modified: projects/release-install-debug/bin/sh/memalloc.h ============================================================================== --- projects/release-install-debug/bin/sh/memalloc.h Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/memalloc.h Wed Feb 18 19:31:00 2015 (r278966) @@ -52,6 +52,7 @@ void ckfree(pointer); char *savestr(const char *); pointer stalloc(int); void stunalloc(pointer); +char *stsavestr(const char *); void setstackmark(struct stackmark *); void popstackmark(struct stackmark *); char *growstackstr(void); Modified: projects/release-install-debug/bin/sh/miscbltin.c ============================================================================== --- projects/release-install-debug/bin/sh/miscbltin.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/miscbltin.c Wed Feb 18 19:31:00 2015 (r278966) @@ -265,7 +265,7 @@ readcmd(int argc __unused, char **argv _ /* Set any remaining args to "" */ while (*++ap != NULL) - setvar(*ap, nullstr, 0); + setvar(*ap, "", 0); return status; } Modified: projects/release-install-debug/bin/sh/nodetypes ============================================================================== --- projects/release-install-debug/bin/sh/nodetypes Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/nodetypes Wed Feb 18 19:31:00 2015 (r278966) @@ -138,7 +138,7 @@ NXHERE nhere # fd<<! fd int # file descriptor being redirected next nodeptr # next redirection in list doc nodeptr # input to command (NARG node) - expdoc temp char *expdoc # actual document (for NXHERE) + expdoc temp const char *expdoc # actual document (for NXHERE) NNOT nnot # ! command (actually pipeline) type int Modified: projects/release-install-debug/bin/sh/parser.c ============================================================================== --- projects/release-install-debug/bin/sh/parser.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/parser.c Wed Feb 18 19:31:00 2015 (r278966) @@ -1940,7 +1940,7 @@ getprompt(void *unused __unused) */ switch (whichprompt) { case 0: - fmt = nullstr; + fmt = ""; break; case 1: fmt = ps1val(); Modified: projects/release-install-debug/bin/sh/tests/expansion/Makefile ============================================================================== --- projects/release-install-debug/bin/sh/tests/expansion/Makefile Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/tests/expansion/Makefile Wed Feb 18 19:31:00 2015 (r278966) @@ -48,6 +48,7 @@ FILES+= ifs1.0 FILES+= ifs2.0 FILES+= ifs3.0 FILES+= ifs4.0 +FILES+= ifs5.0 FILES+= length1.0 FILES+= length2.0 FILES+= length3.0 @@ -62,6 +63,7 @@ FILES+= pathname1.0 FILES+= pathname2.0 FILES+= pathname3.0 FILES+= pathname4.0 +FILES+= pathname5.0 FILES+= plus-minus1.0 FILES+= plus-minus2.0 FILES+= plus-minus3.0 Copied: projects/release-install-debug/bin/sh/tests/expansion/ifs5.0 (from r278964, head/bin/sh/tests/expansion/ifs5.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-install-debug/bin/sh/tests/expansion/ifs5.0 Wed Feb 18 19:31:00 2015 (r278966, copy of r278964, head/bin/sh/tests/expansion/ifs5.0) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +set -- $(echo a b c d) +[ "$#" = 4 ] Copied: projects/release-install-debug/bin/sh/tests/expansion/pathname5.0 (from r278964, head/bin/sh/tests/expansion/pathname5.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-install-debug/bin/sh/tests/expansion/pathname5.0 Wed Feb 18 19:31:00 2015 (r278966, copy of r278964, head/bin/sh/tests/expansion/pathname5.0) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +[ `echo '/[e]tc'` = /etc ] Modified: projects/release-install-debug/bin/sh/var.c ============================================================================== --- projects/release-install-debug/bin/sh/var.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/bin/sh/var.c Wed Feb 18 19:31:00 2015 (r278966) @@ -872,7 +872,7 @@ unsetvar(const char *s) if (vp->flags & VREADONLY) return (1); if (vp->text[vp->name_len + 1] != '\0') - setvar(s, nullstr, 0); + setvar(s, "", 0); if ((vp->flags & VEXPORT) && localevar(vp->text)) { change_env(s, 0); setlocale(LC_ALL, ""); Modified: projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c ============================================================================== --- projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Wed Feb 18 19:31:00 2015 (r278966) @@ -26,6 +26,8 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include <sys/ioctl.h> + #include <assert.h> #include <setjmp.h> #include <signal.h> @@ -69,7 +71,7 @@ main(int argc, char *argv[]) */ if (sigsetjmp(env, 1) == 0) { for (;;) - (void) ioctl(-1, -1, NULL); + (void) ioctl(-1, 0, NULL); } /* @@ -80,20 +82,19 @@ main(int argc, char *argv[]) fds[n++] = open(file, O_WRONLY); fds[n++] = open(file, O_RDWR); - fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | O_DSYNC | - O_LARGEFILE | O_NOCTTY | O_NONBLOCK | O_NDELAY | O_RSYNC | - O_SYNC | O_TRUNC | O_XATTR, 0666); + fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | + O_NOCTTY | O_NONBLOCK | O_NDELAY | O_SYNC | O_TRUNC | 0666); fds[n++] = open(file, O_RDWR); (void) lseek(fds[n - 1], 123, SEEK_SET); /* * Once we have all the file descriptors in the state we want to test, - * issue a bogus ioctl() on each fd with cmd -1 and arg NULL to whack + * issue a bogus ioctl() on each fd with cmd 0 and arg NULL to whack * our DTrace script into recording the content of the fds[] array. */ for (i = 0; i < n; i++) - (void) ioctl(fds[i], -1, NULL); + (void) ioctl(fds[i], 0, NULL); assert(n <= sizeof (fds) / sizeof (fds[0])); exit(0); Modified: projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d ============================================================================== --- projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d Wed Feb 18 19:31:00 2015 (r278966) @@ -36,7 +36,7 @@ syscall::ioctl:entry } syscall::ioctl:entry -/pid == $1 && arg0 != -1u && arg1 == -1u && arg2 == NULL/ +/pid == $1 && arg0 != -1u && arg1 == 0 && arg2 == NULL/ { printf("fds[%d] fi_name = %s\n", arg0, fds[arg0].fi_name); printf("fds[%d] fi_dirname = %s\n", arg0, fds[arg0].fi_dirname); Modified: projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Wed Feb 18 19:27:51 2015 (r278965) +++ projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Wed Feb 18 19:31:00 2015 (r278966) @@ -36,7 +36,6 @@ #include <string.h> #include <errno.h> #include <libelf.h> -#include <gelf.h> /* * In Solaris 10 GA, the only mechanism for communicating helper information @@ -62,9 +61,7 @@ static const char *olddevname = "/device static const char *modname; /* Name of this load object */ static int gen; /* DOF helper generation */ -#ifdef illumos extern dof_hdr_t __SUNW_dof; /* DOF defined in the .SUNW_dof section */ -#endif static boolean_t dof_init_debug = B_FALSE; /* From DTRACE_DOF_INIT_DEBUG */ static void @@ -99,11 +96,7 @@ static void dtrace_dof_init(void) __attr static void dtrace_dof_init(void) { -#ifdef illumos dof_hdr_t *dof = &__SUNW_dof; -#else - dof_hdr_t *dof = NULL; -#endif #ifdef _LP64 Elf64_Ehdr *elf; #else @@ -118,17 +111,6 @@ dtrace_dof_init(void) #endif int fd; const char *p; -#ifndef illumos - Elf *e; - Elf_Scn *scn = NULL; - Elf_Data *dofdata = NULL; - dof_hdr_t *dof_next = NULL; - GElf_Shdr shdr; - int efd; - char *s; - size_t shstridx; - uint64_t aligned_filesz; -#endif if (getenv("DTRACE_DOF_INIT_DISABLE") != NULL) return; @@ -152,42 +134,6 @@ dtrace_dof_init(void) modname = lmp->l_name; else modname++; -#ifndef illumos - elf_version(EV_CURRENT); - if ((efd = open(lmp->l_name, O_RDONLY, 0)) < 0) { - dprintf(1, "couldn't open file for reading\n"); - return; - } - if ((e = elf_begin(efd, ELF_C_READ, NULL)) == NULL) { - dprintf(1, "elf_begin failed\n"); - close(efd); - return; - } - elf_getshdrstrndx(e, &shstridx); - dof = NULL; - while ((scn = elf_nextscn(e, scn)) != NULL) { - gelf_getshdr(scn, &shdr); - if (shdr.sh_type == SHT_SUNW_dof) { - s = elf_strptr(e, shstridx, shdr.sh_name); - if (s != NULL && strcmp(s, ".SUNW_dof") == 0) { - dofdata = elf_getdata(scn, NULL); - dof = dofdata->d_buf; - break; - } - } - } - if (dof == NULL) { - dprintf(1, "SUNW_dof section not found\n"); - elf_end(e); - close(efd); - return; - } - - while ((char *) dof < (char *) dofdata->d_buf + dofdata->d_size) { - aligned_filesz = (shdr.sh_addralign == 0 ? dof->dofh_filesz : - roundup2(dof->dofh_filesz, shdr.sh_addralign)); - dof_next = (void *) ((char *) dof + aligned_filesz); -#endif if (dof->dofh_ident[DOF_ID_MAG0] != DOF_MAG_MAG0 || dof->dofh_ident[DOF_ID_MAG1] != DOF_MAG_MAG1 || @@ -237,21 +183,12 @@ dtrace_dof_init(void) dprintf(1, "DTrace ioctl failed for DOF at %p", dof); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502181931.t1IJV1k1057777>