Date: Mon, 3 Oct 2016 15:14:59 +0000 (UTC) From: Sean Bruno <sbruno@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306643 - in projects/mips64-clang: . bin/chio bin/chmod bin/ed bin/kill contrib/atf/atf-sh contrib/blacklist/bin contrib/dma contrib/libucl contrib/libucl/haskell contrib/libucl/includ... Message-ID: <201610031514.u93FExdU070113@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sbruno Date: Mon Oct 3 15:14:58 2016 New Revision: 306643 URL: https://svnweb.freebsd.org/changeset/base/306643 Log: MFC r306637 Added: projects/mips64-clang/contrib/libucl/haskell/ - copied from r306637, head/contrib/libucl/haskell/ projects/mips64-clang/contrib/libucl/m4/gcov.m4 - copied unchanged from r306637, head/contrib/libucl/m4/gcov.m4 projects/mips64-clang/contrib/libucl/python/tests/ - copied from r306637, head/contrib/libucl/python/tests/ projects/mips64-clang/contrib/unbound/contrib/ - copied from r306637, head/contrib/unbound/contrib/ projects/mips64-clang/lib/librss/ - copied from r306637, head/lib/librss/ projects/mips64-clang/share/man/man4/mlx4en.4 - copied unchanged from r306637, head/share/man/man4/mlx4en.4 projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c - copied unchanged from r306637, head/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2836_mp.h - copied unchanged from r306637, head/sys/arm/broadcom/bcm2835/bcm2836_mp.h projects/mips64-clang/sys/dev/mlx4/ - copied from r306637, head/sys/dev/mlx4/ projects/mips64-clang/sys/modules/dtb/nvidia/ - copied from r306637, head/sys/modules/dtb/nvidia/ projects/mips64-clang/sys/modules/evdev/ - copied from r306637, head/sys/modules/evdev/ projects/mips64-clang/sys/modules/mlx4en/ - copied from r306637, head/sys/modules/mlx4en/ projects/mips64-clang/sys/modules/rpi_ft5406/ - copied from r306637, head/sys/modules/rpi_ft5406/ projects/mips64-clang/sys/modules/uinput/ - copied from r306637, head/sys/modules/uinput/ Deleted: projects/mips64-clang/contrib/libucl/python/test.sh projects/mips64-clang/contrib/libucl/python/test_uclmodule.py projects/mips64-clang/sys/dev/hyperv/stordisengage/ projects/mips64-clang/sys/modules/hyperv/stordisengage/ projects/mips64-clang/sys/modules/mlxen/ projects/mips64-clang/sys/ofed/drivers/infiniband/hw/mlx4/ projects/mips64-clang/sys/ofed/drivers/net/ projects/mips64-clang/sys/ofed/include/linux/ Modified: projects/mips64-clang/.arcconfig projects/mips64-clang/bin/chio/chio.1 projects/mips64-clang/bin/chmod/chmod.c projects/mips64-clang/bin/ed/ed.1 projects/mips64-clang/bin/kill/kill.1 projects/mips64-clang/contrib/atf/atf-sh/atf-check.cpp projects/mips64-clang/contrib/blacklist/bin/blacklistd.8 projects/mips64-clang/contrib/blacklist/bin/blacklistd.c projects/mips64-clang/contrib/blacklist/bin/state.c projects/mips64-clang/contrib/dma/dma-mbox-create.c projects/mips64-clang/contrib/libucl/CMakeLists.txt projects/mips64-clang/contrib/libucl/Makefile.unix projects/mips64-clang/contrib/libucl/Makefile.w32 projects/mips64-clang/contrib/libucl/README.md projects/mips64-clang/contrib/libucl/include/ucl++.h projects/mips64-clang/contrib/libucl/include/ucl.h projects/mips64-clang/contrib/libucl/python/setup.py projects/mips64-clang/contrib/libucl/python/src/uclmodule.c projects/mips64-clang/contrib/libucl/src/ucl_parser.c projects/mips64-clang/contrib/libucl/src/ucl_schema.c projects/mips64-clang/contrib/libucl/src/ucl_util.c projects/mips64-clang/contrib/libucl/tests/schema/patternProperties.json projects/mips64-clang/contrib/libucl/tests/schema/refRemote.json projects/mips64-clang/contrib/unbound/Makefile.in projects/mips64-clang/contrib/unbound/acx_python.m4 projects/mips64-clang/contrib/unbound/compat/arc4random.c projects/mips64-clang/contrib/unbound/compat/getentropy_linux.c projects/mips64-clang/contrib/unbound/config.h projects/mips64-clang/contrib/unbound/config.h.in projects/mips64-clang/contrib/unbound/configure projects/mips64-clang/contrib/unbound/configure.ac projects/mips64-clang/contrib/unbound/daemon/acl_list.c projects/mips64-clang/contrib/unbound/daemon/acl_list.h projects/mips64-clang/contrib/unbound/daemon/daemon.c projects/mips64-clang/contrib/unbound/daemon/remote.c projects/mips64-clang/contrib/unbound/daemon/remote.h projects/mips64-clang/contrib/unbound/daemon/unbound.c projects/mips64-clang/contrib/unbound/daemon/worker.c projects/mips64-clang/contrib/unbound/dns64/dns64.c projects/mips64-clang/contrib/unbound/doc/Changelog projects/mips64-clang/contrib/unbound/doc/README projects/mips64-clang/contrib/unbound/doc/example.conf projects/mips64-clang/contrib/unbound/doc/example.conf.in projects/mips64-clang/contrib/unbound/doc/libunbound.3 projects/mips64-clang/contrib/unbound/doc/libunbound.3.in projects/mips64-clang/contrib/unbound/doc/unbound-anchor.8 projects/mips64-clang/contrib/unbound/doc/unbound-anchor.8.in projects/mips64-clang/contrib/unbound/doc/unbound-checkconf.8 projects/mips64-clang/contrib/unbound/doc/unbound-checkconf.8.in projects/mips64-clang/contrib/unbound/doc/unbound-control.8 projects/mips64-clang/contrib/unbound/doc/unbound-control.8.in projects/mips64-clang/contrib/unbound/doc/unbound-host.1 projects/mips64-clang/contrib/unbound/doc/unbound-host.1.in projects/mips64-clang/contrib/unbound/doc/unbound.8 projects/mips64-clang/contrib/unbound/doc/unbound.8.in projects/mips64-clang/contrib/unbound/doc/unbound.conf.5 projects/mips64-clang/contrib/unbound/doc/unbound.conf.5.in projects/mips64-clang/contrib/unbound/doc/unbound.doxygen projects/mips64-clang/contrib/unbound/iterator/iter_hints.c projects/mips64-clang/contrib/unbound/iterator/iter_utils.c projects/mips64-clang/contrib/unbound/iterator/iterator.c projects/mips64-clang/contrib/unbound/iterator/iterator.h projects/mips64-clang/contrib/unbound/libunbound/libworker.c projects/mips64-clang/contrib/unbound/services/listen_dnsport.c projects/mips64-clang/contrib/unbound/services/localzone.c projects/mips64-clang/contrib/unbound/services/localzone.h projects/mips64-clang/contrib/unbound/services/mesh.c projects/mips64-clang/contrib/unbound/services/outside_network.c projects/mips64-clang/contrib/unbound/services/outside_network.h projects/mips64-clang/contrib/unbound/sldns/keyraw.c projects/mips64-clang/contrib/unbound/sldns/rrdef.h projects/mips64-clang/contrib/unbound/sldns/wire2str.h projects/mips64-clang/contrib/unbound/smallapp/unbound-anchor.c projects/mips64-clang/contrib/unbound/smallapp/unbound-checkconf.c projects/mips64-clang/contrib/unbound/smallapp/unbound-control.c projects/mips64-clang/contrib/unbound/smallapp/unbound-host.c projects/mips64-clang/contrib/unbound/smallapp/worker_cb.c projects/mips64-clang/contrib/unbound/util/alloc.c projects/mips64-clang/contrib/unbound/util/config_file.c projects/mips64-clang/contrib/unbound/util/config_file.h projects/mips64-clang/contrib/unbound/util/configlexer.lex projects/mips64-clang/contrib/unbound/util/configparser.y projects/mips64-clang/contrib/unbound/util/iana_ports.inc projects/mips64-clang/contrib/unbound/util/net_help.c projects/mips64-clang/contrib/unbound/util/netevent.c projects/mips64-clang/contrib/unbound/util/netevent.h projects/mips64-clang/contrib/unbound/util/storage/dnstree.c projects/mips64-clang/contrib/unbound/util/storage/dnstree.h projects/mips64-clang/contrib/unbound/util/storage/lookup3.c projects/mips64-clang/contrib/unbound/util/ub_event.c projects/mips64-clang/contrib/unbound/util/ub_event_pluggable.c projects/mips64-clang/contrib/unbound/util/winsock_event.c projects/mips64-clang/contrib/unbound/validator/autotrust.c projects/mips64-clang/contrib/unbound/validator/val_secalgo.c projects/mips64-clang/contrib/unbound/validator/val_sigcrypt.c projects/mips64-clang/contrib/unbound/validator/validator.c projects/mips64-clang/include/mqueue.h projects/mips64-clang/include/stdio.h projects/mips64-clang/include/time.h projects/mips64-clang/lib/Makefile projects/mips64-clang/lib/libc/gen/arc4random.c projects/mips64-clang/lib/libc/sys/cap_enter.2 projects/mips64-clang/lib/libc/sys/getrlimit.2 projects/mips64-clang/lib/libc/sys/open.2 projects/mips64-clang/lib/libc/sys/sigaction.2 projects/mips64-clang/lib/libc/sys/thr_suspend.2 projects/mips64-clang/lib/libjail/jail.c projects/mips64-clang/lib/librt/Symbol.map projects/mips64-clang/lib/librt/mq.c projects/mips64-clang/lib/librt/timer.c projects/mips64-clang/lib/libstand/cd9660.c projects/mips64-clang/lib/msun/src/e_coshl.c projects/mips64-clang/lib/msun/src/e_sinhl.c projects/mips64-clang/lib/msun/src/s_tanhl.c projects/mips64-clang/sbin/ccdconfig/ccdconfig.8 projects/mips64-clang/sbin/dmesg/dmesg.8 projects/mips64-clang/sbin/dump/dump.8 projects/mips64-clang/sbin/dumpon/dumpon.8 projects/mips64-clang/sbin/etherswitchcfg/etherswitchcfg.8 projects/mips64-clang/sbin/fsck_msdosfs/fsck_msdosfs.8 projects/mips64-clang/sbin/fsdb/fsdb.8 projects/mips64-clang/sbin/gbde/gbde.8 projects/mips64-clang/sbin/init/init.8 projects/mips64-clang/sbin/mknod/mknod.8 projects/mips64-clang/sbin/mksnap_ffs/mksnap_ffs.8 projects/mips64-clang/sbin/mount_fusefs/mount_fusefs.8 projects/mips64-clang/sbin/mount_msdosfs/mount_msdosfs.8 projects/mips64-clang/sbin/mount_nullfs/mount_nullfs.8 projects/mips64-clang/sbin/mount_unionfs/mount_unionfs.8 projects/mips64-clang/sbin/pfctl/pfctl.8 projects/mips64-clang/sbin/sconfig/sconfig.8 projects/mips64-clang/sbin/setkey/setkey.8 projects/mips64-clang/sbin/shutdown/shutdown.8 projects/mips64-clang/sbin/swapon/swapon.8 projects/mips64-clang/share/man/man4/Makefile projects/mips64-clang/share/man/man9/sysctl.9 projects/mips64-clang/share/man/man9/taskqueue.9 projects/mips64-clang/share/misc/bsd-family-tree projects/mips64-clang/share/misc/committers-doc.dot projects/mips64-clang/share/mk/src.opts.mk projects/mips64-clang/sys/amd64/conf/NOTES projects/mips64-clang/sys/arm/allwinner/a10_ahci.c projects/mips64-clang/sys/arm/arm/cpufunc.c projects/mips64-clang/sys/arm/arm/vm_machdep.c projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2835_systimer.c projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2836_mp.c projects/mips64-clang/sys/arm/broadcom/bcm2835/files.bcm283x projects/mips64-clang/sys/arm/conf/BEAGLEBONE projects/mips64-clang/sys/arm/conf/GENERIC projects/mips64-clang/sys/arm/conf/RPI-B projects/mips64-clang/sys/arm/conf/RPI2 projects/mips64-clang/sys/arm/conf/TEGRA124 projects/mips64-clang/sys/arm/include/armreg.h projects/mips64-clang/sys/arm/include/platformvar.h projects/mips64-clang/sys/arm/nvidia/as3722.c projects/mips64-clang/sys/arm/nvidia/tegra124/files.tegra124 projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_car.c projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_clk_pll.c projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_coretemp.c projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_cpufreq.c projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_machdep.c projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_pmc.c projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c projects/mips64-clang/sys/arm/nvidia/tegra_abpmisc.c projects/mips64-clang/sys/arm/nvidia/tegra_ahci.c projects/mips64-clang/sys/arm/nvidia/tegra_efuse.c projects/mips64-clang/sys/arm/nvidia/tegra_ehci.c projects/mips64-clang/sys/arm/nvidia/tegra_gpio.c projects/mips64-clang/sys/arm/nvidia/tegra_i2c.c projects/mips64-clang/sys/arm/nvidia/tegra_lic.c projects/mips64-clang/sys/arm/nvidia/tegra_pcie.c projects/mips64-clang/sys/arm/nvidia/tegra_pinmux.c projects/mips64-clang/sys/arm/nvidia/tegra_rtc.c projects/mips64-clang/sys/arm/nvidia/tegra_sdhci.c projects/mips64-clang/sys/arm/nvidia/tegra_soctherm.c projects/mips64-clang/sys/arm/nvidia/tegra_usbphy.c projects/mips64-clang/sys/arm/ti/cpsw/if_cpsw.c projects/mips64-clang/sys/arm/ti/ti_adc.c projects/mips64-clang/sys/arm/ti/ti_adcvar.h projects/mips64-clang/sys/boot/efi/loader/main.c projects/mips64-clang/sys/boot/fdt/dts/arm/rpi.dts projects/mips64-clang/sys/boot/fdt/dts/arm/rpi2.dts projects/mips64-clang/sys/cam/cam_iosched.c projects/mips64-clang/sys/cam/cam_periph.c projects/mips64-clang/sys/cam/cam_periph.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/mips64-clang/sys/cddl/dev/fbt/arm/fbt_isa.c projects/mips64-clang/sys/cddl/dev/fbt/fbt.c projects/mips64-clang/sys/cddl/dev/fbt/powerpc/fbt_isa.c projects/mips64-clang/sys/cddl/dev/fbt/x86/fbt_isa.c projects/mips64-clang/sys/compat/linuxkpi/common/include/linux/pci.h projects/mips64-clang/sys/conf/NOTES projects/mips64-clang/sys/conf/files projects/mips64-clang/sys/conf/files.amd64 projects/mips64-clang/sys/conf/files.i386 projects/mips64-clang/sys/conf/options projects/mips64-clang/sys/contrib/ipfilter/netinet/fil.c projects/mips64-clang/sys/contrib/ipfilter/netinet/ip_compat.h projects/mips64-clang/sys/dev/atkbdc/psm.c projects/mips64-clang/sys/dev/bwi/if_bwi.c projects/mips64-clang/sys/dev/bwn/if_bwn.c projects/mips64-clang/sys/dev/bxe/bxe.c projects/mips64-clang/sys/dev/bxe/bxe.h projects/mips64-clang/sys/dev/bxe/bxe_stats.h projects/mips64-clang/sys/dev/cxgbe/cxgbei/cxgbei.c projects/mips64-clang/sys/dev/cxgbe/t4_main.c projects/mips64-clang/sys/dev/cxgbe/tom/t4_cpl_io.c projects/mips64-clang/sys/dev/evdev/evdev.c projects/mips64-clang/sys/dev/evdev/uinput.c projects/mips64-clang/sys/dev/fb/fbd.c projects/mips64-clang/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/mips64-clang/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/mips64-clang/sys/dev/hyperv/netvsc/hv_rndis_filter.c projects/mips64-clang/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/mips64-clang/sys/dev/iicbus/iicbus.c projects/mips64-clang/sys/dev/iwm/if_iwm.c projects/mips64-clang/sys/dev/iwm/if_iwmvar.h projects/mips64-clang/sys/dev/iwn/if_iwn.c projects/mips64-clang/sys/dev/iwn/if_iwnvar.h projects/mips64-clang/sys/dev/lmc/if_lmc.c projects/mips64-clang/sys/dev/mlx5/mlx5_en/mlx5_en_main.c projects/mips64-clang/sys/dev/otus/if_otus.c projects/mips64-clang/sys/dev/otus/if_otusreg.h projects/mips64-clang/sys/dev/qlxgbe/ql_boot.c projects/mips64-clang/sys/dev/qlxgbe/ql_fw.c projects/mips64-clang/sys/dev/qlxgbe/ql_minidump.c projects/mips64-clang/sys/dev/qlxgbe/ql_reset.c projects/mips64-clang/sys/dev/ral/if_ral_pci.c projects/mips64-clang/sys/dev/ral/rt2560.c projects/mips64-clang/sys/dev/ral/rt2560var.h projects/mips64-clang/sys/dev/ral/rt2661.c projects/mips64-clang/sys/dev/ral/rt2661var.h projects/mips64-clang/sys/dev/ral/rt2860.c projects/mips64-clang/sys/dev/ral/rt2860var.h projects/mips64-clang/sys/dev/urtwn/if_urtwn.c projects/mips64-clang/sys/dev/urtwn/if_urtwnreg.h projects/mips64-clang/sys/dev/urtwn/if_urtwnvar.h projects/mips64-clang/sys/dev/usb/input/ukbd.c projects/mips64-clang/sys/dev/usb/input/ums.c projects/mips64-clang/sys/dev/usb/serial/u3g.c projects/mips64-clang/sys/dev/usb/usbdevs projects/mips64-clang/sys/dev/usb/wlan/if_rum.c projects/mips64-clang/sys/dev/usb/wlan/if_rumvar.h projects/mips64-clang/sys/dev/usb/wlan/if_run.c projects/mips64-clang/sys/dev/usb/wlan/if_runvar.h projects/mips64-clang/sys/dev/usb/wlan/if_ural.c projects/mips64-clang/sys/dev/usb/wlan/if_uralvar.h projects/mips64-clang/sys/dev/usb/wlan/if_zyd.c projects/mips64-clang/sys/dev/usb/wlan/if_zydreg.h projects/mips64-clang/sys/dev/wpi/if_wpi.c projects/mips64-clang/sys/dev/wpi/if_wpivar.h projects/mips64-clang/sys/fs/nandfs/nandfs_subr.c projects/mips64-clang/sys/i386/conf/NOTES projects/mips64-clang/sys/kern/kern_mib.c projects/mips64-clang/sys/kern/subr_taskqueue.c projects/mips64-clang/sys/kern/vfs_bio.c projects/mips64-clang/sys/kern/vfs_cache.c projects/mips64-clang/sys/kern/vfs_mount.c projects/mips64-clang/sys/kern/vfs_subr.c projects/mips64-clang/sys/modules/Makefile projects/mips64-clang/sys/modules/hyperv/Makefile projects/mips64-clang/sys/modules/hyperv/vmbus/Makefile projects/mips64-clang/sys/modules/mlx4/Makefile projects/mips64-clang/sys/modules/mlx4ib/Makefile projects/mips64-clang/sys/net/if_var.h projects/mips64-clang/sys/net/rndis.h projects/mips64-clang/sys/net80211/ieee80211_amrr.c projects/mips64-clang/sys/net80211/ieee80211_node.c projects/mips64-clang/sys/net80211/ieee80211_node.h projects/mips64-clang/sys/net80211/ieee80211_ratectl.h projects/mips64-clang/sys/net80211/ieee80211_ratectl_none.c projects/mips64-clang/sys/net80211/ieee80211_rssadapt.c projects/mips64-clang/sys/net80211/ieee80211_scan_sw.c projects/mips64-clang/sys/netinet/if_ether.c projects/mips64-clang/sys/netinet/in.c projects/mips64-clang/sys/netinet/in_var.h projects/mips64-clang/sys/netinet/tcp_hostcache.c projects/mips64-clang/sys/netinet/tcp_input.c projects/mips64-clang/sys/netinet/tcp_syncache.c projects/mips64-clang/sys/netinet/udp_usrreq.c projects/mips64-clang/sys/netinet6/icmp6.c projects/mips64-clang/sys/netinet6/nd6_nbr.c projects/mips64-clang/sys/sys/bufobj.h projects/mips64-clang/sys/sys/errno.h projects/mips64-clang/sys/sys/fbio.h projects/mips64-clang/sys/sys/mount.h projects/mips64-clang/sys/sys/param.h projects/mips64-clang/sys/sys/sysctl.h projects/mips64-clang/sys/sys/vnode.h projects/mips64-clang/sys/ufs/ffs/ffs_snapshot.c projects/mips64-clang/sys/ufs/ffs/ffs_vfsops.c projects/mips64-clang/sys/vm/vm_init.c projects/mips64-clang/sys/x86/x86/io_apic.c projects/mips64-clang/sys/xen/interface/io/libxenvchan.h projects/mips64-clang/tests/sys/mqueue/Makefile projects/mips64-clang/tests/sys/mqueue/mqtest3.c projects/mips64-clang/tests/sys/mqueue/mqtest4.c projects/mips64-clang/usr.bin/kdump/kdump.c projects/mips64-clang/usr.bin/mkimg/apm.c projects/mips64-clang/usr.bin/mkimg/bsd.c projects/mips64-clang/usr.bin/mkimg/ebr.c projects/mips64-clang/usr.bin/mkimg/format.c projects/mips64-clang/usr.bin/mkimg/gpt.c projects/mips64-clang/usr.bin/mkimg/image.c projects/mips64-clang/usr.bin/mkimg/mbr.c projects/mips64-clang/usr.bin/mkimg/mkimg.c projects/mips64-clang/usr.bin/mkimg/mkimg.h projects/mips64-clang/usr.bin/mkimg/pc98.c projects/mips64-clang/usr.bin/mkimg/qcow.c projects/mips64-clang/usr.bin/mkimg/raw.c projects/mips64-clang/usr.bin/mkimg/scheme.c projects/mips64-clang/usr.bin/mkimg/vhd.c projects/mips64-clang/usr.bin/mkimg/vmdk.c projects/mips64-clang/usr.bin/mkimg/vtoc8.c projects/mips64-clang/usr.bin/patch/common.h projects/mips64-clang/usr.bin/primes/primes.c projects/mips64-clang/usr.sbin/bhyve/dbgport.c projects/mips64-clang/usr.sbin/crunch/crunchgen/crunchgen.c projects/mips64-clang/usr.sbin/portsnap/portsnap/portsnap.sh projects/mips64-clang/usr.sbin/rtsold/rtsol.c projects/mips64-clang/usr.sbin/sesutil/sesutil.c Directory Properties: projects/mips64-clang/ (props changed) projects/mips64-clang/contrib/atf/ (props changed) projects/mips64-clang/contrib/dma/ (props changed) projects/mips64-clang/contrib/libucl/ (props changed) projects/mips64-clang/contrib/unbound/ (props changed) projects/mips64-clang/lib/libc/locale/ascii.c (props changed) projects/mips64-clang/sys/cddl/contrib/opensolaris/ (props changed) projects/mips64-clang/sys/contrib/ipfilter/ (props changed) Modified: projects/mips64-clang/.arcconfig ============================================================================== --- projects/mips64-clang/.arcconfig Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/.arcconfig Mon Oct 3 15:14:58 2016 (r306643) @@ -1,5 +1,4 @@ { - "repository.callsign" : "S", "phabricator.uri" : "https://reviews.freebsd.org/", "history.immutable" : true } Modified: projects/mips64-clang/bin/chio/chio.1 ============================================================================== --- projects/mips64-clang/bin/chio/chio.1 Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/bin/chio/chio.1 Mon Oct 3 15:14:58 2016 (r306643) @@ -32,7 +32,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 14, 1998 +.Dd October 2, 2016 .Dt CHIO 1 .Os .Sh NAME @@ -61,10 +61,6 @@ rather than the default device .Pa /dev/ch0 . .El .Pp -The default changer may be overridden by setting the environment variable -.Ev CHANGER -to the desired changer device. -.Pp A medium changer apparatus is made up of .Em elements . There are five element types: @@ -265,6 +261,12 @@ Element supports passing media (exportin .It INENAB Element supports receiving media (importing) from an outside human operator. .El +.Sh ENVIRONMENT +.Bl -tag -width CHANGER +.It Ev CHANGER +The default changer may be overridden by setting this environmental +variable to the desired changer device. +.El .Sh FILES .Bl -tag -width /dev/ch0 -compact .It Pa /dev/ch0 Modified: projects/mips64-clang/bin/chmod/chmod.c ============================================================================== --- projects/mips64-clang/bin/chmod/chmod.c Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/bin/chmod/chmod.c Mon Oct 3 15:14:58 2016 (r306643) @@ -91,12 +91,11 @@ main(int argc, char *argv[]) break; case 'h': /* - * In System V (and probably POSIX.2) the -h option - * causes chmod to change the mode of the symbolic - * link. 4.4BSD's symbolic links didn't have modes, - * so it was an undocumented noop. In FreeBSD 3.0, - * lchmod(2) is introduced and this option does real - * work. + * In System V the -h option causes chmod to change + * the mode of the symbolic link. 4.4BSD's symbolic + * links didn't have modes, so it was an undocumented + * noop. In FreeBSD 3.0, lchmod(2) is introduced and + * this option does real work. */ hflag = 1; break; Modified: projects/mips64-clang/bin/ed/ed.1 ============================================================================== --- projects/mips64-clang/bin/ed/ed.1 Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/bin/ed/ed.1 Mon Oct 3 15:14:58 2016 (r306643) @@ -1,5 +1,5 @@ .\" $FreeBSD$ -.Dd July 3, 2004 +.Dd October 2, 2016 .Dt ED 1 .Os .Sh NAME @@ -998,7 +998,7 @@ per line overhead: 4 ints An .Nm command appeared in -Version 1 AT&T UNIX. +.At v1 . .Sh BUGS The .Nm Modified: projects/mips64-clang/bin/kill/kill.1 ============================================================================== --- projects/mips64-clang/bin/kill/kill.1 Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/bin/kill/kill.1 Mon Oct 3 15:14:58 2016 (r306643) @@ -32,7 +32,7 @@ .\" @(#)kill.1 8.2 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd April 28, 1995 +.Dd October 3, 2016 .Dt KILL 1 .Os .Sh NAME @@ -147,7 +147,8 @@ compatible. A .Nm command appeared in -.At v3 . +.At v3 +in section 8 of the manual. .Sh BUGS A replacement for the command .Dq Li kill 0 Modified: projects/mips64-clang/contrib/atf/atf-sh/atf-check.cpp ============================================================================== --- projects/mips64-clang/contrib/atf/atf-sh/atf-check.cpp Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/atf/atf-sh/atf-check.cpp Mon Oct 3 15:14:58 2016 (r306643) @@ -346,9 +346,10 @@ std::auto_ptr< atf::check::check_result execute_with_shell(char* const* argv) { const std::string cmd = flatten_argv(argv); + const std::string shell = atf::env::get("ATF_SHELL", ATF_SHELL); const char* sh_argv[4]; - sh_argv[0] = atf::env::get("ATF_SHELL", ATF_SHELL).c_str(); + sh_argv[0] = shell.c_str(); sh_argv[1] = "-c"; sh_argv[2] = cmd.c_str(); sh_argv[3] = NULL; Modified: projects/mips64-clang/contrib/blacklist/bin/blacklistd.8 ============================================================================== --- projects/mips64-clang/contrib/blacklist/bin/blacklistd.8 Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/blacklist/bin/blacklistd.8 Mon Oct 3 15:14:58 2016 (r306643) @@ -1,4 +1,4 @@ -.\" $NetBSD: blacklistd.8,v 1.15 2016/03/11 17:16:40 christos Exp $ +.\" $NetBSD: blacklistd.8,v 1.18 2016/07/30 06:09:29 dholland Exp $ .\" .\" Copyright (c) 2015 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -47,7 +47,7 @@ .Nm is a daemon similar to .Xr syslogd 8 -that listens to a sockets at paths specified in the +that listens to sockets at paths specified in the .Ar sockpathsfile for notifications from other daemons about successful or failed connection attempts. @@ -218,7 +218,8 @@ Socket to receive connection notificatio .Nm first appeared in .Nx 7 . -.Fx support for +.Fx +support for .Nm was implemented in .Fx 11 . Modified: projects/mips64-clang/contrib/blacklist/bin/blacklistd.c ============================================================================== --- projects/mips64-clang/contrib/blacklist/bin/blacklistd.c Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/blacklist/bin/blacklistd.c Mon Oct 3 15:14:58 2016 (r306643) @@ -1,4 +1,4 @@ -/* $NetBSD: blacklistd.c,v 1.34 2016/04/04 15:52:56 christos Exp $ */ +/* $NetBSD: blacklistd.c,v 1.35 2016/09/26 19:43:43 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include "config.h" #endif #include <sys/cdefs.h> -__RCSID("$NetBSD: blacklistd.c,v 1.34 2016/04/04 15:52:56 christos Exp $"); +__RCSID("$NetBSD: blacklistd.c,v 1.35 2016/09/26 19:43:43 christos Exp $"); #include <sys/types.h> #include <sys/socket.h> @@ -473,9 +473,6 @@ main(int argc, char *argv[]) flags |= O_TRUNC; } - if (restore) - rules_restore(); - struct pollfd *pfd = NULL; bl_t *bl = NULL; size_t nfd = 0; @@ -500,6 +497,9 @@ main(int argc, char *argv[]) if (state == NULL) return EXIT_FAILURE; + if (restore) + rules_restore(); + if (!debug) { if (daemon(0, 0) == -1) err(EXIT_FAILURE, "daemon failed"); Modified: projects/mips64-clang/contrib/blacklist/bin/state.c ============================================================================== --- projects/mips64-clang/contrib/blacklist/bin/state.c Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/blacklist/bin/state.c Mon Oct 3 15:14:58 2016 (r306643) @@ -1,4 +1,4 @@ -/* $NetBSD: state.c,v 1.18 2016/04/04 15:52:56 christos Exp $ */ +/* $NetBSD: state.c,v 1.19 2016/09/26 19:43:43 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #endif #include <sys/cdefs.h> -__RCSID("$NetBSD: state.c,v 1.18 2016/04/04 15:52:56 christos Exp $"); +__RCSID("$NetBSD: state.c,v 1.19 2016/09/26 19:43:43 christos Exp $"); #include <sys/types.h> #include <sys/socket.h> @@ -200,8 +200,10 @@ state_iterate(DB *db, struct conf *c, st int rv; DBT k, v; - if (db == NULL) + if (db == NULL) { + (*lfun)(LOG_ERR, "%s: called with no database file", __func__); return -1; + } first = first ? R_FIRST : R_NEXT; Modified: projects/mips64-clang/contrib/dma/dma-mbox-create.c ============================================================================== --- projects/mips64-clang/contrib/dma/dma-mbox-create.c Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/dma/dma-mbox-create.c Mon Oct 3 15:14:58 2016 (r306643) @@ -89,9 +89,7 @@ main(int argc, char **argv) struct group *gr; uid_t user_uid; gid_t mail_gid; - int error; - char fn[PATH_MAX+1]; - int f; + int f, maildirfd; openlog("dma-mbox-create", 0, LOG_MAIL); @@ -131,26 +129,22 @@ main(int argc, char **argv) if (!pw) logfail(EX_NOUSER, "cannot find user `%s'", user); - user_uid = pw->pw_uid; + maildirfd = open(_PATH_MAILDIR, O_RDONLY); + if (maildirfd < 0) + logfail(EX_NOINPUT, "cannot open maildir %s", _PATH_MAILDIR); - error = snprintf(fn, sizeof(fn), "%s/%s", _PATH_MAILDIR, user); - if (error < 0 || (size_t)error >= sizeof(fn)) { - if (error >= 0) { - errno = 0; - logfail(EX_USAGE, "mbox path too long"); - } - logfail(EX_CANTCREAT, "cannot build mbox path for `%s/%s'", _PATH_MAILDIR, user); - } + user_uid = pw->pw_uid; - f = open(fn, O_RDONLY|O_CREAT|O_NOFOLLOW, 0600); + f = openat(maildirfd, user, O_RDONLY|O_CREAT|O_NOFOLLOW, 0600); if (f < 0) - logfail(EX_NOINPUT, "cannt open mbox `%s'", fn); + logfail(EX_NOINPUT, "cannot open mbox `%s'", user); if (fchown(f, user_uid, mail_gid)) - logfail(EX_OSERR, "cannot change owner of mbox `%s'", fn); + logfail(EX_OSERR, "cannot change owner of mbox `%s'", user); if (fchmod(f, 0620)) - logfail(EX_OSERR, "cannot change permissions of mbox `%s'", fn); + logfail(EX_OSERR, "cannot change permissions of mbox `%s'", + user); /* file should be present with the right owner and permissions */ Modified: projects/mips64-clang/contrib/libucl/CMakeLists.txt ============================================================================== --- projects/mips64-clang/contrib/libucl/CMakeLists.txt Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/CMakeLists.txt Mon Oct 3 15:14:58 2016 (r306643) @@ -205,8 +205,7 @@ SET(UCLSRC src/ucl_util.c src/ucl_hash.c src/ucl_schema.c src/ucl_msgpack.c - src/ucl_sexp.c - src/xxhash.c) + src/ucl_sexp.c) SET (LIB_TYPE STATIC) Modified: projects/mips64-clang/contrib/libucl/Makefile.unix ============================================================================== --- projects/mips64-clang/contrib/libucl/Makefile.unix Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/Makefile.unix Mon Oct 3 15:14:58 2016 (r306643) @@ -1,7 +1,7 @@ CC ?= gcc DESTDIR ?= /usr/local LD ?= gcc -C_COMMON_FLAGS ?= -fPIC -Wall -W -Wno-unused-parameter -Wno-pointer-sign -I./include -I./uthash -I./src +C_COMMON_FLAGS ?= -fPIC -Wall -W -Wno-unused-parameter -Wno-pointer-sign -I./include -I./uthash -I./src -I./klib MAJOR_VERSION = 0 MINOR_VERSION = 2 PATCH_VERSION = 9 @@ -25,13 +25,12 @@ HDEPS = $(SRCDIR)/ucl_hash.h \ $(SRCDIR)/ucl_chartable.h \ $(SRCDIR)/ucl_internal.h \ $(INCLUDEDIR)/ucl.h \ - $(SRCDIR)/xxhash.h + $(SRCDIR)/mum.h OBJECTS = $(OBJDIR)/ucl_hash.o \ $(OBJDIR)/ucl_util.o \ $(OBJDIR)/ucl_parser.o \ $(OBJDIR)/ucl_emitter.o \ - $(OBJDIR)/ucl_schema.o \ - $(OBJDIR)/xxhash.o + $(OBJDIR)/ucl_schema.o all: $(OBJDIR) $(OBJDIR)/$(SONAME) @@ -55,8 +54,6 @@ $(OBJDIR)/ucl_hash.o: $(SRCDIR)/ucl_hash $(CC) -o $(OBJDIR)/ucl_hash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_hash.c $(OBJDIR)/ucl_schema.o: $(SRCDIR)/ucl_schema.c $(HDEPS) $(CC) -o $(OBJDIR)/ucl_schema.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_schema.c -$(OBJDIR)/xxhash.o: $(SRCDIR)/xxhash.c $(HDEPS) - $(CC) -o $(OBJDIR)/xxhash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/xxhash.c clean: $(RM) $(OBJDIR)/*.o $(OBJDIR)/$(SONAME_FULL) $(OBJDIR)/$(SONAME) $(OBJDIR)/chargen $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/objdump $(OBJDIR)/test_generate $(OBJDIR)/test_schema || true Modified: projects/mips64-clang/contrib/libucl/Makefile.w32 ============================================================================== --- projects/mips64-clang/contrib/libucl/Makefile.w32 Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/Makefile.w32 Mon Oct 3 15:14:58 2016 (r306643) @@ -28,14 +28,13 @@ HDEPS = $(SRCDIR)/ucl_hash.h \ $(SRCDIR)/ucl_chartable.h \ $(SRCDIR)/ucl_internal.h \ $(INCLUDEDIR)/ucl.h \ - $(SRCDIR)/xxhash.h + $(SRCDIR)/mum.h OBJECTS = $(OBJDIR)/ucl_hash.o \ $(OBJDIR)/ucl_util.o \ $(OBJDIR)/ucl_parser.o \ $(OBJDIR)/ucl_emitter.o \ $(OBJDIR)/ucl_emitter_utils.o \ - $(OBJDIR)/ucl_schema.o \ - $(OBJDIR)/xxhash.o + $(OBJDIR)/ucl_schema.o all: $(OBJDIR) $(OBJDIR)/$(SONAME) Modified: projects/mips64-clang/contrib/libucl/README.md ============================================================================== --- projects/mips64-clang/contrib/libucl/README.md Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/README.md Mon Oct 3 15:14:58 2016 (r306643) @@ -12,7 +12,7 @@ - [Named keys hierarchy](#named-keys-hierarchy) - [Convenient numbers and booleans](#convenient-numbers-and-booleans) - [General improvements](#general-improvements) - - [Commments](#commments) + - [Comments](#comments) - [Macros support](#macros-support) - [Variables support](#variables-support) - [Multiline strings](#multiline-strings) @@ -21,7 +21,7 @@ - [Performance](#performance) - [Conclusion](#conclusion) -## Introduction +## Introduction This document describes the main features and principles of the configuration language called `UCL` - universal configuration language. @@ -47,7 +47,7 @@ section { string = "something"; subsection { host = { - host = "hostname"; + host = "hostname"; port = 900; } host = { @@ -163,9 +163,9 @@ section { } } ``` - + Plain definitions may be more complex and contain more than a single level of nested objects: - + ```nginx section "blah" "foo" { key = value; @@ -174,7 +174,7 @@ section "blah" "foo" { is presented as: -```nginx +```nginx section { blah { foo { @@ -196,17 +196,17 @@ section { ## General improvements -### Commments +### Comments UCL supports different style of comments: -* single line: `#` +* single line: `#` * multiline: `/* ... */` Multiline comments may be nested: ```c # Sample single line comment -/* +/* some comment /* nested comment */ end of comment @@ -263,7 +263,7 @@ all files that matches the specified pat for your operating system). This option is meaningless for URL includes. * `url` (default: **true**) - allow URL includes. * `path` (default: empty) - A UCL_ARRAY of directories to search for the include file. -Search ends after the first patch, unless `glob` is true, then all matches are included. +Search ends after the first match, unless `glob` is true, then all matches are included. * `prefix` (default false) - Put included contents inside an object, instead of loading them into the root. If no `key` is provided, one is automatically generated based on each files basename() * `key` (default: <empty string>) - Key to load contents of include into. If @@ -273,7 +273,7 @@ object or an array. * `priority` (default: 0) - specify priority for the include (see below). * `duplicate` (default: 'append') - specify policy of duplicates resolving: - `append` - default strategy, if we have new object of higher priority then it replaces old one, if we have new object with less priority it is ignored completely, and if we have two duplicate objects with the same priority then we have a multi-value key (implicit array) - - `merge` - if we have object or array, then new keys are merged inside, if we have a plain object then an implicit array is formed (regardeless of priorities) + - `merge` - if we have object or array, then new keys are merged inside, if we have a plain object then an implicit array is formed (regardless of priorities) - `error` - create error on duplicate keys and stop parsing - `rewrite` - always rewrite an old value with new one (ignoring priorities) @@ -320,7 +320,7 @@ Here are some rules for this syntax: * Multiline terminator must start just after `<<` symbols and it must consist of capital letters only (e.g. `<<eof` or `<< EOF` won't work); * Terminator must end with a single newline character (and no spaces are allowed between terminator and newline character); * To finish multiline string you need to include a terminator string just after newline and followed by a newline (no spaces or other characters are allowed as well); -* The initial and the final newlines are not inserted to the resulting string, but you can still specify newlines at the begin and at the end of a value, for example: +* The initial and the final newlines are not inserted to the resulting string, but you can still specify newlines at the beginning and at the end of a value, for example: ``` key <<EOD @@ -347,7 +347,7 @@ UCL allows validation of objects. It use ## Performance Are UCL parser and emitter fast enough? Well, there are some numbers. -I got a 19Mb file that consist of ~700 thousands lines of json (obtained via +I got a 19Mb file that consist of ~700 thousand lines of json (obtained via http://www.json-generator.com/). Then I checked jansson library that performs json parsing and emitting and compared it with UCL. Here are results: @@ -377,6 +377,6 @@ You can do your own benchmarks by runnin ## Conclusion UCL has clear design that should be very convenient for reading and writing. At the same time it is compatible with -JSON language and therefore can be used as a simple JSON parser. Macroes logic provides an ability to extend configuration -language (for example by including some lua code) and comments allows to disable or enable the parts of a configuration +JSON language and therefore can be used as a simple JSON parser. Macro logic provides an ability to extend configuration +language (for example by including some lua code) and comments allow to disable or enable the parts of a configuration quickly. Modified: projects/mips64-clang/contrib/libucl/include/ucl++.h ============================================================================== --- projects/mips64-clang/contrib/libucl/include/ucl++.h Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/include/ucl++.h Mon Oct 3 15:14:58 2016 (r306643) @@ -24,6 +24,9 @@ #pragma once #include <string> +#include <vector> +#include <map> +#include <set> #include <memory> #include <iostream> @@ -100,6 +103,68 @@ private: return func; }; + static bool ucl_variable_getter(const unsigned char *data, size_t len, + unsigned char ** /*replace*/, size_t * /*replace_len*/, bool *need_free, void* ud) + { + *need_free = false; + + auto vars = reinterpret_cast<std::set<std::string> *>(ud); + if (vars && data && len != 0) { + vars->emplace (data, data + len); + } + return false; + } + + static bool ucl_variable_replacer (const unsigned char *data, size_t len, + unsigned char **replace, size_t *replace_len, bool *need_free, void* ud) + { + *need_free = false; + + auto replacer = reinterpret_cast<variable_replacer *>(ud); + if (!replacer) { + return false; + } + + std::string var_name (data, data + len); + if (!replacer->is_variable (var_name)) { + return false; + } + + std::string var_value = replacer->replace (var_name); + if (var_value.empty ()) { + return false; + } + + *replace = (unsigned char *)UCL_ALLOC (var_value.size ()); + memcpy (*replace, var_value.data (), var_value.size ()); + + *replace_len = var_value.size (); + *need_free = true; + + return true; + } + + template <typename C, typename P> + static Ucl parse_with_strategy_function (C config_func, P parse_func, std::string &err) + { + auto parser = ucl_parser_new (UCL_PARSER_DEFAULT); + + config_func (parser); + + if (!parse_func (parser)) { + err.assign (ucl_parser_get_error (parser)); + ucl_parser_free (parser); + + return nullptr; + } + + auto obj = ucl_parser_get_object (parser); + ucl_parser_free (parser); + + // Obj will handle ownership + return Ucl (obj); + } + std::unique_ptr<ucl_object_t, ucl_deleter> obj; public: @@ -117,9 +182,9 @@ public: const_iterator(const Ucl &obj) { it = std::shared_ptr<void>(ucl_object_iterate_new (obj.obj.get()), - ucl_iter_deleter()); + ucl_iter_deleter()); cur.reset (new Ucl(ucl_object_iterate_safe (it.get(), true))); - if (!*cur) { + if (cur->type() == UCL_NULL) { it.reset (); cur.reset (); } @@ -153,7 +218,7 @@ public: cur.reset (new Ucl(ucl_object_iterate_safe (it.get(), true))); } - if (!*cur) { + if (cur && cur->type() == UCL_NULL) { it.reset (); cur.reset (); } @@ -171,6 +236,17 @@ public: } }; + struct variable_replacer { + virtual ~variable_replacer() {} + + virtual bool is_variable (const std::string &str) const + { + return !str.empty (); + } + + virtual std::string replace (const std::string &var) const = 0; + }; + // We grab ownership if get non-const ucl_object_t Ucl(ucl_object_t *other) { obj.reset (other); @@ -211,20 +287,20 @@ public: obj.reset (ucl_object_fromstring_common (value.data (), value.size (), UCL_STRING_RAW)); } - Ucl(const char * value) { + Ucl(const char *value) { obj.reset (ucl_object_fromstring_common (value, 0, UCL_STRING_RAW)); } // Implicit constructor: anything with a to_json() function. template <class T, class = decltype(&T::to_ucl)> - Ucl(const T & t) : Ucl(t.to_ucl()) {} + Ucl(const T &t) : Ucl(t.to_ucl()) {} // Implicit constructor: map-like objects (std::map, std::unordered_map, etc) template <class M, typename std::enable_if< std::is_constructible<std::string, typename M::key_type>::value && std::is_constructible<Ucl, typename M::mapped_type>::value, int>::type = 0> - Ucl(const M & m) { + Ucl(const M &m) { obj.reset (ucl_object_typed_new (UCL_OBJECT)); auto cobj = obj.get (); @@ -238,7 +314,7 @@ public: template <class V, typename std::enable_if< std::is_constructible<Ucl, typename V::value_type>::value, int>::type = 0> - Ucl(const V & v) { + Ucl(const V &v) { obj.reset (ucl_object_typed_new (UCL_ARRAY)); auto cobj = obj.get (); @@ -356,46 +432,138 @@ public: return out; } - static Ucl parse (const std::string & in, std::string & err) + static Ucl parse (const std::string &in, std::string &err) { - auto parser = ucl_parser_new (UCL_PARSER_DEFAULT); + return parse (in, std::map<std::string, std::string>(), err); + } - if (!ucl_parser_add_chunk (parser, (const unsigned char *)in.data (), - in.size ())) { - err.assign (ucl_parser_get_error (parser)); - ucl_parser_free (parser); + static Ucl parse (const std::string &in, const std::map<std::string, std::string> &vars, std::string &err) + { + auto config_func = [&vars] (ucl_parser *parser) { + for (const auto & item : vars) { + ucl_parser_register_variable (parser, item.first.c_str (), item.second.c_str ()); + } + }; + + auto parse_func = [&in] (ucl_parser *parser) { + return ucl_parser_add_chunk (parser, (unsigned char *)in.data (), in.size ()); + }; + + return parse_with_strategy_function (config_func, parse_func, err); + } + static Ucl parse (const std::string &in, const variable_replacer &replacer, std::string &err) + { + auto config_func = [&replacer] (ucl_parser *parser) { + ucl_parser_set_variables_handler (parser, ucl_variable_replacer, + &const_cast<variable_replacer &>(replacer)); + }; + + auto parse_func = [&in] (ucl_parser *parser) { + return ucl_parser_add_chunk (parser, (unsigned char *) in.data (), in.size ()); + }; + + return parse_with_strategy_function (config_func, parse_func, err); + } + + static Ucl parse (const char *in, std::string &err) + { + return parse (in, std::map<std::string, std::string>(), err); + } + + static Ucl parse (const char *in, const std::map<std::string, std::string> &vars, std::string &err) + { + if (!in) { + err = "null input"; return nullptr; } + return parse (std::string (in), vars, err); + } - auto obj = ucl_parser_get_object (parser); + static Ucl parse (const char *in, const variable_replacer &replacer, std::string &err) + { + if (!in) { + err = "null input"; + return nullptr; + } + return parse (std::string(in), replacer, err); + } + + static Ucl parse_from_file (const std::string &filename, std::string &err) + { + return parse_from_file (filename, std::map<std::string, std::string>(), err); + } + + static Ucl parse_from_file (const std::string &filename, const std::map<std::string, std::string> &vars, std::string &err) + { + auto config_func = [&vars] (ucl_parser *parser) { + for (const auto & item : vars) { + ucl_parser_register_variable (parser, item.first.c_str (), item.second.c_str ()); + } + }; + + auto parse_func = [&filename] (ucl_parser *parser) { + return ucl_parser_add_file (parser, filename.c_str ()); + }; + + return parse_with_strategy_function (config_func, parse_func, err); + } + + static Ucl parse_from_file (const std::string &filename, const variable_replacer &replacer, std::string &err) + { + auto config_func = [&replacer] (ucl_parser *parser) { + ucl_parser_set_variables_handler (parser, ucl_variable_replacer, + &const_cast<variable_replacer &>(replacer)); + }; + + auto parse_func = [&filename] (ucl_parser *parser) { + return ucl_parser_add_file (parser, filename.c_str ()); + }; + + return parse_with_strategy_function (config_func, parse_func, err); + } + + static std::vector<std::string> find_variable (const std::string &in) + { + auto parser = ucl_parser_new (UCL_PARSER_DEFAULT); + + std::set<std::string> vars; + ucl_parser_set_variables_handler (parser, ucl_variable_getter, &vars); + ucl_parser_add_chunk (parser, (const unsigned char *)in.data (), in.size ()); ucl_parser_free (parser); - // Obj will handle ownership - return Ucl (obj); + std::vector<std::string> result; + std::move (vars.begin (), vars.end (), std::back_inserter (result)); + return result; } - static Ucl parse (const char * in, std::string & err) + static std::vector<std::string> find_variable (const char *in) { - if (in) { - return parse (std::string(in), err); - } else { - err = "null input"; - return nullptr; + if (!in) { + return std::vector<std::string>(); } + return find_variable (std::string (in)); } - static Ucl parse (std::istream &ifs, std::string &err) + static std::vector<std::string> find_variable_from_file (const std::string &filename) { - return Ucl::parse (std::string(std::istreambuf_iterator<char>(ifs), - std::istreambuf_iterator<char>()), err); + auto parser = ucl_parser_new (UCL_PARSER_DEFAULT); + + std::set<std::string> vars; + ucl_parser_set_variables_handler (parser, ucl_variable_getter, &vars); + ucl_parser_add_file (parser, filename.c_str ()); + ucl_parser_free (parser); + + std::vector<std::string> result; + std::move (vars.begin (), vars.end (), std::back_inserter (result)); + return std::move (result); } - Ucl& operator= (Ucl rhs) - { - obj.swap (rhs.obj); - return *this; - } + Ucl& operator= (Ucl rhs) + { + obj.swap (rhs.obj); + return *this; + } bool operator== (const Ucl &rhs) const { Modified: projects/mips64-clang/contrib/libucl/include/ucl.h ============================================================================== --- projects/mips64-clang/contrib/libucl/include/ucl.h Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/include/ucl.h Mon Oct 3 15:14:58 2016 (r306643) @@ -1016,7 +1016,6 @@ UCL_EXTERN bool ucl_parser_add_string_pr * Load and add data from a file * @param parser parser structure * @param filename the name of file - * @param err if *err is NULL it is set to parser error * @return true if chunk has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_file (struct ucl_parser *parser, @@ -1026,7 +1025,6 @@ UCL_EXTERN bool ucl_parser_add_file (str * Load and add data from a file * @param parser parser structure * @param filename the name of file - * @param err if *err is NULL it is set to parser error * @param priority the desired priority of a chunk (only 4 least significant bits * are considered for this parameter) * @return true if chunk has been added and false in case of error @@ -1035,6 +1033,20 @@ UCL_EXTERN bool ucl_parser_add_file_prio const char *filename, unsigned priority); /** + * Load and add data from a file + * @param parser parser structure + * @param filename the name of file + * @param priority the desired priority of a chunk (only 4 least significant bits + * are considered for this parameter) + * @param strat Merge strategy to use while parsing this file + * @param parse_type Parser type to use while parsing this file + * @return true if chunk has been added and false in case of error + */ +UCL_EXTERN bool ucl_parser_add_file_full (struct ucl_parser *parser, const char *filename, + unsigned priority, enum ucl_duplicate_strategy strat, + enum ucl_parse_type parse_type); + +/** * Load and add data from a file descriptor * @param parser parser structure * @param filename the name of file Copied: projects/mips64-clang/contrib/libucl/m4/gcov.m4 (from r306637, head/contrib/libucl/m4/gcov.m4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips64-clang/contrib/libucl/m4/gcov.m4 Mon Oct 3 15:14:58 2016 (r306643, copy of r306637, head/contrib/libucl/m4/gcov.m4) @@ -0,0 +1,89 @@ +# SYNOPSIS +# +# Add code coverage support with gcov/lcov. +# +# AX_CODE_COVERAGE() +# +# DESCRIPTION +# +# Provides a --enable-coverage option which checks for available +# gcov/lcov binaries and provides ENABLE_CODE_COVERAGE conditional. +# +# LAST MODIFICATION +# +# $Id: coverage.m4 40881 2013-08-20 17:54:39Z damon $ +# +# COPYLEFT +# +# Copyright (c) 2012 Roy H. Stogner <roystgnr@ices.utexas.edu> +# Copyright (c) 2010 Karl W. Schulz <karl@ices.utexas.edu> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +AC_DEFUN([AX_CODE_COVERAGE], +[ + +AC_ARG_ENABLE(coverage, AC_HELP_STRING([--enable-coverage],[configure code coverage analysis tools])) + +HAVE_GCOV_TOOLS=0 + +GCOV_FLAGS="" + +if test "x$enable_coverage" = "xyes"; then + + # ---------------------------- + # Check for gcov/lcov binaries + # ---------------------------- + + AC_ARG_VAR([GCOV], [Coverage testing command]) + if test "x$GCOV" = "x"; then + AC_PATH_PROG(GCOV, gcov, no) + else + AC_PATH_PROG(GCOV, $GCOV, no) + fi + + AC_PATH_PROG(LCOV, lcov, no) + AC_PATH_PROG(GENHTML, genhtml) + + # ---------------------------------- + # include coverage compiler options + # ---------------------------------- + AC_MSG_CHECKING([for clang]) + + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([], [[ + #ifndef __clang__ + not clang + #endif + ]])], + [CLANG=yes], [CLANG=no]) + + AC_MSG_RESULT([$CLANG]) + HAVE_GCOV_TOOLS=1 + COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage" + COVERAGE_LDFLAGS="--coverage -fprofile-arcs -ftest-coverage" + COVERAGE_OPTFLAGS="-O0" + + # Test for C... + CFLAGS="${GCOV_FLAGS} ${CFLAGS}" + CXXFLAGS="${GCOV_FLAGS} ${CXXFLAGS}" + if test "x$GCC" = "xyes" -a "x$CLANG" = "xno"; then + COVERAGE_LIBS="-lgcov" + else + COVERAGE_LIBS="" + fi +fi + +AC_SUBST([GCOV]) +AC_SUBST([LCOV]) +AC_SUBST([GENHTML]) +AC_SUBST([GENHTML_OPTIONS]) +AC_SUBST([COVERAGE_CFLAGS]) +AC_SUBST([COVERAGE_OPTFLAGS]) +AC_SUBST([COVERAGE_LDFLAGS]) +AC_SUBST([COVERAGE_LIBS]) +AM_CONDITIONAL(CODE_COVERAGE_ENABLED,test x$HAVE_GCOV_TOOLS = x1) + +]) Modified: projects/mips64-clang/contrib/libucl/python/setup.py ============================================================================== --- projects/mips64-clang/contrib/libucl/python/setup.py Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/python/setup.py Mon Oct 3 15:14:58 2016 (r306643) @@ -1,37 +1,43 @@ -import distutils.ccompiler -import distutils.sysconfig -from distutils.core import setup, Extension +try: + from setuptools import setup, Extension +except ImportError: + from distutils.core import setup, Extension + import os +import sys +tests_require = [] -compiler = distutils.ccompiler.new_compiler() -search_paths=[os.path.expanduser('~/{}'), '/opt/local/{}', '/usr/local/{}', '/usr/{}'] -lib_paths = [ a.format("lib") for a in search_paths] -inc_paths = [ a.format("include") for a in search_paths] +if sys.version < '2.7': + tests_require.append('unittest2') -uclmodule = Extension('ucl', - include_dirs = inc_paths, - library_dirs = lib_paths, - libraries = ['ucl'], - sources = ['src/uclmodule.c'], - runtime_library_dirs = lib_paths, - language='c') +uclmodule = Extension( + 'ucl', + libraries = ['ucl'], + sources = ['src/uclmodule.c'], + language = 'c' +) -setup(name='ucl', - version='1.0', - description='ucl parser and emmitter', +setup( + name = 'ucl', + version = '0.8', + description = 'ucl parser and emmitter', ext_modules = [uclmodule], - author="Eitan Adler", - author_email="lists@eitanadler.com", - url="https://github.com/vstakhov/libucl/", - license="MIT", - classifiers=["Development Status :: 3 - Alpha", + test_suite = 'tests', + tests_require = tests_require, + author = "Eitan Adler, Denis Volpato Martins", + author_email = "lists@eitanadler.com", + url = "https://github.com/vstakhov/libucl/", + license = "MIT", + classifiers = [ + "Development Status :: 3 - Alpha", "Intended Audience :: Developers", "License :: DFSG approved", "License :: OSI Approved :: MIT License", "Programming Language :: C", + "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Software Development :: Libraries", - ] - ) + ] +) Modified: projects/mips64-clang/contrib/libucl/python/src/uclmodule.c ============================================================================== --- projects/mips64-clang/contrib/libucl/python/src/uclmodule.c Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/python/src/uclmodule.c Mon Oct 3 15:14:58 2016 (r306643) @@ -2,6 +2,8 @@ #include <ucl.h> #include <Python.h> +static PyObject *SchemaError; + static PyObject * _basic_ucl_type (ucl_object_t const *obj) { @@ -13,9 +15,11 @@ _basic_ucl_type (ucl_object_t const *obj case UCL_STRING: return Py_BuildValue ("s", ucl_object_tostring (obj)); case UCL_BOOLEAN: - return ucl_object_toboolean (obj) ? Py_True : Py_False; + return PyBool_FromLong (ucl_object_toboolean (obj)); case UCL_TIME: return Py_BuildValue ("d", ucl_object_todouble (obj)); + case UCL_NULL: + Py_RETURN_NONE; } return NULL; } @@ -124,26 +128,60 @@ _iterate_python (PyObject *obj) { if (obj == Py_None) { return ucl_object_new(); - } else if (PyBool_Check (obj)) { + } + else if (PyBool_Check (obj)) { return ucl_object_frombool (obj == Py_True); - } else if (PyInt_Check (obj)) { + } +#if PY_MAJOR_VERSION < 3 + else if (PyInt_Check (obj)) { return ucl_object_fromint (PyInt_AsLong (obj)); - } else if (PyFloat_Check (obj)) { + } +#endif + else if (PyLong_Check (obj)) { + return ucl_object_fromint (PyLong_AsLong (obj)); + } *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610031514.u93FExdU070113>