Date: Mon, 11 Apr 2016 15:24:59 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r297824 - in projects/release-pkg: bin/csh bin/sh bin/sh/tests/builtins cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zpool cddl/cont... Message-ID: <201604111524.u3BFOxpt092539@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Mon Apr 11 15:24:59 2016 New Revision: 297824 URL: https://svnweb.freebsd.org/changeset/base/297824 Log: MFH Sponsored by: The FreeBSD Foundation Added: projects/release-pkg/sys/arm/allwinner/aw_ccu.c - copied unchanged from r297823, head/sys/arm/allwinner/aw_ccu.c projects/release-pkg/sys/arm/allwinner/aw_reset.c - copied unchanged from r297823, head/sys/arm/allwinner/aw_reset.c projects/release-pkg/sys/arm/allwinner/clk/ - copied from r297823, head/sys/arm/allwinner/clk/ projects/release-pkg/sys/dev/acpica/acpi_pcivar.h - copied unchanged from r297823, head/sys/dev/acpica/acpi_pcivar.h projects/release-pkg/sys/mips/mediatek/ - copied from r297823, head/sys/mips/mediatek/ Deleted: projects/release-pkg/sys/arm/allwinner/a10_clk.c projects/release-pkg/sys/arm/allwinner/a10_clk.h projects/release-pkg/sys/arm/allwinner/a31/a31_clk.c projects/release-pkg/sys/arm/allwinner/a31/a31_clk.h projects/release-pkg/sys/boot/fdt/dts/arm/sun4i-a10.dtsi projects/release-pkg/sys/boot/fdt/dts/arm/sun7i-a20.dtsi Modified: projects/release-pkg/bin/csh/config_p.h projects/release-pkg/bin/sh/miscbltin.c projects/release-pkg/bin/sh/parser.c projects/release-pkg/bin/sh/tests/builtins/getopts1.0 projects/release-pkg/bin/sh/tests/builtins/getopts2.0 projects/release-pkg/bin/sh/tests/builtins/getopts9.0 projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c projects/release-pkg/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/release-pkg/contrib/netbsd-tests/lib/libc/sys/t_gettimeofday.c projects/release-pkg/lib/libc/aarch64/gen/Makefile.inc projects/release-pkg/lib/libc/aarch64/sys/Makefile.inc projects/release-pkg/lib/libc/db/hash/hash.c projects/release-pkg/lib/libc/db/hash/hash_buf.c projects/release-pkg/lib/libc/gen/err.c projects/release-pkg/lib/libc/gen/getmntinfo.c projects/release-pkg/lib/libc/gen/opendir.c projects/release-pkg/lib/libc/gen/semctl.c projects/release-pkg/lib/libc/gen/tls.c projects/release-pkg/lib/libc/include/compat.h projects/release-pkg/lib/libc/locale/xlocale_private.h projects/release-pkg/lib/libc/net/base64.c projects/release-pkg/lib/libc/net/getifaddrs.c projects/release-pkg/lib/libc/net/getservent.c projects/release-pkg/lib/libc/net/rcmd.c projects/release-pkg/lib/libc/posix1e/acl_support_nfs4.c projects/release-pkg/lib/libc/resolv/mtctxres.c projects/release-pkg/lib/libc/resolv/res_init.c projects/release-pkg/lib/libc/resolv/res_mkupdate.c projects/release-pkg/lib/libc/rpc/auth_none.c projects/release-pkg/lib/libc/rpc/clnt_perror.c projects/release-pkg/lib/libc/rpc/mt_misc.c projects/release-pkg/lib/libc/rpc/rpcdname.c projects/release-pkg/lib/libc/softfloat/timesoftfloat.c projects/release-pkg/lib/libc/uuid/uuid_to_string.c projects/release-pkg/lib/libc/xdr/xdr_mem.c projects/release-pkg/lib/libedit/filecomplete.c projects/release-pkg/lib/libedit/vi.c projects/release-pkg/lib/libfetch/ftp.c projects/release-pkg/lib/libpam/modules/pam_krb5/pam_krb5.c projects/release-pkg/lib/libpam/modules/pam_login_access/login_access.c projects/release-pkg/lib/libthr/thread/thr_affinity.c projects/release-pkg/lib/libthr/thread/thr_attr.c projects/release-pkg/lib/libthr/thread/thr_autoinit.c projects/release-pkg/lib/libthr/thread/thr_barrier.c projects/release-pkg/lib/libthr/thread/thr_barrierattr.c projects/release-pkg/lib/libthr/thread/thr_cancel.c projects/release-pkg/lib/libthr/thread/thr_clean.c projects/release-pkg/lib/libthr/thread/thr_concurrency.c projects/release-pkg/lib/libthr/thread/thr_cond.c projects/release-pkg/lib/libthr/thread/thr_condattr.c projects/release-pkg/lib/libthr/thread/thr_create.c projects/release-pkg/lib/libthr/thread/thr_detach.c projects/release-pkg/lib/libthr/thread/thr_equal.c projects/release-pkg/lib/libthr/thread/thr_event.c projects/release-pkg/lib/libthr/thread/thr_exit.c projects/release-pkg/lib/libthr/thread/thr_fork.c projects/release-pkg/lib/libthr/thread/thr_getcpuclockid.c projects/release-pkg/lib/libthr/thread/thr_getprio.c projects/release-pkg/lib/libthr/thread/thr_getschedparam.c projects/release-pkg/lib/libthr/thread/thr_getthreadid_np.c projects/release-pkg/lib/libthr/thread/thr_info.c projects/release-pkg/lib/libthr/thread/thr_init.c projects/release-pkg/lib/libthr/thread/thr_join.c projects/release-pkg/lib/libthr/thread/thr_kern.c projects/release-pkg/lib/libthr/thread/thr_kill.c projects/release-pkg/lib/libthr/thread/thr_list.c projects/release-pkg/lib/libthr/thread/thr_main_np.c projects/release-pkg/lib/libthr/thread/thr_multi_np.c projects/release-pkg/lib/libthr/thread/thr_mutex.c projects/release-pkg/lib/libthr/thread/thr_mutexattr.c projects/release-pkg/lib/libthr/thread/thr_once.c projects/release-pkg/lib/libthr/thread/thr_printf.c projects/release-pkg/lib/libthr/thread/thr_pspinlock.c projects/release-pkg/lib/libthr/thread/thr_resume_np.c projects/release-pkg/lib/libthr/thread/thr_rtld.c projects/release-pkg/lib/libthr/thread/thr_rwlock.c projects/release-pkg/lib/libthr/thread/thr_rwlockattr.c projects/release-pkg/lib/libthr/thread/thr_self.c projects/release-pkg/lib/libthr/thread/thr_sem.c projects/release-pkg/lib/libthr/thread/thr_setprio.c projects/release-pkg/lib/libthr/thread/thr_setschedparam.c projects/release-pkg/lib/libthr/thread/thr_sig.c projects/release-pkg/lib/libthr/thread/thr_single_np.c projects/release-pkg/lib/libthr/thread/thr_sleepq.c projects/release-pkg/lib/libthr/thread/thr_spec.c projects/release-pkg/lib/libthr/thread/thr_spinlock.c projects/release-pkg/lib/libthr/thread/thr_stack.c projects/release-pkg/lib/libthr/thread/thr_suspend_np.c projects/release-pkg/lib/libthr/thread/thr_switch_np.c projects/release-pkg/lib/libthr/thread/thr_symbols.c projects/release-pkg/lib/libthr/thread/thr_umtx.c projects/release-pkg/lib/libthr/thread/thr_yield.c projects/release-pkg/lib/libusb/libusb20.c projects/release-pkg/lib/libusbhid/descr.c projects/release-pkg/lib/libusbhid/usage.c projects/release-pkg/sbin/fsck_msdosfs/dir.c projects/release-pkg/sbin/geom/class/eli/geli.8 projects/release-pkg/sbin/geom/class/eli/geom_eli.c projects/release-pkg/sbin/geom/class/part/geom_part.c projects/release-pkg/sbin/reboot/nextboot.8 projects/release-pkg/sbin/reboot/nextboot.sh projects/release-pkg/sys/amd64/cloudabi64/cloudabi64_sysvec.c projects/release-pkg/sys/amd64/vmm/amd/svm_msr.c projects/release-pkg/sys/arm/allwinner/a10_ahci.c projects/release-pkg/sys/arm/allwinner/a10_codec.c projects/release-pkg/sys/arm/allwinner/a10_dmac.c projects/release-pkg/sys/arm/allwinner/a10_ehci.c projects/release-pkg/sys/arm/allwinner/a10_fb.c projects/release-pkg/sys/arm/allwinner/a10_hdmi.c projects/release-pkg/sys/arm/allwinner/a10_mmc.c projects/release-pkg/sys/arm/allwinner/a10_sramc.c projects/release-pkg/sys/arm/allwinner/a10_sramc.h projects/release-pkg/sys/arm/allwinner/a20/a20_if_dwc.c projects/release-pkg/sys/arm/allwinner/a31/a31_padconf.c projects/release-pkg/sys/arm/allwinner/aw_usbphy.c projects/release-pkg/sys/arm/allwinner/files.allwinner projects/release-pkg/sys/arm/allwinner/if_emac.c projects/release-pkg/sys/arm/altera/socfpga/socfpga_rstmgr.c projects/release-pkg/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c projects/release-pkg/sys/arm/arm/disassem.c projects/release-pkg/sys/arm/arm/gic.c projects/release-pkg/sys/arm/arm/locore.S projects/release-pkg/sys/arm/arm/physmem.c projects/release-pkg/sys/arm/arm/vm_machdep.c projects/release-pkg/sys/arm/broadcom/bcm2835/bcm2836.c projects/release-pkg/sys/arm/conf/A10 projects/release-pkg/sys/arm/conf/A20 projects/release-pkg/sys/arm/freescale/imx/imx6_sdma.c projects/release-pkg/sys/arm/freescale/imx/imx6_ssi.c projects/release-pkg/sys/arm/freescale/imx/imx_gpio.c projects/release-pkg/sys/arm/freescale/vybrid/vf_ccm.c projects/release-pkg/sys/arm/freescale/vybrid/vf_edma.c projects/release-pkg/sys/arm/freescale/vybrid/vf_port.c projects/release-pkg/sys/arm/freescale/vybrid/vf_sai.c projects/release-pkg/sys/arm/mv/mv_pci.c projects/release-pkg/sys/arm/samsung/exynos/chrome_ec.c projects/release-pkg/sys/arm/samsung/exynos/chrome_ec_spi.c projects/release-pkg/sys/arm/samsung/exynos/chrome_kb.c projects/release-pkg/sys/arm/samsung/exynos/exynos5_i2c.c projects/release-pkg/sys/arm/samsung/exynos/exynos5_pad.c projects/release-pkg/sys/arm64/arm64/copyinout.S projects/release-pkg/sys/arm64/arm64/genassym.c projects/release-pkg/sys/arm64/arm64/gic_v3_its.c projects/release-pkg/sys/arm64/arm64/locore.S projects/release-pkg/sys/arm64/arm64/pmap.c projects/release-pkg/sys/arm64/arm64/support.S projects/release-pkg/sys/arm64/cavium/thunder_pcie_pem.c projects/release-pkg/sys/arm64/cloudabi64/cloudabi64_sysvec.c projects/release-pkg/sys/arm64/include/frame.h projects/release-pkg/sys/arm64/include/vmparam.h projects/release-pkg/sys/boot/arm/at91/libat91/sd-card.c projects/release-pkg/sys/boot/arm/uboot/ldscript.arm projects/release-pkg/sys/boot/common/load_elf_obj.c projects/release-pkg/sys/boot/common/part.c projects/release-pkg/sys/boot/fdt/dts/arm/bananapi.dts projects/release-pkg/sys/boot/fdt/dts/arm/cubieboard.dts projects/release-pkg/sys/boot/fdt/dts/arm/cubieboard2.dts projects/release-pkg/sys/boot/fdt/dts/arm/olimex-a20-som-evb.dts projects/release-pkg/sys/boot/fdt/dts/arm/olinuxino-lime.dts projects/release-pkg/sys/boot/fdt/dts/arm/sun7i-a20-hdmi.dtsi projects/release-pkg/sys/boot/forth/loader.conf.5 projects/release-pkg/sys/boot/geli/geliboot.c projects/release-pkg/sys/boot/geli/geliboot.h projects/release-pkg/sys/boot/i386/libi386/biosdisk.c projects/release-pkg/sys/boot/i386/zfsboot/zfsboot.c projects/release-pkg/sys/boot/userboot/test/test.c projects/release-pkg/sys/boot/userboot/userboot/elf64_freebsd.c projects/release-pkg/sys/cam/ctl/ctl_ha.c projects/release-pkg/sys/cam/scsi/scsi_all.h projects/release-pkg/sys/cam/scsi/scsi_ch.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/release-pkg/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c projects/release-pkg/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/release-pkg/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/release-pkg/sys/cddl/dev/sdt/sdt.c projects/release-pkg/sys/compat/cloudabi64/cloudabi64_module.c projects/release-pkg/sys/compat/cloudabi64/cloudabi64_thread.c projects/release-pkg/sys/compat/cloudabi64/cloudabi64_util.h projects/release-pkg/sys/compat/linprocfs/linprocfs.c projects/release-pkg/sys/compat/linux/linux_misc.h projects/release-pkg/sys/conf/NOTES projects/release-pkg/sys/conf/files projects/release-pkg/sys/conf/newvers.sh projects/release-pkg/sys/conf/options projects/release-pkg/sys/contrib/cloudabi/cloudabi64_types.h projects/release-pkg/sys/contrib/ipfilter/netinet/fil.c projects/release-pkg/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/release-pkg/sys/contrib/ipfilter/netinet/ip_frag.c projects/release-pkg/sys/contrib/ipfilter/netinet/ip_state.c projects/release-pkg/sys/dev/aac/aac.c projects/release-pkg/sys/dev/aacraid/aacraid.c projects/release-pkg/sys/dev/acpica/acpi.c projects/release-pkg/sys/dev/acpica/acpi_pci.c projects/release-pkg/sys/dev/acpica/acpivar.h projects/release-pkg/sys/dev/ahci/ahci_pci.c projects/release-pkg/sys/dev/ata/chipsets/ata-intel.c projects/release-pkg/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c projects/release-pkg/sys/dev/ath/if_ath.c projects/release-pkg/sys/dev/ath/if_ath_rx.c projects/release-pkg/sys/dev/bhnd/bcma/bcma_erom.c projects/release-pkg/sys/dev/bhnd/bhndb/bhndb_pci.c projects/release-pkg/sys/dev/bhnd/cores/chipc/chipc.c projects/release-pkg/sys/dev/bhnd/siba/siba.c projects/release-pkg/sys/dev/bktr/bktr_core.c projects/release-pkg/sys/dev/bktr/bktr_os.c projects/release-pkg/sys/dev/bxe/bxe.c projects/release-pkg/sys/dev/cardbus/cardbus.c projects/release-pkg/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/release-pkg/sys/dev/cxgbe/iw_cxgbe/mem.c projects/release-pkg/sys/dev/cxgbe/t4_main.c projects/release-pkg/sys/dev/cxgbe/tom/t4_ddp.c projects/release-pkg/sys/dev/drm2/radeon/radeon_bios.c projects/release-pkg/sys/dev/dwc/if_dwc.c projects/release-pkg/sys/dev/etherswitch/arswitch/arswitch.c projects/release-pkg/sys/dev/etherswitch/arswitch/arswitch_8327.c projects/release-pkg/sys/dev/etherswitch/ip17x/ip175c.c projects/release-pkg/sys/dev/etherswitch/ip17x/ip175d.c projects/release-pkg/sys/dev/gpio/gpioiic.c projects/release-pkg/sys/dev/hwpmc/hwpmc_e500.c projects/release-pkg/sys/dev/hwpmc/hwpmc_mips.c projects/release-pkg/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/release-pkg/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/release-pkg/sys/dev/hyperv/netvsc/hv_rndis_filter.c projects/release-pkg/sys/dev/hyperv/utilities/hv_heartbeat.c projects/release-pkg/sys/dev/hyperv/utilities/hv_kvp.c projects/release-pkg/sys/dev/hyperv/utilities/hv_shutdown.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_channel.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_channel_mgmt.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_connection.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_hv.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/release-pkg/sys/dev/hyperv/vmbus/hv_vmbus_priv.h projects/release-pkg/sys/dev/ichiic/ig4_iic.c projects/release-pkg/sys/dev/ie/if_ie_isa.c projects/release-pkg/sys/dev/iicbus/twsi/a10_twsi.c projects/release-pkg/sys/dev/ioat/ioat.c projects/release-pkg/sys/dev/ioat/ioat.h projects/release-pkg/sys/dev/ioat/ioat_internal.h projects/release-pkg/sys/dev/ioat/ioat_test.c projects/release-pkg/sys/dev/isci/scil/scic_sds_controller_registers.h projects/release-pkg/sys/dev/isp/isp.c projects/release-pkg/sys/dev/isp/isp_freebsd.h projects/release-pkg/sys/dev/isp/isp_library.c projects/release-pkg/sys/dev/isp/isp_library.h projects/release-pkg/sys/dev/isp/isp_stds.h projects/release-pkg/sys/dev/isp/ispmbox.h projects/release-pkg/sys/dev/ispfw/asm_2500.h projects/release-pkg/sys/dev/ixgbe/if_ix.c projects/release-pkg/sys/dev/ixgbe/ixgbe_common.c projects/release-pkg/sys/dev/ixl/if_ixl.c projects/release-pkg/sys/dev/ixl/if_ixlv.c projects/release-pkg/sys/dev/kbdmux/kbdmux.c projects/release-pkg/sys/dev/mii/mii_physubr.c projects/release-pkg/sys/dev/mmc/host/dwmmc.c projects/release-pkg/sys/dev/mvs/mvs.c projects/release-pkg/sys/dev/nand/nand.c projects/release-pkg/sys/dev/nand/nandsim_chip.c projects/release-pkg/sys/dev/ncr/ncr.c projects/release-pkg/sys/dev/nfe/if_nfe.c projects/release-pkg/sys/dev/oce/oce_mbox.c projects/release-pkg/sys/dev/oce/oce_sysctl.c projects/release-pkg/sys/dev/ow/ow.c projects/release-pkg/sys/dev/patm/if_patm_attach.c projects/release-pkg/sys/dev/pcf/pcf.c projects/release-pkg/sys/dev/pci/pci.c projects/release-pkg/sys/dev/pci/pci_iov.c projects/release-pkg/sys/dev/pci/pci_private.h projects/release-pkg/sys/dev/pdq/pdq.c projects/release-pkg/sys/dev/qlxgbe/ql_hw.c projects/release-pkg/sys/dev/ral/rt2860.c projects/release-pkg/sys/dev/rt/if_rt.c projects/release-pkg/sys/dev/rt/if_rtvar.h projects/release-pkg/sys/dev/sound/midi/midi.c projects/release-pkg/sys/dev/sound/pci/hda/hdaa.c projects/release-pkg/sys/dev/sym/sym_hipd.c projects/release-pkg/sys/dev/tdfx/tdfx_pci.c projects/release-pkg/sys/dev/ti/if_ti.c projects/release-pkg/sys/dev/uart/uart_dev_msm.c projects/release-pkg/sys/dev/usb/net/if_mos.c projects/release-pkg/sys/dev/usb/net/if_ure.c projects/release-pkg/sys/dev/usb/net/if_urndis.c projects/release-pkg/sys/dev/usb/quirk/usb_quirk.c projects/release-pkg/sys/dev/usb/usb_transfer.c projects/release-pkg/sys/dev/usb/usbdevs projects/release-pkg/sys/dev/vnic/nicvf_queues.c projects/release-pkg/sys/dev/vnic/thunder_bgx.c projects/release-pkg/sys/dev/vt/vt_core.c projects/release-pkg/sys/dev/xen/pci/xen_acpi_pci.c projects/release-pkg/sys/fs/ext2fs/ext2_alloc.c projects/release-pkg/sys/fs/ext2fs/ext2_bmap.c projects/release-pkg/sys/fs/ext2fs/ext2_vfsops.c projects/release-pkg/sys/fs/nandfs/nandfs_segment.c projects/release-pkg/sys/fs/nfs/nfs_commonacl.c projects/release-pkg/sys/fs/nfs/nfs_commonport.c projects/release-pkg/sys/fs/nfs/nfs_commonsubs.c projects/release-pkg/sys/fs/nfsclient/nfs_clbio.c projects/release-pkg/sys/fs/nfsclient/nfs_clport.c projects/release-pkg/sys/fs/nfsclient/nfs_clrpcops.c projects/release-pkg/sys/fs/nfsclient/nfs_clstate.c projects/release-pkg/sys/fs/nfsclient/nfs_clvnops.c projects/release-pkg/sys/fs/nfsserver/nfs_nfsdport.c projects/release-pkg/sys/fs/nfsserver/nfs_nfsdserv.c projects/release-pkg/sys/fs/nfsserver/nfs_nfsdsocket.c projects/release-pkg/sys/fs/nfsserver/nfs_nfsdsubs.c projects/release-pkg/sys/fs/smbfs/smbfs_io.c projects/release-pkg/sys/fs/smbfs/smbfs_subr.c projects/release-pkg/sys/fs/smbfs/smbfs_vnops.c projects/release-pkg/sys/fs/tmpfs/tmpfs_subr.c projects/release-pkg/sys/fs/unionfs/union_subr.c projects/release-pkg/sys/geom/eli/g_eli.c projects/release-pkg/sys/geom/eli/g_eli.h projects/release-pkg/sys/geom/eli/g_eli_ctl.c projects/release-pkg/sys/geom/raid/md_promise.c projects/release-pkg/sys/geom/sched/g_sched.c projects/release-pkg/sys/kern/kern_cpuset.c projects/release-pkg/sys/kern/kern_physio.c projects/release-pkg/sys/kern/kern_racct.c projects/release-pkg/sys/kern/kern_rctl.c projects/release-pkg/sys/kern/link_elf_obj.c projects/release-pkg/sys/kern/subr_bus.c projects/release-pkg/sys/kern/subr_hash.c projects/release-pkg/sys/kern/subr_intr.c projects/release-pkg/sys/kern/subr_smp.c projects/release-pkg/sys/kern/subr_trap.c projects/release-pkg/sys/kern/vfs_bio.c projects/release-pkg/sys/kern/vfs_cluster.c projects/release-pkg/sys/kern/vfs_vnops.c projects/release-pkg/sys/kgssapi/gss_impl.c projects/release-pkg/sys/mips/mips/db_disasm.c projects/release-pkg/sys/mips/mips/db_trace.c projects/release-pkg/sys/mips/mips/mips_pic.c projects/release-pkg/sys/mips/mips/nexus.c projects/release-pkg/sys/mips/mips/ofw_machdep.c projects/release-pkg/sys/modules/cxgbe/if_cxgbe/Makefile projects/release-pkg/sys/modules/kbdmux/Makefile projects/release-pkg/sys/net/bpf.c projects/release-pkg/sys/net/bpf.h projects/release-pkg/sys/net/if.c projects/release-pkg/sys/net/if_gif.c projects/release-pkg/sys/net/if_gre.c projects/release-pkg/sys/net80211/ieee80211_adhoc.c projects/release-pkg/sys/net80211/ieee80211_ht.c projects/release-pkg/sys/net80211/ieee80211_node.c projects/release-pkg/sys/net80211/ieee80211_node.h projects/release-pkg/sys/net80211/ieee80211_sta.c projects/release-pkg/sys/netgraph/netflow/ng_netflow.c projects/release-pkg/sys/netgraph/ng_base.c projects/release-pkg/sys/netgraph/ng_ipfw.c projects/release-pkg/sys/netgraph/ng_nat.c projects/release-pkg/sys/netinet/ip_divert.c projects/release-pkg/sys/netinet/raw_ip.c projects/release-pkg/sys/netinet/sctp.h projects/release-pkg/sys/netinet/sctp_constants.h projects/release-pkg/sys/netinet/sctp_dtrace_define.h projects/release-pkg/sys/netinet/sctp_header.h projects/release-pkg/sys/netinet/sctp_indata.c projects/release-pkg/sys/netinet/sctp_indata.h projects/release-pkg/sys/netinet/sctp_input.c projects/release-pkg/sys/netinet/sctp_output.c projects/release-pkg/sys/netinet/sctp_pcb.c projects/release-pkg/sys/netinet/sctp_pcb.h projects/release-pkg/sys/netinet/sctp_structs.h projects/release-pkg/sys/netinet/sctp_uio.h projects/release-pkg/sys/netinet/sctp_usrreq.c projects/release-pkg/sys/netinet/sctp_var.h projects/release-pkg/sys/netinet/sctputil.c projects/release-pkg/sys/netinet/sctputil.h projects/release-pkg/sys/netinet/tcp_fastopen.c projects/release-pkg/sys/netinet/tcp_subr.c projects/release-pkg/sys/netinet/tcp_syncache.c projects/release-pkg/sys/netinet6/in6_src.c projects/release-pkg/sys/netpfil/ipfw/ip_fw_sockopt.c projects/release-pkg/sys/netsmb/smb_subr.c projects/release-pkg/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/release-pkg/sys/ofed/drivers/net/mlx4/cmd.c projects/release-pkg/sys/ofed/drivers/net/mlx4/eq.c projects/release-pkg/sys/pc98/cbus/olpt.c projects/release-pkg/sys/powerpc/booke/pmap.c projects/release-pkg/sys/powerpc/include/vmparam.h projects/release-pkg/sys/powerpc/ofw/ofw_pcibus.c projects/release-pkg/sys/powerpc/powermac/fcu.c projects/release-pkg/sys/powerpc/powermac/pmu.c projects/release-pkg/sys/powerpc/powermac/smu.c projects/release-pkg/sys/rpc/clnt_bck.c projects/release-pkg/sys/security/audit/audit_syscalls.c projects/release-pkg/sys/sparc64/include/bus.h projects/release-pkg/sys/sparc64/pci/ofw_pcibus.c projects/release-pkg/sys/sparc64/sparc64/db_disasm.c projects/release-pkg/sys/sys/bus.h projects/release-pkg/sys/sys/elf_common.h projects/release-pkg/sys/sys/intr.h projects/release-pkg/sys/sys/proc.h projects/release-pkg/sys/sys/racct.h projects/release-pkg/sys/sys/rctl.h projects/release-pkg/sys/ufs/ffs/ffs_alloc.c projects/release-pkg/sys/ufs/ffs/ffs_inode.c projects/release-pkg/sys/ufs/ffs/ffs_snapshot.c projects/release-pkg/sys/ufs/ffs/ffs_softdep.c projects/release-pkg/sys/ufs/ufs/ufs_bmap.c projects/release-pkg/sys/ufs/ufs/ufs_lookup.c projects/release-pkg/sys/vm/vm_domain.c projects/release-pkg/sys/vm/vm_fault.c projects/release-pkg/sys/vm/vm_pageout.c projects/release-pkg/sys/vm/vm_phys.c projects/release-pkg/sys/vm/vm_phys.h projects/release-pkg/sys/x86/acpica/srat.c projects/release-pkg/sys/x86/cpufreq/smist.c projects/release-pkg/sys/x86/x86/local_apic.c projects/release-pkg/sys/x86/xen/xen_apic.c projects/release-pkg/tools/tools/nanobsd/defaults.sh projects/release-pkg/tools/tools/net80211/wlanstats/wlanstats.c projects/release-pkg/usr.bin/calendar/calendars/calendar.freebsd projects/release-pkg/usr.bin/rctl/rctl.8 projects/release-pkg/usr.bin/uuencode/uuencode.1 projects/release-pkg/usr.bin/uuencode/uuencode.c projects/release-pkg/usr.bin/whois/whois.c projects/release-pkg/usr.sbin/bhyve/Makefile projects/release-pkg/usr.sbin/bsdinstall/scripts/zfsboot projects/release-pkg/usr.sbin/etcupdate/tests/tzsetup_test.sh projects/release-pkg/usr.sbin/lpr/chkprintcap/chkprintcap.c projects/release-pkg/usr.sbin/lpr/common_source/common.c projects/release-pkg/usr.sbin/lpr/common_source/net.c projects/release-pkg/usr.sbin/lpr/common_source/printcap.c projects/release-pkg/usr.sbin/lpr/common_source/request.c projects/release-pkg/usr.sbin/lpr/common_source/rmjob.c projects/release-pkg/usr.sbin/lpr/lpc/lpc.c projects/release-pkg/usr.sbin/lpr/lpd/printjob.c Directory Properties: projects/release-pkg/ (props changed) projects/release-pkg/cddl/ (props changed) projects/release-pkg/cddl/contrib/opensolaris/ (props changed) projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/release-pkg/lib/libc/ (props changed) projects/release-pkg/lib/libedit/ (props changed) projects/release-pkg/sbin/ (props changed) projects/release-pkg/sys/ (props changed) projects/release-pkg/sys/amd64/vmm/ (props changed) projects/release-pkg/sys/boot/ (props changed) projects/release-pkg/sys/cddl/contrib/opensolaris/ (props changed) projects/release-pkg/sys/conf/ (props changed) projects/release-pkg/sys/contrib/ipfilter/ (props changed) projects/release-pkg/sys/dev/hyperv/ (props changed) projects/release-pkg/usr.bin/calendar/ (props changed) projects/release-pkg/usr.sbin/bhyve/ (props changed) Modified: projects/release-pkg/bin/csh/config_p.h ============================================================================== --- projects/release-pkg/bin/csh/config_p.h Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/bin/csh/config_p.h Mon Apr 11 15:24:59 2016 (r297824) @@ -34,7 +34,8 @@ * Note that some machines eg. rs6000 have a vfork, but not * with the berkeley semantics, so we cannot use it there either. */ -#define VFORK +/* #define VFORK */ +#define vfork fork /* * BSDJOBS You have BSD-style job control (both process groups and @@ -80,7 +81,6 @@ /****************** local defines *********************/ #if defined(__FreeBSD__) -#define SAVESIGVEC #define NLS_BUGS #define BSD_STYLE_COLORLS /* Use LC_MESSAGES locale category to open the message catalog */ Modified: projects/release-pkg/bin/sh/miscbltin.c ============================================================================== --- projects/release-pkg/bin/sh/miscbltin.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/bin/sh/miscbltin.c Mon Apr 11 15:24:59 2016 (r297824) @@ -341,7 +341,7 @@ umaskcmd(int argc __unused, char **argv } else { void *set; INTOFF; - if ((set = setmode (ap)) == 0) + if ((set = setmode (ap)) == NULL) error("Illegal number: %s", ap); mask = getmode (set, ~mask & 0777); Modified: projects/release-pkg/bin/sh/parser.c ============================================================================== --- projects/release-pkg/bin/sh/parser.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/bin/sh/parser.c Mon Apr 11 15:24:59 2016 (r297824) @@ -628,7 +628,7 @@ simplecmd(union node **rpp, union node * /* If we don't have any redirections already, then we must reset */ /* rpp to be the address of the local redir variable. */ - if (redir == 0) + if (redir == NULL) rpp = &redir; args = NULL; Modified: projects/release-pkg/bin/sh/tests/builtins/getopts1.0 ============================================================================== --- projects/release-pkg/bin/sh/tests/builtins/getopts1.0 Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/bin/sh/tests/builtins/getopts1.0 Mon Apr 11 15:24:59 2016 (r297824) @@ -3,7 +3,7 @@ printf -- '-1-\n' set -- -abc getopts "ab:" OPTION -echo ${OPTION} +printf '%s\n' "${OPTION}" # In this case 'getopts' should realize that we have not provided the # required argument for "-b". @@ -14,12 +14,12 @@ echo ${OPTION} printf -- '-2-\n' set -- -ab getopts "ab:" OPTION -echo ${OPTION} +printf '%s\n' "${OPTION}" getopts "ab:" OPTION 3>&2 2>&1 >&3 3>&- -echo ${OPTION} +printf '%s\n' "${OPTION}" # The 'shift' is aimed at causing an error. printf -- '-3-\n' shift 1 getopts "ab:" OPTION -echo ${OPTION} +printf '%s\n' "${OPTION}" Modified: projects/release-pkg/bin/sh/tests/builtins/getopts2.0 ============================================================================== --- projects/release-pkg/bin/sh/tests/builtins/getopts2.0 Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/bin/sh/tests/builtins/getopts2.0 Mon Apr 11 15:24:59 2016 (r297824) @@ -3,4 +3,4 @@ set - -ax getopts ax option set -C getopts ax option -echo $option +printf '%s\n' "$option" Modified: projects/release-pkg/bin/sh/tests/builtins/getopts9.0 ============================================================================== --- projects/release-pkg/bin/sh/tests/builtins/getopts9.0 Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/bin/sh/tests/builtins/getopts9.0 Mon Apr 11 15:24:59 2016 (r297824) @@ -2,8 +2,8 @@ args='-ab' getopts ab opt $args -echo $?:$opt:$OPTARG +printf '%s\n' "$?:$opt:$OPTARG" for dummy in dummy1 dummy2; do getopts ab opt $args - echo $?:$opt:$OPTARG + printf '%s\n' "$?:$opt:$OPTARG" done Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c ============================================================================== --- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c Mon Apr 11 15:24:59 2016 (r297824) @@ -50,6 +50,9 @@ #ifdef illumos #include <libproc.h> #endif +#ifdef __FreeBSD__ +#include <spawn.h> +#endif typedef struct dtrace_cmd { void (*dc_func)(struct dtrace_cmd *); /* function to compile arg */ @@ -397,7 +400,41 @@ dof_prune(const char *fname) free(buf); } -#ifdef illumos +#ifdef __FreeBSD__ +/* + * Use nextboot(8) to tell the loader to load DTrace kernel modules during + * the next boot of the system. The nextboot(8) configuration is removed during + * boot, so it will not persist indefinitely. + */ +static void +bootdof_add(void) +{ + char * const nbargv[] = { + "nextboot", "-a", + "-e", "dtraceall_load=\"YES\"", + "-e", "dtrace_dof_load=\"YES\"", + "-e", "dtrace_dof_name=\"/boot/dtrace.dof\"", + "-e", "dtrace_dof_type=\"dtrace_dof\"", + NULL, + }; + pid_t child; + int err, status; + + err = posix_spawnp(&child, "nextboot", NULL, NULL, nbargv, + NULL); + if (err != 0) { + error("failed to execute nextboot: %s", strerror(err)); + exit(E_ERROR); + } + + if (waitpid(child, &status, 0) != child) + fatal("waiting for nextboot"); + if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { + error("nextboot returned with status %d", status); + exit(E_ERROR); + } +} +#else static void etcsystem_prune(void) { @@ -508,7 +545,7 @@ etcsystem_add(void) error("added forceload directives to %s\n", g_ofile); } -#endif /* illumos */ +#endif /* !__FreeBSD__ */ static void print_probe_info(const dtrace_probeinfo_t *p) @@ -643,24 +680,24 @@ anon_prog(const dtrace_cmd_t *dcp, dof_h p = (uchar_t *)dof; q = p + dof->dofh_loadsz; -#ifdef illumos - oprintf("dof-data-%d=0x%x", n, *p++); - - while (p < q) - oprintf(",0x%x", *p++); - - oprintf(";\n"); -#else +#ifdef __FreeBSD__ /* - * On FreeBSD, the DOF data is handled as a kernel environment (kenv) - * string. We use two hex characters per DOF byte. + * On FreeBSD, the DOF file is read directly during boot - just write + * two hex characters per byte. */ - oprintf("dof-data-%d=%02x", n, *p++); + oprintf("dof-data-%d=", n); while (p < q) oprintf("%02x", *p++); oprintf("\n"); +#else + oprintf("dof-data-%d=0x%x", n, *p++); + + while (p < q) + oprintf(",0x%x", *p++); + + oprintf(";\n"); #endif dtrace_dof_destroy(g_dtp, dof); @@ -1725,8 +1762,7 @@ main(int argc, char *argv[]) #else /* * On FreeBSD, anonymous DOF data is written to - * the DTrace DOF file that the boot loader will - * read if booting with the DTrace option. + * the DTrace DOF file. */ g_ofile = "/boot/dtrace.dof"; #endif @@ -1765,7 +1801,10 @@ main(int argc, char *argv[]) * that itself contains a #pragma D option quiet. */ error("saved anonymous enabling in %s\n", g_ofile); -#ifdef illumos + +#ifdef __FreeBSD__ + bootdof_add(); +#else etcsystem_add(); error("run update_drv(1M) or reboot to enable changes\n"); #endif Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- projects/release-pkg/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Apr 11 15:24:59 2016 (r297824) @@ -2156,10 +2156,11 @@ dump_label(const char *dev) uint64_t psize, ashift; int len = strlen(dev) + 1; - if (strncmp(dev, "/dev/dsk/", 9) == 0) { + if (strncmp(dev, ZFS_DISK_ROOTD, strlen(ZFS_DISK_ROOTD)) == 0) { len++; path = malloc(len); - (void) snprintf(path, len, "%s%s", "/dev/rdsk/", dev + 9); + (void) snprintf(path, len, "%s%s", ZFS_RDISK_ROOTD, + dev + strlen(ZFS_DISK_ROOTD)); } else { path = strdup(dev); } Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Mon Apr 11 15:24:59 2016 (r297824) @@ -21,12 +21,12 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright (c) 2012 by Frederik Wessels. All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved. * Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>. + * Copyright 2016 Nexenta Systems, Inc. */ #include <solaris.h> @@ -626,7 +626,10 @@ zpool_do_remove(int argc, char **argv) } /* - * zpool labelclear <vdev> + * zpool labelclear [-f] <vdev> + * + * -f Force clearing the label for the vdevs which are members of + * the exported or foreign pools. * * Verifies that the vdev is not active and zeros out the label information * on the device. @@ -634,8 +637,11 @@ zpool_do_remove(int argc, char **argv) int zpool_do_labelclear(int argc, char **argv) { - char *vdev, *name; - int c, fd = -1, ret = 0; + char vdev[MAXPATHLEN]; + char *name = NULL; + struct stat st; + int c, fd, ret = 0; + nvlist_t *config; pool_state_t state; boolean_t inuse = B_FALSE; boolean_t force = B_FALSE; @@ -658,88 +664,110 @@ zpool_do_labelclear(int argc, char **arg /* get vdev name */ if (argc < 1) { - (void) fprintf(stderr, gettext("missing vdev device name\n")); + (void) fprintf(stderr, gettext("missing vdev name\n")); usage(B_FALSE); } + if (argc > 1) { + (void) fprintf(stderr, gettext("too many arguments\n")); + usage(B_FALSE); + } + + /* + * Check if we were given absolute path and use it as is. + * Otherwise if the provided vdev name doesn't point to a file, + * try prepending dsk path and appending s0. + */ + (void) strlcpy(vdev, argv[0], sizeof (vdev)); + if (vdev[0] != '/' && stat(vdev, &st) != 0) { + char *s; + + (void) snprintf(vdev, sizeof (vdev), "%s/%s", +#ifdef illumos + ZFS_DISK_ROOT, argv[0]); + if ((s = strrchr(argv[0], 's')) == NULL || + !isdigit(*(s + 1))) + (void) strlcat(vdev, "s0", sizeof (vdev)); +#else + "/dev", argv[0]); +#endif + if (stat(vdev, &st) != 0) { + (void) fprintf(stderr, gettext( + "failed to find device %s, try specifying absolute " + "path instead\n"), argv[0]); + return (1); + } + } - vdev = argv[0]; if ((fd = open(vdev, O_RDWR)) < 0) { - (void) fprintf(stderr, gettext("Unable to open %s\n"), vdev); - return (B_FALSE); + (void) fprintf(stderr, gettext("failed to open %s: %s\n"), + vdev, strerror(errno)); + return (1); } - name = NULL; - if (zpool_in_use(g_zfs, fd, &state, &name, &inuse) != 0) { - if (force) - goto wipe_label; - + if (zpool_read_label(fd, &config) != 0 || config == NULL) { (void) fprintf(stderr, - gettext("Unable to determine pool state for %s\n" - "Use -f to force the clearing any label data\n"), vdev); - + gettext("failed to read label from %s\n"), vdev); return (1); } + nvlist_free(config); - if (inuse) { - switch (state) { - default: - case POOL_STATE_ACTIVE: - case POOL_STATE_SPARE: - case POOL_STATE_L2CACHE: - (void) fprintf(stderr, -gettext("labelclear operation failed.\n" - "\tVdev %s is a member (%s), of pool \"%s\".\n" - "\tTo remove label information from this device, export or destroy\n" - "\tthe pool, or remove %s from the configuration of this pool\n" - "\tand retry the labelclear operation\n"), - vdev, zpool_pool_state_to_name(state), name, vdev); - ret = 1; - goto errout; - - case POOL_STATE_EXPORTED: - if (force) - break; + ret = zpool_in_use(g_zfs, fd, &state, &name, &inuse); + if (ret != 0) { + (void) fprintf(stderr, + gettext("failed to check state for %s\n"), vdev); + return (1); + } - (void) fprintf(stderr, -gettext("labelclear operation failed.\n" - "\tVdev %s is a member of the exported pool \"%s\".\n" - "\tUse \"zpool labelclear -f %s\" to force the removal of label\n" - "\tinformation.\n"), - vdev, name, vdev); - ret = 1; - goto errout; + if (!inuse) + goto wipe_label; - case POOL_STATE_POTENTIALLY_ACTIVE: - if (force) - break; + switch (state) { + default: + case POOL_STATE_ACTIVE: + case POOL_STATE_SPARE: + case POOL_STATE_L2CACHE: + (void) fprintf(stderr, gettext( + "%s is a member (%s) of pool \"%s\"\n"), + vdev, zpool_pool_state_to_name(state), name); + ret = 1; + goto errout; - (void) fprintf(stderr, -gettext("labelclear operation failed.\n" - "\tVdev %s is a member of the pool \"%s\".\n" - "\tThis pool is unknown to this system, but may be active on\n" - "\tanother system. Use \'zpool labelclear -f %s\' to force the\n" - "\tremoval of label information.\n"), - vdev, name, vdev); - ret = 1; - goto errout; + case POOL_STATE_EXPORTED: + if (force) + break; + (void) fprintf(stderr, gettext( + "use '-f' to override the following error:\n" + "%s is a member of exported pool \"%s\"\n"), + vdev, name); + ret = 1; + goto errout; - case POOL_STATE_DESTROYED: - /* inuse should never be set for a destoryed pool... */ + case POOL_STATE_POTENTIALLY_ACTIVE: + if (force) break; - } + (void) fprintf(stderr, gettext( + "use '-f' to override the following error:\n" + "%s is a member of potentially active pool \"%s\"\n"), + vdev, name); + ret = 1; + goto errout; + + case POOL_STATE_DESTROYED: + /* inuse should never be set for a destroyed pool */ + assert(0); + break; } wipe_label: - if (zpool_clear_label(fd) != 0) { + ret = zpool_clear_label(fd); + if (ret != 0) { (void) fprintf(stderr, - gettext("Label clear failed on vdev %s\n"), vdev); - ret = 1; + gettext("failed to clear label for %s\n"), vdev); } errout: - close(fd); - if (name != NULL) - free(name); + free(name); + (void) close(fd); return (ret); } Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c ============================================================================== --- projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Mon Apr 11 15:24:59 2016 (r297824) @@ -79,8 +79,6 @@ #include "zpool_util.h" -#define DISK_ROOT "/dev/dsk" -#define RDISK_ROOT "/dev/rdsk" #define BACKUP_SLICE "s2" /* @@ -384,7 +382,7 @@ is_whole_disk(const char *arg) char path[MAXPATHLEN]; (void) snprintf(path, sizeof (path), "%s%s%s", - RDISK_ROOT, strrchr(arg, '/'), BACKUP_SLICE); + ZFS_RDISK_ROOT, strrchr(arg, '/'), BACKUP_SLICE); if ((fd = open(path, O_RDWR | O_NDELAY)) < 0) return (B_FALSE); if (efi_alloc_and_init(fd, EFI_NUMPAR, &label) != 0) { Modified: projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c ============================================================================== --- projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Mon Apr 11 15:24:59 2016 (r297824) @@ -20,10 +20,10 @@ */ /* - * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright 2015 RackTop Systems. + * Copyright 2016 Nexenta Systems, Inc. */ /* @@ -1099,9 +1099,7 @@ zpool_open_func(void *arg) } /* - * Given a file descriptor, clear (zero) the label information. This function - * is used in the appliance stack as part of the ZFS sysevent module and - * to implement the "zpool labelclear" command. + * Given a file descriptor, clear (zero) the label information. */ int zpool_clear_label(int fd) @@ -1168,7 +1166,7 @@ zpool_find_import_impl(libzfs_handle_t * */ for (i = 0; i < dirs; i++) { tpool_t *t; - char *rdsk; + char rdsk[MAXPATHLEN]; int dfd; boolean_t config_failed = B_FALSE; DIR *dirp; @@ -1184,15 +1182,17 @@ zpool_find_import_impl(libzfs_handle_t * *end = 0; pathleft = &path[sizeof (path)] - end; +#ifdef illumos /* * Using raw devices instead of block devices when we're * reading the labels skips a bunch of slow operations during * close(2) processing, so we replace /dev/dsk with /dev/rdsk. */ - if (strcmp(path, "/dev/dsk/") == 0) - rdsk = "/dev/"; + if (strcmp(path, ZFS_DISK_ROOTD) == 0) + (void) strlcpy(rdsk, ZFS_RDISK_ROOTD, sizeof (rdsk)); else - rdsk = path; +#endif + (void) strlcpy(rdsk, path, sizeof (rdsk)); if ((dfd = open64(rdsk, O_RDONLY)) < 0 || (dirp = fdopendir(dfd)) == NULL) { Modified: projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c ============================================================================== --- projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Mon Apr 11 15:24:59 2016 (r297824) @@ -20,10 +20,10 @@ */ /* - * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright 2016 Nexenta Systems, Inc. */ #include <sys/types.h> @@ -49,8 +49,6 @@ static int read_efi_label(nvlist_t *config, diskaddr_t *sb); -#define DISK_ROOT "/dev/dsk" -#define RDISK_ROOT "/dev/rdsk" #define BACKUP_SLICE "s2" typedef struct prop_flags { @@ -2345,7 +2343,7 @@ zpool_relabel_disk(libzfs_handle_t *hdl, "efi_use_whole_disk")) == NULL) return (-1); - (void) snprintf(path, sizeof (path), "%s/%s", RDISK_ROOT, name); + (void) snprintf(path, sizeof (path), "%s/%s", ZFS_RDISK_ROOT, name); if ((fd = open(path, O_RDWR | O_NDELAY)) < 0) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "cannot " @@ -2421,7 +2419,7 @@ zpool_vdev_online(zpool_handle_t *zhp, c } if (wholedisk) { - pathname += strlen(DISK_ROOT) + 1; + pathname += strlen(ZFS_DISK_ROOT) + 1; (void) zpool_relabel_disk(hdl, pathname); } } @@ -3411,8 +3409,8 @@ zpool_vdev_name(libzfs_handle_t *hdl, zp } #ifdef illumos - if (strncmp(path, "/dev/dsk/", 9) == 0) - path += 9; + if (strncmp(path, ZFS_DISK_ROOTD, strlen(ZFS_DISK_ROOTD)) == 0) + path += strlen(ZFS_DISK_ROOTD); if (nvlist_lookup_uint64(nv, ZPOOL_CONFIG_WHOLE_DISK, &value) == 0 && value) { @@ -3846,7 +3844,7 @@ read_efi_label(nvlist_t *config, diskadd if (nvlist_lookup_string(config, ZPOOL_CONFIG_PATH, &path) != 0) return (err); - (void) snprintf(diskname, sizeof (diskname), "%s%s", RDISK_ROOT, + (void) snprintf(diskname, sizeof (diskname), "%s%s", ZFS_RDISK_ROOT, strrchr(path, '/')); if ((fd = open(diskname, O_RDONLY|O_NDELAY)) >= 0) { struct dk_gpt *vtoc; @@ -3931,7 +3929,7 @@ zpool_label_disk(libzfs_handle_t *hdl, z start_block = NEW_START_BLOCK; } - (void) snprintf(path, sizeof (path), "%s/%s%s", RDISK_ROOT, name, + (void) snprintf(path, sizeof (path), "%s/%s%s", ZFS_RDISK_ROOT, name, BACKUP_SLICE); if ((fd = open(path, O_RDWR | O_NDELAY)) < 0) { Modified: projects/release-pkg/contrib/netbsd-tests/lib/libc/sys/t_gettimeofday.c ============================================================================== --- projects/release-pkg/contrib/netbsd-tests/lib/libc/sys/t_gettimeofday.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/contrib/netbsd-tests/lib/libc/sys/t_gettimeofday.c Mon Apr 11 15:24:59 2016 (r297824) @@ -46,9 +46,11 @@ ATF_TC_HEAD(gettimeofday_err, tc) ATF_TC_BODY(gettimeofday_err, tc) { +#ifdef __NetBSD__ errno = 0; ATF_REQUIRE_ERRNO(EFAULT, gettimeofday((void *)-1, NULL) != 0); +#endif } ATF_TC(gettimeofday_mono); Modified: projects/release-pkg/lib/libc/aarch64/gen/Makefile.inc ============================================================================== --- projects/release-pkg/lib/libc/aarch64/gen/Makefile.inc Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/aarch64/gen/Makefile.inc Mon Apr 11 15:24:59 2016 (r297824) @@ -1,5 +1,7 @@ # $FreeBSD$ +CFLAGS+= -DNO_COMPAT7 + SRCS+= _ctx_start.S \ fabs.S \ flt_rounds.c \ Modified: projects/release-pkg/lib/libc/aarch64/sys/Makefile.inc ============================================================================== --- projects/release-pkg/lib/libc/aarch64/sys/Makefile.inc Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/aarch64/sys/Makefile.inc Mon Apr 11 15:24:59 2016 (r297824) @@ -1,5 +1,7 @@ # $FreeBSD$ +MIASM:= ${MIASM:Nfreebsd[467]_*} + SRCS+= __vdso_gettc.c #MDASM= ptrace.S Modified: projects/release-pkg/lib/libc/db/hash/hash.c ============================================================================== --- projects/release-pkg/lib/libc/db/hash/hash.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/db/hash/hash.c Mon Apr 11 15:24:59 2016 (r297824) @@ -423,7 +423,8 @@ hdestroy(HTAB *hashp) free(hashp->tmp_buf); if (hashp->fp != -1) { - (void)_fsync(hashp->fp); + if (hashp->save_file) + (void)_fsync(hashp->fp); (void)_close(hashp->fp); } @@ -770,7 +771,7 @@ next_bucket: if (__big_keydata(hashp, bufp, key, data, 1)) return (ERROR); } else { - if (hashp->cpage == 0) + if (hashp->cpage == NULL) return (ERROR); key->data = (u_char *)hashp->cpage->page + bp[ndx]; key->size = (ndx > 1 ? bp[ndx - 1] : hashp->BSIZE) - bp[ndx]; Modified: projects/release-pkg/lib/libc/db/hash/hash_buf.c ============================================================================== --- projects/release-pkg/lib/libc/db/hash/hash_buf.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/db/hash/hash_buf.c Mon Apr 11 15:24:59 2016 (r297824) @@ -245,7 +245,7 @@ newbuf(HTAB *hashp, u_int32_t addr, BUFH */ for (xbp = bp; xbp->ovfl;) { next_xbp = xbp->ovfl; - xbp->ovfl = 0; + xbp->ovfl = NULL; xbp = next_xbp; /* Check that ovfl pointer is up date. */ @@ -350,7 +350,7 @@ __buf_free(HTAB *hashp, int do_free, int void __reclaim_buf(HTAB *hashp, BUFHEAD *bp) { - bp->ovfl = 0; + bp->ovfl = NULL; bp->addr = 0; bp->flags = 0; BUF_REMOVE(bp); Modified: projects/release-pkg/lib/libc/gen/err.c ============================================================================== --- projects/release-pkg/lib/libc/gen/err.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/gen/err.c Mon Apr 11 15:24:59 2016 (r297824) @@ -96,7 +96,7 @@ errc(int eval, int code, const char *fmt void verrc(int eval, int code, const char *fmt, va_list ap) { - if (err_file == 0) + if (err_file == NULL) err_set_file((FILE *)0); fprintf(err_file, "%s: ", _getprogname()); if (fmt != NULL) { @@ -121,7 +121,7 @@ errx(int eval, const char *fmt, ...) void verrx(int eval, const char *fmt, va_list ap) { - if (err_file == 0) + if (err_file == NULL) err_set_file((FILE *)0); fprintf(err_file, "%s: ", _getprogname()); if (fmt != NULL) @@ -161,7 +161,7 @@ warnc(int code, const char *fmt, ...) void vwarnc(int code, const char *fmt, va_list ap) { - if (err_file == 0) + if (err_file == NULL) err_set_file((FILE *)0); fprintf(err_file, "%s: ", _getprogname()); if (fmt != NULL) { @@ -183,7 +183,7 @@ warnx(const char *fmt, ...) void vwarnx(const char *fmt, va_list ap) { - if (err_file == 0) + if (err_file == NULL) err_set_file((FILE *)0); fprintf(err_file, "%s: ", _getprogname()); if (fmt != NULL) Modified: projects/release-pkg/lib/libc/gen/getmntinfo.c ============================================================================== --- projects/release-pkg/lib/libc/gen/getmntinfo.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/gen/getmntinfo.c Mon Apr 11 15:24:59 2016 (r297824) @@ -56,7 +56,7 @@ getmntinfo(struct statfs **mntbufp, int if (mntbuf) free(mntbuf); bufsize = (mntsize + 1) * sizeof(struct statfs); - if ((mntbuf = (struct statfs *)malloc(bufsize)) == 0) + if ((mntbuf = malloc(bufsize)) == NULL) return (0); if ((mntsize = getfsstat(mntbuf, bufsize, flags)) < 0) return (0); Modified: projects/release-pkg/lib/libc/gen/opendir.c ============================================================================== --- projects/release-pkg/lib/libc/gen/opendir.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/gen/opendir.c Mon Apr 11 15:24:59 2016 (r297824) @@ -209,7 +209,7 @@ _filldir(DIR *dirp, bool use_current_pos * On the second pass, save pointers to each one. * Then sort the pointers and remove duplicate names. */ - for (dpv = 0;;) { + for (dpv = NULL;;) { n = 0; ddptr = buf; while (ddptr < ddeptr) { Modified: projects/release-pkg/lib/libc/gen/semctl.c ============================================================================== --- projects/release-pkg/lib/libc/gen/semctl.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/gen/semctl.c Mon Apr 11 15:24:59 2016 (r297824) @@ -29,7 +29,9 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#ifndef NO_COMPAT7 #define _WANT_SEMUN_OLD +#endif #include <sys/types.h> #include <sys/ipc.h> @@ -38,8 +40,10 @@ __FBSDID("$FreeBSD$"); #include <stdlib.h> int __semctl(int semid, int semnum, int cmd, union semun *arg); +#ifndef NO_COMPAT7 int freebsd7___semctl(int semid, int semnum, int cmd, union semun_old *arg); int freebsd7_semctl(int semid, int semnum, int cmd, ...); +#endif int semctl(int semid, int semnum, int cmd, ...) @@ -61,6 +65,7 @@ semctl(int semid, int semnum, int cmd, . return (__semctl(semid, semnum, cmd, semun_ptr)); } +#ifndef NO_COMPAT7 int freebsd7_semctl(int semid, int semnum, int cmd, ...) { @@ -82,3 +87,4 @@ freebsd7_semctl(int semid, int semnum, i } __sym_compat(semctl, freebsd7_semctl, FBSD_1.0); +#endif Modified: projects/release-pkg/lib/libc/gen/tls.c ============================================================================== --- projects/release-pkg/lib/libc/gen/tls.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/gen/tls.c Mon Apr 11 15:24:59 2016 (r297824) @@ -285,7 +285,7 @@ _init_tls(void) while (*sp++ != 0) ; aux = (Elf_Auxinfo *) sp; - phdr = 0; + phdr = NULL; phent = phnum = 0; for (auxp = aux; auxp->a_type != AT_NULL; auxp++) { switch (auxp->a_type) { @@ -302,7 +302,7 @@ _init_tls(void) break; } } - if (phdr == 0 || phent != sizeof(Elf_Phdr) || phnum == 0) + if (phdr == NULL || phent != sizeof(Elf_Phdr) || phnum == 0) return; for (i = 0; (unsigned) i < phnum; i++) { Modified: projects/release-pkg/lib/libc/include/compat.h ============================================================================== --- projects/release-pkg/lib/libc/include/compat.h Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/include/compat.h Mon Apr 11 15:24:59 2016 (r297824) @@ -38,9 +38,11 @@ #define __sym_compat(sym,impl,verid) \ .symver impl, sym@verid +#ifndef NO_COMPAT7 __sym_compat(__semctl, freebsd7___semctl, FBSD_1.0); __sym_compat(msgctl, freebsd7_msgctl, FBSD_1.0); __sym_compat(shmctl, freebsd7_shmctl, FBSD_1.0); +#endif #undef __sym_compat Modified: projects/release-pkg/lib/libc/locale/xlocale_private.h ============================================================================== --- projects/release-pkg/lib/libc/locale/xlocale_private.h Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/locale/xlocale_private.h Mon Apr 11 15:24:59 2016 (r297824) @@ -155,12 +155,11 @@ __attribute__((unused)) static void xlocale_release(void *val) { struct xlocale_refcounted *obj = val; - long count = atomic_fetchadd_long(&(obj->retain_count), -1) - 1; - if (count < 0) { - if (0 != obj->destructor) { - obj->destructor(obj); - } - } + long count; + + count = atomic_fetchadd_long(&(obj->retain_count), -1) - 1; + if (count < 0 && obj->destructor != NULL) + obj->destructor(obj); } /** Modified: projects/release-pkg/lib/libc/net/base64.c ============================================================================== --- projects/release-pkg/lib/libc/net/base64.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/net/base64.c Mon Apr 11 15:24:59 2016 (r297824) @@ -210,7 +210,7 @@ b64_pton(const char *src, u_char *target break; pos = strchr(Base64, ch); - if (pos == 0) /* A non-base64 character. */ + if (pos == NULL) /* A non-base64 character. */ return (-1); switch (state) { Modified: projects/release-pkg/lib/libc/net/getifaddrs.c ============================================================================== --- projects/release-pkg/lib/libc/net/getifaddrs.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/net/getifaddrs.c Mon Apr 11 15:24:59 2016 (r297824) @@ -85,7 +85,7 @@ getifaddrs(struct ifaddrs **pif) size_t needed; char *buf; char *next; - struct ifaddrs *cif = 0; + struct ifaddrs *cif; char *p, *p0; struct rt_msghdr *rtm; struct if_msghdrl *ifm; @@ -214,6 +214,7 @@ getifaddrs(struct ifaddrs **pif) ift = ifa; idx = 0; + cif = NULL; for (next = buf; next < buf + needed; next += rtm->rtm_msglen) { rtm = (struct rt_msghdr *)(void *)next; if (rtm->rtm_version != RTM_VERSION) Modified: projects/release-pkg/lib/libc/net/getservent.c ============================================================================== --- projects/release-pkg/lib/libc/net/getservent.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/net/getservent.c Mon Apr 11 15:24:59 2016 (r297824) @@ -406,14 +406,14 @@ files_servent(void *retval, void *mdata, continue; gotname: - if (proto == 0 || strcmp(serv->s_proto, proto) == 0) + if (proto == NULL || strcmp(serv->s_proto, proto) == 0) rv = NS_SUCCESS; break; case nss_lt_id: if (port != serv->s_port) continue; - if (proto == 0 || strcmp(serv->s_proto, proto) == 0) + if (proto == NULL || strcmp(serv->s_proto, proto) == 0) rv = NS_SUCCESS; break; case nss_lt_all: Modified: projects/release-pkg/lib/libc/net/rcmd.c ============================================================================== --- projects/release-pkg/lib/libc/net/rcmd.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/net/rcmd.c Mon Apr 11 15:24:59 2016 (r297824) @@ -207,7 +207,7 @@ rcmd_af(char **ahost, int rport, const c } } lport--; - if (fd2p == 0) { + if (fd2p == NULL) { _write(s, "", 1); lport = 0; } else { Modified: projects/release-pkg/lib/libc/posix1e/acl_support_nfs4.c ============================================================================== --- projects/release-pkg/lib/libc/posix1e/acl_support_nfs4.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/posix1e/acl_support_nfs4.c Mon Apr 11 15:24:59 2016 (r297824) @@ -81,7 +81,7 @@ static const char * format_flag(uint32_t *var, const struct flagnames_struct *flags) { - for (; flags->name != 0; flags++) { + for (; flags->name != NULL; flags++) { if ((flags->flag & *var) == 0) continue; Modified: projects/release-pkg/lib/libc/resolv/mtctxres.c ============================================================================== --- projects/release-pkg/lib/libc/resolv/mtctxres.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/resolv/mtctxres.c Mon Apr 11 15:24:59 2016 (r297824) @@ -75,7 +75,7 @@ __res_init_ctx(void) { return (0); } - if ((mt = malloc(sizeof (mtctxres_t))) == 0) { + if ((mt = malloc(sizeof(mtctxres_t))) == NULL) { errno = ENOMEM; return (-1); } @@ -94,10 +94,7 @@ __res_init_ctx(void) { static void __res_destroy_ctx(void *value) { - mtctxres_t *mt = (mtctxres_t *)value; - - if (mt != 0) - free(mt); + free(value); } #endif @@ -130,9 +127,9 @@ ___mtctxres(void) { * that fails return a global context. */ if (mt_key_initialized) { - if (((mt = pthread_getspecific(key)) != 0) || + if (((mt = pthread_getspecific(key)) != NULL) || (__res_init_ctx() == 0 && - (mt = pthread_getspecific(key)) != 0)) { + (mt = pthread_getspecific(key)) != NULL)) { return (mt); } } Modified: projects/release-pkg/lib/libc/resolv/res_init.c ============================================================================== --- projects/release-pkg/lib/libc/resolv/res_init.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/resolv/res_init.c Mon Apr 11 15:24:59 2016 (r297824) @@ -315,7 +315,7 @@ __res_vinit(res_state statp, int preinit while (*cp != '\0' && *cp != ' ' && *cp != '\t' && *cp != '\n') cp++; *cp = '\0'; - *pp++ = 0; + *pp++ = NULL; } #define MATCH(line, name) \ @@ -391,7 +391,7 @@ __res_vinit(res_state statp, int preinit while (*cp != '\0' && *cp != ' ' && *cp != '\t') cp++; *cp = '\0'; - *pp++ = 0; + *pp++ = NULL; havesearch = 1; continue; } Modified: projects/release-pkg/lib/libc/resolv/res_mkupdate.c ============================================================================== --- projects/release-pkg/lib/libc/resolv/res_mkupdate.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/resolv/res_mkupdate.c Mon Apr 11 15:24:59 2016 (r297824) @@ -1175,7 +1175,7 @@ res_protocolname(int num) { if (protolist == (struct valuelist *)0) res_buildprotolist(); pp = cgetprotobynumber(num); - if (pp == 0) { + if (pp == NULL) { (void) sprintf(number, "%d", num); return (number); } @@ -1190,7 +1190,7 @@ res_servicename(u_int16_t port, const ch if (servicelist == (struct valuelist *)0) res_buildservicelist(); ss = cgetservbyport(htons(port), proto); - if (ss == 0) { + if (ss == NULL) { (void) sprintf(number, "%d", port); return (number); } Modified: projects/release-pkg/lib/libc/rpc/auth_none.c ============================================================================== --- projects/release-pkg/lib/libc/rpc/auth_none.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/rpc/auth_none.c Mon Apr 11 15:24:59 2016 (r297824) @@ -83,9 +83,9 @@ authnone_create(void) XDR *xdrs; mutex_lock(&authnone_lock); - if (ap == 0) { - ap = (struct authnone_private *)calloc(1, sizeof (*ap)); - if (ap == 0) { + if (ap == NULL) { + ap = calloc(1, sizeof (*ap)); + if (ap == NULL) { mutex_unlock(&authnone_lock); return (0); } Modified: projects/release-pkg/lib/libc/rpc/clnt_perror.c ============================================================================== --- projects/release-pkg/lib/libc/rpc/clnt_perror.c Mon Apr 11 14:45:36 2016 (r297823) +++ projects/release-pkg/lib/libc/rpc/clnt_perror.c Mon Apr 11 15:24:59 2016 (r297824) @@ -64,8 +64,8 @@ static char * _buf(void) { - if (buf == 0) - buf = (char *)malloc(CLNT_PERROR_BUFLEN); + if (buf == NULL) + buf = malloc(CLNT_PERROR_BUFLEN); return (buf); } @@ -85,7 +85,7 @@ clnt_sperror(CLIENT *rpch, const char *s assert(s != NULL); str = _buf(); /* side effect: sets CLNT_PERROR_BUFLEN */ - if (str == 0) + if (str == NULL) return (0); len = CLNT_PERROR_BUFLEN; strstart = str; @@ -240,7 +240,7 @@ clnt_spcreateerror(const char *s) assert(s != NULL); str = _buf(); /* side effect: sets CLNT_PERROR_BUFLEN */ - if (str == 0) + if (str == NULL) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604111524.u3BFOxpt092539>