Date: Wed, 19 Nov 2014 06:37:19 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274690 - in projects/sendfile: . cddl/contrib/opensolaris/lib/libdtrace/common cddl/contrib/opensolaris/tools/ctf/cvt contrib/libxo contrib/libxo/libxo contrib/libxo/xolint contrib/net... Message-ID: <201411190637.sAJ6bJDV033746@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Wed Nov 19 06:37:18 2014 New Revision: 274690 URL: https://svnweb.freebsd.org/changeset/base/274690 Log: Merge head r258543 through r274689. Added: projects/sendfile/lib/libc/tests/gen/arc4random_test.c - copied unchanged from r274689, head/lib/libc/tests/gen/arc4random_test.c projects/sendfile/lib/libc/tests/gen/fpclassify2_test.c - copied unchanged from r274689, head/lib/libc/tests/gen/fpclassify2_test.c projects/sendfile/lib/libc/tests/stdio/fmemopen2_test.c - copied unchanged from r274689, head/lib/libc/tests/stdio/fmemopen2_test.c projects/sendfile/lib/librt/Makefile.amd64 - copied unchanged from r274689, head/lib/librt/Makefile.amd64 projects/sendfile/lib/librt/Makefile.i386 - copied unchanged from r274689, head/lib/librt/Makefile.i386 projects/sendfile/lib/librt/tests/ - copied from r274689, head/lib/librt/tests/ projects/sendfile/lib/libthr/Makefile.amd64 - copied unchanged from r274689, head/lib/libthr/Makefile.amd64 projects/sendfile/lib/libthr/Makefile.i386 - copied unchanged from r274689, head/lib/libthr/Makefile.i386 projects/sendfile/lib/libthr/tests/ - copied from r274689, head/lib/libthr/tests/ projects/sendfile/lib/msun/Makefile.amd64 - copied unchanged from r274689, head/lib/msun/Makefile.amd64 projects/sendfile/lib/msun/Makefile.i386 - copied unchanged from r274689, head/lib/msun/Makefile.i386 projects/sendfile/lib/msun/tests/ - copied from r274689, head/lib/msun/tests/ projects/sendfile/sys/dev/altera/pio/ - copied from r274689, head/sys/dev/altera/pio/ projects/sendfile/sys/dev/virtio/mmio/ - copied from r274689, head/sys/dev/virtio/mmio/ projects/sendfile/tools/build/options/WITHOUT_INCLUDES - copied unchanged from r274689, head/tools/build/options/WITHOUT_INCLUDES projects/sendfile/tools/build/options/WITHOUT_TESTS_SUPPORT - copied unchanged from r274689, head/tools/build/options/WITHOUT_TESTS_SUPPORT projects/sendfile/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES - copied unchanged from r274689, head/tools/build/options/WITHOUT_USB_GADGET_EXAMPLES projects/sendfile/usr.sbin/pw/tests/pw_lock.sh - copied unchanged from r274689, head/usr.sbin/pw/tests/pw_lock.sh Deleted: projects/sendfile/tools/regression/lib/libc/gen/test-arc4random.c projects/sendfile/tools/regression/lib/libc/gen/test-fpclassify.c projects/sendfile/tools/regression/lib/libc/stdio/test-fmemopen.c Modified: projects/sendfile/MAINTAINERS (contents, props changed) projects/sendfile/Makefile.inc1 projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c projects/sendfile/contrib/libxo/configure.ac projects/sendfile/contrib/libxo/libxo/libxo.c projects/sendfile/contrib/libxo/libxo/xoconfig.h projects/sendfile/contrib/libxo/libxo/xoversion.h projects/sendfile/contrib/libxo/xolint/xolint.pl projects/sendfile/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_glob.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_nice.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_raise.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_time.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c projects/sendfile/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c projects/sendfile/contrib/netbsd-tests/lib/libc/regex/debug.c projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_getopt_long.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/t_getenv.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c projects/sendfile/contrib/netbsd-tests/lib/libc/string/t_memcpy.c projects/sendfile/contrib/netbsd-tests/lib/libc/string/t_strerror.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_access.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_clock_gettime.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getgroups.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_kevent.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_listen.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_nanosleep.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_pipe2.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_poll.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_revoke.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_stat.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_timer_create.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_unlink.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_write.c projects/sendfile/contrib/netbsd-tests/lib/libc/time/t_strptime.c projects/sendfile/contrib/netbsd-tests/lib/libc/tls/dso/h_tls_dlopen.c projects/sendfile/contrib/netbsd-tests/lib/libc/tls/t_tls_dlopen.c projects/sendfile/contrib/netbsd-tests/lib/libc/tls/t_tls_dynamic.c projects/sendfile/contrib/netbsd-tests/lib/libc/tls/t_tls_static.c projects/sendfile/contrib/netbsd-tests/lib/libc/tls/t_tls_static_helper.c projects/sendfile/contrib/netbsd-tests/lib/libc/tls_dso/h_tls_dynamic.c projects/sendfile/contrib/netbsd-tests/lib/libm/t_cbrt.c projects/sendfile/contrib/netbsd-tests/lib/libm/t_exp.c projects/sendfile/contrib/netbsd-tests/lib/libm/t_pow.c projects/sendfile/contrib/netbsd-tests/lib/libm/t_precision.c projects/sendfile/contrib/netbsd-tests/lib/libm/t_scalbn.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/h_atexit.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/h_cancel.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_condwait.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_detach.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_fork.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_join.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_mutex.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_once.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_sem.c projects/sendfile/contrib/netbsd-tests/lib/librt/t_sem.c projects/sendfile/contrib/tzdata/africa projects/sendfile/contrib/tzdata/asia projects/sendfile/contrib/tzdata/australasia projects/sendfile/contrib/tzdata/europe projects/sendfile/contrib/tzdata/northamerica projects/sendfile/contrib/tzdata/southamerica projects/sendfile/etc/devd/apple.conf projects/sendfile/etc/mtree/BSD.tests.dist projects/sendfile/lib/libc/tests/gen/Makefile projects/sendfile/lib/libc/tests/stdio/Makefile projects/sendfile/lib/librt/Makefile projects/sendfile/lib/libthr/Makefile projects/sendfile/lib/msun/Makefile projects/sendfile/sbin/geom/core/geom.c projects/sendfile/sbin/reboot/boot_i386.8 projects/sendfile/sbin/route/route.c projects/sendfile/share/man/man4/acpi.4 projects/sendfile/share/man/man4/rsu.4 projects/sendfile/share/mk/bsd.incs.mk projects/sendfile/share/mk/bsd.opts.mk projects/sendfile/share/mk/src.opts.mk projects/sendfile/sys/amd64/amd64/pmap.c projects/sendfile/sys/amd64/amd64/support.S projects/sendfile/sys/arm/allwinner/a10_gpio.c projects/sendfile/sys/arm/arm/busdma_machdep-v6.c projects/sendfile/sys/arm/arm/stdatomic.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_common.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/sendfile/sys/arm/freescale/imx/imx_common.c projects/sendfile/sys/arm/freescale/imx/imx_gpio.c projects/sendfile/sys/arm/freescale/imx/imx_i2c.c projects/sendfile/sys/arm/freescale/vybrid/vf_gpio.c projects/sendfile/sys/arm/include/asmacros.h projects/sendfile/sys/arm/mv/mv_common.c projects/sendfile/sys/arm/rockchip/rk30xx_gpio.c projects/sendfile/sys/arm/samsung/exynos/exynos5_pad.c projects/sendfile/sys/arm/ti/ti_common.c projects/sendfile/sys/arm/ti/ti_gpio.c projects/sendfile/sys/arm/ti/ti_i2c.c projects/sendfile/sys/arm/versatile/versatile_common.c projects/sendfile/sys/arm/versatile/versatile_machdep.c projects/sendfile/sys/arm/xilinx/uart_dev_cdnc.c projects/sendfile/sys/arm/xilinx/zy7_machdep.c projects/sendfile/sys/arm/xscale/ixp425/avila_gpio.c projects/sendfile/sys/arm/xscale/ixp425/cambria_gpio.c projects/sendfile/sys/boot/ficl/amd64/sysdep.c projects/sendfile/sys/boot/ficl/arm/sysdep.c projects/sendfile/sys/boot/ficl/i386/sysdep.c projects/sendfile/sys/boot/ficl/mips/sysdep.c projects/sendfile/sys/boot/ficl/mips64/sysdep.c projects/sendfile/sys/boot/ficl/powerpc/sysdep.c projects/sendfile/sys/boot/ficl/sparc64/sysdep.c projects/sendfile/sys/boot/pc98/loader/conf.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/sendfile/sys/conf/files projects/sendfile/sys/conf/kern.opts.mk projects/sendfile/sys/conf/newvers.sh projects/sendfile/sys/dev/ath/if_ath.c projects/sendfile/sys/dev/drm2/radeon/radeon_connectors.c projects/sendfile/sys/dev/gpio/gpio_if.m projects/sendfile/sys/dev/gpio/gpiobus.c projects/sendfile/sys/dev/gpio/gpiobusvar.h projects/sendfile/sys/dev/gpio/gpioc.c projects/sendfile/sys/dev/gpio/ofw_gpiobus.c projects/sendfile/sys/dev/iicbus/iicbus.c projects/sendfile/sys/dev/iicbus/iicbus.h projects/sendfile/sys/dev/iicbus/iicbus_if.m projects/sendfile/sys/dev/isp/isp_freebsd.c projects/sendfile/sys/dev/isp/isp_freebsd.h projects/sendfile/sys/dev/ixgbe/ixgbe.c projects/sendfile/sys/dev/mcd/mcd.c projects/sendfile/sys/dev/mcd/mcd_isa.c projects/sendfile/sys/dev/mcd/mcdvar.h projects/sendfile/sys/dev/mly/mly.c projects/sendfile/sys/dev/mly/mlyvar.h projects/sendfile/sys/dev/ofw/ofw_iicbus.c projects/sendfile/sys/dev/pccbb/pccbb.c projects/sendfile/sys/dev/pci/pci.c projects/sendfile/sys/dev/pst/pst-pci.c projects/sendfile/sys/dev/pst/pst-raid.c projects/sendfile/sys/dev/scd/scd.c projects/sendfile/sys/dev/scd/scd_isa.c projects/sendfile/sys/dev/scd/scdvar.h projects/sendfile/sys/dev/usb/usbdevs projects/sendfile/sys/dev/usb/wlan/if_rsu.c projects/sendfile/sys/dev/virtio/block/virtio_blk.c projects/sendfile/sys/dev/wds/wd7000.c projects/sendfile/sys/dev/xen/netback/netback.c projects/sendfile/sys/geom/part/g_part.c projects/sendfile/sys/geom/part/g_part_bsd.c projects/sendfile/sys/geom/part/g_part_if.m projects/sendfile/sys/i386/i386/pmap.c projects/sendfile/sys/i386/include/vmparam.h projects/sendfile/sys/i386/xen/locore.s projects/sendfile/sys/kern/kern_event.c projects/sendfile/sys/kern/kern_mutex.c projects/sendfile/sys/libkern/strncmp.c projects/sendfile/sys/mips/atheros/ar71xx_gpio.c projects/sendfile/sys/mips/cavium/octeon_gpio.c projects/sendfile/sys/mips/mips/stdatomic.c projects/sendfile/sys/mips/mips/trap.c projects/sendfile/sys/mips/rt305x/rt305x_gpio.c projects/sendfile/sys/modules/cxgb/tom/Makefile projects/sendfile/sys/modules/geom/geom_part/geom_part_bsd/Makefile projects/sendfile/sys/modules/if_gif/Makefile projects/sendfile/sys/modules/if_gre/Makefile projects/sendfile/sys/modules/lmc/Makefile projects/sendfile/sys/net/if.c projects/sendfile/sys/net/route.c projects/sendfile/sys/net/route.h projects/sendfile/sys/netinet/ip_output.c projects/sendfile/sys/netinet/tcp_var.h projects/sendfile/sys/netinet6/ip6_output.c projects/sendfile/sys/powerpc/wii/wii_gpio.c projects/sendfile/sys/sys/event.h projects/sendfile/sys/vm/vm_page.c projects/sendfile/sys/vm/vm_phys.c projects/sendfile/sys/vm/vm_phys.h projects/sendfile/sys/vm/vnode_pager.c projects/sendfile/sys/xen/gnttab.c projects/sendfile/tools/build/options/WITHOUT_LIB32 projects/sendfile/tools/regression/lib/libc/gen/Makefile projects/sendfile/tools/regression/lib/libc/stdio/Makefile projects/sendfile/tools/regression/zfs/zpool/add/files.t projects/sendfile/usr.bin/iscsictl/iscsictl.c projects/sendfile/usr.bin/sort/Makefile projects/sendfile/usr.sbin/autofs/auto_master.5 projects/sendfile/usr.sbin/freebsd-update/freebsd-update.sh projects/sendfile/usr.sbin/pw/tests/Makefile projects/sendfile/usr.sbin/pw/tests/pw_delete.sh projects/sendfile/usr.sbin/pw/tests/pw_etcdir.sh projects/sendfile/usr.sbin/watchdogd/watchdogd.8 projects/sendfile/usr.sbin/watchdogd/watchdogd.c projects/sendfile/usr.sbin/wpa/wpa_cli/Makefile Directory Properties: projects/sendfile/ (props changed) projects/sendfile/cddl/ (props changed) projects/sendfile/cddl/contrib/opensolaris/ (props changed) projects/sendfile/contrib/tzdata/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/share/man/man4/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/boot/ (props changed) projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed) projects/sendfile/sys/conf/ (props changed) Modified: projects/sendfile/MAINTAINERS ============================================================================== --- projects/sendfile/MAINTAINERS Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/MAINTAINERS Wed Nov 19 06:37:18 2014 (r274690) @@ -80,6 +80,8 @@ contrib/pf glebius Pre-commit review rec file obrien Insists to keep file blocked from other's unapproved commits contrib/bzip2 obrien Pre-commit review required. +contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. +contrib/pjdfstest freebsd-testing,ngie Pre-commit review requested. geom_concat pjd Pre-commit review preferred. geom_eli pjd Pre-commit review preferred. geom_gate pjd Pre-commit review preferred. Modified: projects/sendfile/Makefile.inc1 ============================================================================== --- projects/sendfile/Makefile.inc1 Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/Makefile.inc1 Wed Nov 19 06:37:18 2014 (r274690) @@ -1455,8 +1455,23 @@ native-xtools: .MAKE mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${OBJTREE}/nxb-bin/usr/include >/dev/null .for _tool in \ + bin/cat \ + bin/chmod \ + bin/cp \ bin/csh \ + bin/echo \ + bin/expr \ + bin/hostname \ + bin/ln \ + bin/ls \ + bin/mkdir \ + bin/mv \ + bin/ps \ + bin/realpath \ + bin/rm \ + bin/rmdir \ bin/sh \ + bin/sleep \ ${_clang_tblgen} \ usr.bin/ar \ ${_binutils} \ @@ -1465,18 +1480,38 @@ native-xtools: .MAKE ${_clang_libs} \ ${_clang} \ sbin/md5 \ + sbin/sysctl \ + gnu/usr.bin/diff \ usr.bin/awk \ + usr.bin/basename \ usr.bin/bmake \ usr.bin/bzip2 \ + usr.bin/cmp \ + usr.bin/dirname \ + usr.bin/env \ usr.bin/fetch \ + usr.bin/find \ + usr.bin/grep \ usr.bin/gzip \ + usr.bin/id \ usr.bin/lex \ usr.bin/lorder \ + usr.bin/mktemp \ + usr.bin/mt \ + usr.bin/patch \ usr.bin/sed \ + usr.bin/sort \ usr.bin/tar \ + usr.bin/touch \ + usr.bin/tr \ + usr.bin/true \ + usr.bin/uniq \ usr.bin/unzip \ + usr.bin/xargs \ + usr.bin/xinstall \ usr.bin/xz \ - usr.bin/yacc + usr.bin/yacc \ + usr.sbin/chown ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${NXBMAKE} DIRPRFX=${_tool}/ obj && \ Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c Wed Nov 19 06:37:18 2014 (r274690) @@ -469,7 +469,7 @@ dof_add_probe(dt_idhash_t *dhp, dt_ident * locally so an alternate symbol is added for the purpose * of this relocation. */ - if (pip->pi_rname[0] == '\0') + if (pip->pi_rname == NULL) dofr.dofr_name = dofpr.dofpr_func; else dofr.dofr_name = dof_add_string(ddo, pip->pi_rname); Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Wed Nov 19 06:37:18 2014 (r274690) @@ -520,6 +520,8 @@ dt_probe_destroy(dt_probe_t *prp) for (pip = prp->pr_inst; pip != NULL; pip = pip_next) { pip_next = pip->pi_next; + dt_free(dtp, pip->pi_rname); + dt_free(dtp, pip->pi_fname); dt_free(dtp, pip->pi_offs); dt_free(dtp, pip->pi_enoffs); dt_free(dtp, pip); @@ -552,28 +554,18 @@ dt_probe_define(dt_provider_t *pvp, dt_p if ((pip = dt_zalloc(dtp, sizeof (*pip))) == NULL) return (-1); - if ((pip->pi_offs = dt_zalloc(dtp, - sizeof (uint32_t))) == NULL) { - dt_free(dtp, pip); - return (-1); - } + if ((pip->pi_offs = dt_zalloc(dtp, sizeof (uint32_t))) == NULL) + goto nomem; if ((pip->pi_enoffs = dt_zalloc(dtp, - sizeof (uint32_t))) == NULL) { - dt_free(dtp, pip->pi_offs); - dt_free(dtp, pip); - return (-1); - } + sizeof (uint32_t))) == NULL) + goto nomem; - (void) strlcpy(pip->pi_fname, fname, sizeof (pip->pi_fname)); - if (rname != NULL) { - if (strlen(rname) + 1 > sizeof (pip->pi_rname)) { - dt_free(dtp, pip->pi_offs); - dt_free(dtp, pip); - return (dt_set_errno(dtp, EDT_COMPILER)); - } - (void) strcpy(pip->pi_rname, rname); - } + if ((pip->pi_fname = strdup(fname)) == NULL) + goto nomem; + + if (rname != NULL && (pip->pi_rname = strdup(rname)) == NULL) + goto nomem; pip->pi_noffs = 0; pip->pi_maxoffs = 1; @@ -618,6 +610,13 @@ dt_probe_define(dt_provider_t *pvp, dt_p (*offs)[(*noffs)++] = offset; return (0); + +nomem: + dt_free(dtp, pip->pi_fname); + dt_free(dtp, pip->pi_enoffs); + dt_free(dtp, pip->pi_offs); + dt_free(dtp, pip); + return (dt_set_errno(dtp, EDT_NOMEM)); } /* Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h Wed Nov 19 06:37:18 2014 (r274690) @@ -64,8 +64,8 @@ typedef struct dt_probe_iter { } dt_probe_iter_t; typedef struct dt_probe_instance { - char pi_fname[DTRACE_FUNCNAMELEN]; /* function name */ - char pi_rname[DTRACE_FUNCNAMELEN + 20]; /* mangled relocation name */ + char *pi_fname; /* function name */ + char *pi_rname; /* mangled relocation name */ uint32_t *pi_offs; /* offsets into the function */ uint32_t *pi_enoffs; /* is-enabled offsets */ uint_t pi_noffs; /* number of offsets */ Modified: projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Wed Nov 19 06:37:18 2014 (r274690) @@ -766,7 +766,8 @@ die_array_resolve(tdesc_t *tdp, tdesc_t debug(3, "trying to resolve array %d (cont %d)\n", tdp->t_id, tdp->t_ardef->ad_contents->t_id); - if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0) { + if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0 && + (tdp->t_ardef->ad_contents->t_flags & TDESC_F_RESOLVED) == 0) { debug(3, "unable to resolve array %s (%d) contents %d\n", tdesc_name(tdp), tdp->t_id, tdp->t_ardef->ad_contents->t_id); @@ -1138,12 +1139,17 @@ die_sou_resolve(tdesc_t *tdp, tdesc_t ** /* * For empty members, or GCC/C99 flexible array - * members, a size of 0 is correct. + * members, a size of 0 is correct. Structs and unions + * consisting of flexible array members will also have + * size 0. */ if (mt->t_members == NULL) continue; if (mt->t_type == ARRAY && mt->t_ardef->ad_nelems == 0) continue; + if ((mt->t_flags & TDESC_F_RESOLVED) != 0 && + (mt->t_type == STRUCT || mt->t_type == UNION)) + continue; dw->dw_nunres++; return (1); Modified: projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Wed Nov 19 06:37:18 2014 (r274690) @@ -287,19 +287,11 @@ equiv_su(tdesc_t *stdp, tdesc_t *ttdp, e while (ml1 && ml2) { if (ml1->ml_offset != ml2->ml_offset || - strcmp(ml1->ml_name, ml2->ml_name) != 0) + strcmp(ml1->ml_name, ml2->ml_name) != 0 || + ml1->ml_size != ml2->ml_size || + !equiv_node(ml1->ml_type, ml2->ml_type, ed)) return (0); - /* - * Don't do the recursive equivalency checking more than - * we have to. - */ - if (olm1 == NULL || olm1->ml_type->t_id != ml1->ml_type->t_id) { - if (ml1->ml_size != ml2->ml_size || - !equiv_node(ml1->ml_type, ml2->ml_type, ed)) - return (0); - } - olm1 = ml1; ml1 = ml1->ml_next; ml2 = ml2->ml_next; @@ -357,7 +349,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp, int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *); int mapping; - if (ctdp->t_emark > ed->ed_clear_mark || + if (ctdp->t_emark > ed->ed_clear_mark && mtdp->t_emark > ed->ed_clear_mark) return (ctdp->t_emark == mtdp->t_emark); Modified: projects/sendfile/contrib/libxo/configure.ac ============================================================================== --- projects/sendfile/contrib/libxo/configure.ac Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/libxo/configure.ac Wed Nov 19 06:37:18 2014 (r274690) @@ -12,7 +12,7 @@ # AC_PREREQ(2.2) -AC_INIT([libxo], [0.1.5], [phil@juniper.net]) +AC_INIT([libxo], [0.1.6], [phil@juniper.net]) AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability]) # Support silent build rules. Requires at least automake-1.11. Modified: projects/sendfile/contrib/libxo/libxo/libxo.c ============================================================================== --- projects/sendfile/contrib/libxo/libxo/libxo.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/libxo/libxo/libxo.c Wed Nov 19 06:37:18 2014 (r274690) @@ -317,7 +317,7 @@ xo_init_handle (xo_handle_t *xop) cp = getenv("LC_ALL"); if (cp == NULL) cp = "UTF-8"; /* Optimistic? */ - cp = setlocale(LC_CTYPE, cp); + (void) setlocale(LC_CTYPE, cp); } /* @@ -607,8 +607,10 @@ xo_vsnprintf (xo_handle_t *xop, xo_buffe rc = vsnprintf(xbp->xb_curp, left, fmt, va_local); if (rc > xbp->xb_size) { - if (!xo_buf_has_room(xbp, rc)) + if (!xo_buf_has_room(xbp, rc)) { + va_end(va_local); return -1; + } /* * After we call vsnprintf(), the stage of vap is not defined. @@ -648,8 +650,10 @@ xo_printf_v (xo_handle_t *xop, const cha rc = vsnprintf(xbp->xb_curp, left, fmt, va_local); if (rc > xbp->xb_size) { - if (!xo_buf_has_room(xbp, rc)) + if (!xo_buf_has_room(xbp, rc)) { + va_end(va_local); return -1; + } va_end(va_local); /* Reset vap to the start */ va_copy(va_local, vap); @@ -974,8 +978,10 @@ xo_warn_hcv (xo_handle_t *xop, int code, int left = xbp->xb_size - (xbp->xb_curp - xbp->xb_bufp); int rc = vsnprintf(xbp->xb_curp, left, newfmt, vap); if (rc > xbp->xb_size) { - if (!xo_buf_has_room(xbp, rc)) + if (!xo_buf_has_room(xbp, rc)) { + va_end(va_local); return; + } va_end(vap); /* Reset vap to the start */ va_copy(vap, va_local); @@ -1118,8 +1124,10 @@ xo_message_hcv (xo_handle_t *xop, int co int left = xbp->xb_size - (xbp->xb_curp - xbp->xb_bufp); rc = vsnprintf(xbp->xb_curp, left, fmt, vap); if (rc > xbp->xb_size) { - if (!xo_buf_has_room(xbp, rc)) + if (!xo_buf_has_room(xbp, rc)) { + va_end(va_local); return; + } va_end(vap); /* Reset vap to the start */ va_copy(vap, va_local); @@ -1154,14 +1162,15 @@ xo_message_hcv (xo_handle_t *xop, int co va_copy(va_local, vap); - rc = vsnprintf(buf, bufsiz, fmt, va_local); + rc = vsnprintf(bp, bufsiz, fmt, va_local); if (rc > bufsiz) { bufsiz = rc + BUFSIZ; bp = alloca(bufsiz); va_end(va_local); va_copy(va_local, vap); - rc = vsnprintf(buf, bufsiz, fmt, va_local); + rc = vsnprintf(bp, bufsiz, fmt, va_local); } + va_end(va_local); cp = bp + rc; if (need_nl) { @@ -1302,9 +1311,9 @@ xo_create_to_file (FILE *fp, xo_style_t * @xop XO handle to alter (or NULL for default handle) */ void -xo_destroy (xo_handle_t *xop) +xo_destroy (xo_handle_t *xop_arg) { - xop = xo_default(xop); + xo_handle_t *xop = xo_default(xop_arg); if (xop->xo_close && (xop->xo_flags & XOF_CLOSE_FP)) xop->xo_close(xop->xo_opaque); @@ -1315,7 +1324,7 @@ xo_destroy (xo_handle_t *xop) xo_buf_cleanup(&xop->xo_predicate); xo_buf_cleanup(&xop->xo_attrs); - if (xop == &xo_default_handle) { + if (xop_arg == NULL) { bzero(&xo_default_handle, sizeof(&xo_default_handle)); xo_default_inited = 0; } else @@ -1743,7 +1752,7 @@ xo_format_string_direct (xo_handle_t *xo int need_enc, int have_enc) { int cols = 0; - wchar_t wc; + wchar_t wc = 0; int ilen, olen, width; int attr = (flags & XFF_ATTR); const char *sp; Modified: projects/sendfile/contrib/libxo/libxo/xoconfig.h ============================================================================== --- projects/sendfile/contrib/libxo/libxo/xoconfig.h Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/libxo/libxo/xoconfig.h Wed Nov 19 06:37:18 2014 (r274690) @@ -158,7 +158,7 @@ #define PACKAGE_NAME "libxo" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libxo 0.1.5" +#define PACKAGE_STRING "libxo 0.1.6" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libxo" @@ -167,7 +167,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.1.5" +#define PACKAGE_VERSION "0.1.6" /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be @@ -181,7 +181,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.1.5" +#define VERSION "0.1.6" /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ Modified: projects/sendfile/contrib/libxo/libxo/xoversion.h ============================================================================== --- projects/sendfile/contrib/libxo/libxo/xoversion.h Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/libxo/libxo/xoversion.h Wed Nov 19 06:37:18 2014 (r274690) @@ -18,17 +18,17 @@ /** * The version string */ -#define LIBXO_VERSION "0.1.5" +#define LIBXO_VERSION "0.1.6" /** * The version number */ -#define LIBXO_VERSION_NUMBER 1004 +#define LIBXO_VERSION_NUMBER 1006 /** * The version number as a string */ -#define LIBXO_VERSION_STRING "1004" +#define LIBXO_VERSION_STRING "1006" /** * The version number extra info as a string Modified: projects/sendfile/contrib/libxo/xolint/xolint.pl ============================================================================== --- projects/sendfile/contrib/libxo/xolint/xolint.pl Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/libxo/xolint/xolint.pl Wed Nov 19 06:37:18 2014 (r274690) @@ -28,6 +28,19 @@ sub main { extract_samples() if /^-X/; } + if ($#ARGV < 0) { + print STDERR "xolint [options] files ...\n"; + print STDERR " -c invoke 'cpp' on input\n"; + print STDERR " -C flags Pass flags to cpp\n"; + print STDERR " -d Show debug output\n"; + print STDERR " -D Extract xolint documentation\n"; + print STDERR " -I Print xo_info_t data\n"; + print STDERR " -p Print input data on errors\n"; + print STDERR " -V Print vocabulary (list of tags)\n"; + print STDERR " -X Print examples of invalid use\n"; + exit(1); + } + for $file (@ARGV) { parse_file($file); } @@ -269,9 +282,9 @@ sub check_format { $last = $prev; next; } + $prev = $ch; } - $prev = $ch; $build[$phase] .= $ch; } @@ -346,18 +359,6 @@ sub check_field { info("potential missing slash after N, L, or T with format") if $field[1] =~ /%/; - #@ Format cannot be given when content is present (roles: DNLT) - #@ xo_emit("{T:Max/%6.6s}", "Max"); - #@ Fields with the D, N, L, or T roles can't have both - #@ static literal content ("{T:Title}") and a - #@ format ("{T:/%s}"). - #@ This error will also occur when the content has a backslash - #@ in it, like "{N:Type of I/O}"; backslashes should be escaped, - #@ like "{N:Type of I\\/O}". Note the double backslash, one for - #@ handling 'C' strings, and one for libxo. - error("format cannot be given when content is present") - if $field[1] && $field[2]; - #@ An encoding format cannot be given (roles: DNLT) #@ xo_emit("{T:Max//%s}", "Max"); #@ Fields with the D, N, L, and T roles are not emitted in @@ -367,6 +368,21 @@ sub check_field { if $field[3]; } + # Field is a decoration, label, or title + if ($field[0] =~ /DLN/) { + #@ Format cannot be given when content is present (roles: DLN) + #@ xo_emit("{N:Max/%6.6s}", "Max"); + #@ Fields with the D, L, or N roles can't have both + #@ static literal content ("{L:Label}") and a + #@ format ("{L:/%s}"). + #@ This error will also occur when the content has a backslash + #@ in it, like "{N:Type of I/O}"; backslashes should be escaped, + #@ like "{N:Type of I\\/O}". Note the double backslash, one for + #@ handling 'C' strings, and one for libxo. + error("format cannot be given when content is present") + if $field[1] && $field[2]; + } + # A value field if (length($field[0]) == 0 || $field[0] =~ /V/) { @@ -527,7 +543,7 @@ sub check_field_format { #@ for non-strings. This error may occur from a typo, #@ like "{:tag/%6..6d}" where only one period should be used. error("max width only valid for strings") - if $#chunks >= 2 && $fc =~ /[sS]/; + if $#chunks >= 2 && $fc !~ /[sS]/; } sub error { Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_fileactions.c Wed Nov 19 06:37:18 2014 (r274690) @@ -31,7 +31,7 @@ */ -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include <sys/stat.h> #endif #include <atf-c.h> @@ -251,7 +251,7 @@ ATF_TC_BODY(t_spawn_open_nonexistent, tc posix_spawn_file_actions_destroy(&fa); } -#if defined(__NetBSD__) +#ifdef __NetBSD__ ATF_TC(t_spawn_open_nonexistent_diag); ATF_TC_HEAD(t_spawn_open_nonexistent_diag, tc) @@ -381,7 +381,7 @@ ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, t_spawn_fileactions); ATF_TP_ADD_TC(tp, t_spawn_open_nonexistent); -#if defined(__NetBSD__) +#ifdef __NetBSD__ ATF_TP_ADD_TC(tp, t_spawn_open_nonexistent_diag); #endif ATF_TP_ADD_TC(tp, t_spawn_reopen); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_getcwd.c Wed Nov 19 06:37:18 2014 (r274690) @@ -56,7 +56,7 @@ ATF_TC_BODY(getcwd_err, tc) ATF_REQUIRE(getcwd(buf, 0) == NULL); ATF_REQUIRE(errno == EINVAL); -#if defined(__NetBSD__) +#ifdef __NetBSD__ errno = 0; ATF_REQUIRE(getcwd((void *)-1, sizeof(buf)) == NULL); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_glob.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_glob.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_glob.c Wed Nov 19 06:37:18 2014 (r274690) @@ -46,7 +46,7 @@ __RCSID("$NetBSD: t_glob.c,v 1.3 2013/01 #include <string.h> #include <errno.h> -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include "h_macros.h" #define __gl_stat_t struct stat #define _S_IFDIR S_IFDIR @@ -138,7 +138,7 @@ gl_readdir(void *v) dir.d_ino = dd->pos; dir.d_type = f->dir ? DT_DIR : DT_REG; DPRINTF(("readdir %s %d\n", dir.d_name, dir.d_type)); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ dir.d_reclen = -1; /* Does not have _DIRENT_RECLEN */ #else dir.d_reclen = _DIRENT_RECLEN(&dir, dir.d_namlen); @@ -223,7 +223,7 @@ run(const char *p, int flags, const char } -#if !defined(__FreeBSD__) +#ifndef __FreeBSD__ ATF_TC(glob_star); ATF_TC_HEAD(glob_star, tc) { @@ -272,7 +272,7 @@ ATF_TC_BODY(glob_nocheck, tc) ATF_TP_ADD_TCS(tp) { -#if !defined(__FreeBSD__) +#ifndef __FreeBSD__ ATF_TP_ADD_TC(tp, glob_star); #endif ATF_TP_ADD_TC(tp, glob_star_not); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_humanize_number.c Wed Nov 19 06:37:18 2014 (r274690) @@ -34,7 +34,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include <libutil.h> #else #include <util.h> @@ -82,7 +82,7 @@ const struct hnopts { /* * Truncated output. Rev. 1.7 produces "1.0 K". */ -#if !defined(__FreeBSD__) +#ifndef __FreeBSD__ { 6, 1000, "A", HN_AUTOSCALE, HN_DECIMAL, -1, "" }, /* Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_nice.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_nice.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_nice.c Wed Nov 19 06:37:18 2014 (r274690) @@ -72,7 +72,7 @@ ATF_TC_BODY(nice_err, tc) { int i; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ atf_tc_expect_fail("nice(incr) with incr < 0 fails with unprivileged " "users and sets errno == EPERM; see PR # 189821 for more details"); #endif @@ -98,7 +98,7 @@ ATF_TC_HEAD(nice_priority, tc) ATF_TC_BODY(nice_priority, tc) { -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ int i, pri, pri2, nic; #else int i, pri, nic; @@ -115,7 +115,7 @@ ATF_TC_BODY(nice_priority, tc) pri = getpriority(PRIO_PROCESS, 0); ATF_REQUIRE(errno == 0); -#if defined(__NetBSD__) +#ifdef __NetBSD__ if (nic != pri) atf_tc_fail("nice(3) and getpriority(2) conflict"); #endif @@ -130,14 +130,14 @@ ATF_TC_BODY(nice_priority, tc) if (pid == 0) { errno = 0; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ pri = getpriority(PRIO_PROCESS, 0); #else pri2 = getpriority(PRIO_PROCESS, 0); #endif ATF_REQUIRE(errno == 0); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ if (pri != pri2) #else if (nic != pri) @@ -180,7 +180,7 @@ ATF_TC_HEAD(nice_thread, tc) ATF_TC_BODY(nice_thread, tc) { pthread_t tid[5]; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ int pri, rv, val; #else int rv, val; @@ -196,7 +196,7 @@ ATF_TC_BODY(nice_thread, tc) val = nice(i); ATF_REQUIRE(val != -1); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ pri = getpriority(PRIO_PROCESS, 0); rv = pthread_create(&tid[i], NULL, threadfunc, &pri); #else Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_raise.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_raise.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_raise.c Wed Nov 19 06:37:18 2014 (r274690) @@ -43,7 +43,7 @@ static int count; static void handler_err(int); static void handler_ret(int); static void handler_stress(int); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ static int sig[] = { SIGALRM, SIGIO, SIGUSR1, SIGUSR2 }; #else static int sig[] = { SIGALRM, SIGIO, SIGUSR1, SIGUSR2, SIGPWR }; Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_setdomainname.c Wed Nov 19 06:37:18 2014 (r274690) @@ -63,7 +63,7 @@ ATF_TC_BODY(setdomainname_basic, tc) (void)memset(name, 0, sizeof(name)); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ /* * Sanity checks to ensure that the wrong invariant isn't being * tested for per PR # 181127 @@ -101,7 +101,7 @@ ATF_TC_BODY(setdomainname_limit, tc) (void)memset(name, 0, sizeof(name)); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ ATF_REQUIRE(setdomainname(name, MAXHOSTNAMELEN - 1 ) == 0); ATF_REQUIRE(setdomainname(name, MAXHOSTNAMELEN) == -1); #endif Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c Wed Nov 19 06:37:18 2014 (r274690) @@ -28,7 +28,7 @@ #include <atf-c.h> -#if defined(__NetBSD__) +#ifdef __NetBSD__ #include <sys/inttypes.h> #endif #include <sys/resource.h> @@ -87,7 +87,7 @@ sig_debug(int signo, siginfo_t *info, uc printf("uc_stack %p %lu 0x%x\n", ctx->uc_stack.ss_sp, (unsigned long)ctx->uc_stack.ss_size, ctx->uc_stack.ss_flags); -#if defined(__NetBSD__) +#ifdef __NetBSD__ for (i = 0; i < __arraycount(ctx->uc_mcontext.__gregs); i++) printf("uc_mcontext.greg[%d] 0x%lx\n", i, (long)ctx->uc_mcontext.__gregs[i]); @@ -144,7 +144,7 @@ sigchild_action(int signo, siginfo_t *in printf("si_uid=%d\n", info->si_uid); printf("si_pid=%d\n", info->si_pid); printf("si_status=%d\n", info->si_status); -#if defined(__NetBSD__) +#ifdef __NetBSD__ printf("si_utime=%lu\n", (unsigned long int)info->si_utime); printf("si_stime=%lu\n", (unsigned long int)info->si_stime); #endif Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_time.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_time.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_time.c Wed Nov 19 06:37:18 2014 (r274690) @@ -31,7 +31,7 @@ #include <sys/cdefs.h> __RCSID("$NetBSD: t_time.c,v 1.2 2011/11/11 05:03:38 jruoho Exp $"); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include <sys/time.h> #endif #include <atf-c.h> Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c Wed Nov 19 06:37:18 2014 (r274690) @@ -107,7 +107,7 @@ ATF_TC_BODY(ttyname_r_err, tc) ATF_REQUIRE(rv == ERANGE); } -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ atf_tc_expect_fail("FreeBSD returns ENOTTY instead of EBADF; see bin/191936"); #endif rv = ttyname_r(-1, buf, ttymax); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c Wed Nov 19 06:37:18 2014 (r274690) @@ -132,7 +132,7 @@ h_ctype2(const struct test *t, bool use_ size_t n; ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C"); -#if defined(__NetBSD__) +#ifdef __NetBSD__ ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL); #else if (setlocale(LC_CTYPE, t->locale) == NULL) { @@ -245,7 +245,7 @@ ATF_TC_BODY(mbrtowc_internal, tc) { struct test *t; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ atf_tc_expect_fail("ja_* locale fails"); #endif for (t = &tests[0]; t->data != NULL; ++t) Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c Wed Nov 19 06:37:18 2014 (r274690) @@ -150,7 +150,7 @@ ATF_TC_BODY(mbstowcs_basic, tc) int i; ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C"); -#if defined(__NetBSD__) +#ifdef __NetBSD__ ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL); #else if (setlocale(LC_CTYPE, t->locale) == NULL) { Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_mbtowc.c Wed Nov 19 06:37:18 2014 (r274690) @@ -76,7 +76,7 @@ h_mbtowc(const char *locale, const char char *str; ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C"); -#if defined(__NetBSD__) +#ifdef __NetBSD__ ATF_REQUIRE(setlocale(LC_CTYPE, locale) != NULL); #else if (setlocale(LC_CTYPE, locale) == NULL) { @@ -137,13 +137,13 @@ ATF_TC_BODY(mbtowc, tc) h_mbtowc("ja_JP.ISO2022-JP", "\033$B", "\033$B$\"\033(B"); h_mbtowc("ja_JP.SJIS", "\202", "\202\240"); h_mbtowc("ja_JP.eucJP", "\244", "\244\242"); -#if !defined(__FreeBSD__) +#ifndef __FreeBSD__ /* Moved last as it fails */ h_mbtowc("zh_CN.GB18030", "\241", "\241\241"); #endif h_mbtowc("zh_TW.Big5", "\241", "\241@"); h_mbtowc("zh_TW.eucTW", "\241", "\241\241"); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ atf_tc_expect_fail("zh_CN.GB18030"); h_mbtowc("zh_CN.GB18030", "\241", "\241\241"); #endif Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wcstod.c Wed Nov 19 06:37:18 2014 (r274690) @@ -66,7 +66,7 @@ __RCSID("$NetBSD: t_wcstod.c,v 1.3 2011/ #include <atf-c.h> -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include <stdio.h> #endif Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_wctomb.c Wed Nov 19 06:37:18 2014 (r274690) @@ -109,7 +109,7 @@ h_wctomb(const struct test *t, char tc) size_t sz, ret, i; ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C"); -#if defined(__NetBSD__) +#ifdef __NetBSD__ ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL); #else if (setlocale(LC_CTYPE, t->locale) == NULL) { Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c Wed Nov 19 06:37:18 2014 (r274690) @@ -46,14 +46,14 @@ __RCSID("$NetBSD: t_ether_aton.c,v 1.1 2 #include <string.h> #include <errno.h> -#if !defined(__NetBSD__) -#if defined(__linux__) +#ifndef __NetBSD__ +#ifdef __linux__ #include <netinet/ether.h> #endif #include <net/ethernet.h> #endif -#if defined(__NetBSD__) +#ifdef __NetBSD__ #define ETHER_ADDR_LEN 6 int ether_aton_r(u_char *dest, size_t len, const char *str); @@ -65,7 +65,7 @@ static const struct { int error; } tests[] = { { { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab }, "01:23:45:67:89:ab", 0 }, -#if defined(__NetBSD__) +#ifdef __NetBSD__ { { 0x00, 0x01, 0x22, 0x03, 0x14, 0x05 }, "0:1:22-3:14:05", 0 }, { { 0x00, 0x01, 0x22, 0x03, 0x14, 0x05 }, "000122031405", 0 }, { { 0x0a, 0x0B, 0xcc, 0xdD, 0xEE, 0x0f }, "0a0BccdDEE0f", 0 }, @@ -86,13 +86,13 @@ ATF_TC_HEAD(tc_ether_aton, tc) ATF_TC_BODY(tc_ether_aton, tc) { -#if defined(__NetBSD__) +#ifdef __NetBSD__ u_char dest[ETHER_ADDR_LEN]; #else struct ether_addr dest; #endif size_t t; -#if defined(__NetBSD__) +#ifdef __NetBSD__ int e, r; #else int e; @@ -103,7 +103,7 @@ ATF_TC_BODY(tc_ether_aton, tc) for (t = 0; tests[t].str; t++) { s = tests[t].str; if ((e = tests[t].error) == 0) { -#if defined(__NetBSD__) +#ifdef __NetBSD__ if (ether_aton_r(dest, sizeof(dest), s) != e) atf_tc_fail("failed on `%s'", s); if (memcmp(dest, tests[t].res, sizeof(dest)) != 0) @@ -115,7 +115,7 @@ ATF_TC_BODY(tc_ether_aton, tc) atf_tc_fail("unexpected result on `%s'", s); #endif } else { -#if defined(__NetBSD__) +#ifdef __NetBSD__ if ((r = ether_aton_r(dest, sizeof(dest), s)) != e) atf_tc_fail("unexpectedly succeeded on `%s' " "(%d != %d)", s, r, e); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/regex/debug.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/regex/debug.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/regex/debug.c Wed Nov 19 06:37:18 2014 (r274690) @@ -34,7 +34,7 @@ #include <string.h> #include <sys/types.h> -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include <wchar.h> #include <wctype.h> #endif @@ -54,7 +54,7 @@ static char *regchar(int); void regprint(regex_t *r, FILE *d) { -#if defined(__NetBSD__) +#ifdef __NetBSD__ struct re_guts *g = r->re_g; int c; int last; @@ -177,7 +177,7 @@ s_print(struct re_guts *g, FILE *d) break; case OANYOF: fprintf(d, "[(%ld)", (long)opnd); -#if defined(__NetBSD__) +#ifdef __NetBSD__ cs = &g->sets[opnd]; last = -1; for (size_t i = 0; i < g->csetsize+1; i++) /* +1 flushes */ @@ -250,7 +250,7 @@ s_print(struct re_guts *g, FILE *d) fprintf(d, ">"); break; default: -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ fprintf(d, "!%ld(%ld)!", OP(*s), opnd); #else fprintf(d, "!%d(%d)!", OP(*s), opnd); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_exhaust.c Wed Nov 19 06:37:18 2014 (r274690) @@ -45,7 +45,7 @@ __RCSID("$NetBSD: t_exhaust.c,v 1.7 2011 #include <stdlib.h> #include <err.h> #include <atf-c.h> -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include <sys/resource.h> #endif @@ -179,7 +179,7 @@ ATF_TC_HEAD(regcomp_too_big, tc) " crash, but return a proper error code"); // libtre needs it. atf_tc_set_md_var(tc, "timeout", "600"); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ atf_tc_set_md_var(tc, "require.memory", "64M"); #else atf_tc_set_md_var(tc, "require.memory", "120M"); @@ -189,12 +189,12 @@ ATF_TC_HEAD(regcomp_too_big, tc) ATF_TC_BODY(regcomp_too_big, tc) { regex_t re; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ struct rlimit limit; #endif int e; -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ limit.rlim_cur = limit.rlim_max = 64 * 1024 * 1024; ATF_REQUIRE(setrlimit(RLIMIT_VMEM, &limit) != -1); #endif Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/regex/t_regex_att.c Wed Nov 19 06:37:18 2014 (r274690) @@ -48,7 +48,7 @@ __RCSID("$NetBSD: t_regex_att.c,v 1.1 20 #include <vis.h> #include <ctype.h> #include <atf-c.h> -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include <libutil.h> #endif @@ -377,7 +377,7 @@ checkmatches(const char *matches, size_t " cur=%d, max=%zu", res, l, len - off); off += l; } -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ ATF_CHECK_STREQ_MSG(res, matches, " at line %zu", lineno); #else ATF_REQUIRE_STREQ_MSG(res, matches, " at line %zu", lineno); @@ -580,7 +580,7 @@ ATF_TC_BODY(leftassoc, tc) * any explation. Mark as broken here, but I don't know why. */ atf_tc_expect_fail("Reason for breakage unknown"); #endif -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ atf_tc_expect_fail("The expected and matched groups are mismatched on FreeBSD"); #endif att_test(tc, "leftassoc"); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c Wed Nov 19 06:37:18 2014 (r274690) @@ -42,7 +42,7 @@ __RCSID("$NetBSD: h_atexit.c,v 1.1 2011/ extern int __cxa_atexit(void (*func)(void *), void *, void *); extern void __cxa_finalize(void *); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ /* * On shared object unload, in __cxa_finalize, call and clear all installed * atexit and __cxa_atexit handlers that are either installed by unloaded @@ -191,7 +191,7 @@ main(int argc, char *argv[]) ASSERT(0 == atexit(normal_handler_0)); ASSERT(0 == atexit(normal_handler_1)); -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ ASSERT(0 == __cxa_atexit(cxa_handler_4, &arg_1, dso_handle_1)); ASSERT(0 == __cxa_atexit(cxa_handler_5, &arg_1, dso_handle_1)); ASSERT(0 == __cxa_atexit(cxa_handler_3, &arg_2, dso_handle_2)); Modified: projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c Wed Nov 19 06:14:54 2014 (r274689) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_getopt.c Wed Nov 19 06:37:18 2014 (r274690) @@ -34,7 +34,7 @@ #include <stdlib.h> #include <unistd.h> #include <err.h> -#if defined(__FreeBSD__) +#ifdef __FreeBSD__ #include <libutil.h> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411190637.sAJ6bJDV033746>