Date: Tue, 10 Apr 2018 15:19:31 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r332376 - in user/jeff/numa: . contrib/opencsd etc/mtree include lib lib/libc/aarch64/sys lib/libc/amd64/sys lib/libc/arm/sys lib/libc/gen lib/libc/i386/sys lib/libc/mips/sys lib/libc/p... Message-ID: <201804101519.w3AFJVl9013754@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Tue Apr 10 15:19:30 2018 New Revision: 332376 URL: https://svnweb.freebsd.org/changeset/base/332376 Log: MFH at r332375. Added: user/jeff/numa/contrib/opencsd/ - copied from r332375, head/contrib/opencsd/ user/jeff/numa/lib/libc/stdio/gets_s.c - copied unchanged from r332375, head/lib/libc/stdio/gets_s.c user/jeff/numa/lib/libc/tests/stdio/gets_s_test.c - copied unchanged from r332375, head/lib/libc/tests/stdio/gets_s_test.c user/jeff/numa/lib/libopencsd/ - copied from r332375, head/lib/libopencsd/ user/jeff/numa/share/man/man4/ocs_fc.4 - copied unchanged from r332375, head/share/man/man4/ocs_fc.4 user/jeff/numa/share/man/man4/spigen.4 - copied unchanged from r332375, head/share/man/man4/spigen.4 user/jeff/numa/share/man/man9/OF_child.9 - copied unchanged from r332375, head/share/man/man9/OF_child.9 user/jeff/numa/share/man/man9/OF_device_from_xref.9 - copied unchanged from r332375, head/share/man/man9/OF_device_from_xref.9 user/jeff/numa/share/man/man9/OF_finddevice.9 - copied unchanged from r332375, head/share/man/man9/OF_finddevice.9 user/jeff/numa/share/man/man9/OF_getprop.9 - copied unchanged from r332375, head/share/man/man9/OF_getprop.9 user/jeff/numa/share/man/man9/OF_node_from_xref.9 - copied unchanged from r332375, head/share/man/man9/OF_node_from_xref.9 user/jeff/numa/share/man/man9/OF_package_to_path.9 - copied unchanged from r332375, head/share/man/man9/OF_package_to_path.9 user/jeff/numa/share/man/man9/ofw_bus_is_compatible.9 - copied unchanged from r332375, head/share/man/man9/ofw_bus_is_compatible.9 user/jeff/numa/share/man/man9/ofw_bus_status_okay.9 - copied unchanged from r332375, head/share/man/man9/ofw_bus_status_okay.9 user/jeff/numa/stand/i386/isoboot/ - copied from r332375, head/stand/i386/isoboot/ user/jeff/numa/stand/libsa/cd9660read.c - copied unchanged from r332375, head/stand/libsa/cd9660read.c user/jeff/numa/stand/lua/logo-beastie.lua - copied unchanged from r332375, head/stand/lua/logo-beastie.lua user/jeff/numa/stand/lua/logo-beastiebw.lua - copied unchanged from r332375, head/stand/lua/logo-beastiebw.lua user/jeff/numa/stand/lua/logo-fbsdbw.lua - copied unchanged from r332375, head/stand/lua/logo-fbsdbw.lua user/jeff/numa/stand/lua/logo-orb.lua - copied unchanged from r332375, head/stand/lua/logo-orb.lua user/jeff/numa/stand/lua/logo-orbbw.lua - copied unchanged from r332375, head/stand/lua/logo-orbbw.lua user/jeff/numa/sys/arm/mv/armada38x/armada38x_pl310.h - copied unchanged from r332375, head/sys/arm/mv/armada38x/armada38x_pl310.h user/jeff/numa/sys/arm/mv/armv5_machdep.c - copied unchanged from r332375, head/sys/arm/mv/armv5_machdep.c user/jeff/numa/sys/arm/mv/files.arm7 - copied unchanged from r332375, head/sys/arm/mv/files.arm7 user/jeff/numa/sys/arm/mv/mv_armv7_machdep.c - copied unchanged from r332375, head/sys/arm/mv/mv_armv7_machdep.c user/jeff/numa/sys/arm64/coresight/ - copied from r332375, head/sys/arm64/coresight/ user/jeff/numa/sys/arm64/qualcomm/ - copied from r332375, head/sys/arm64/qualcomm/ user/jeff/numa/sys/dev/ocs_fc/ - copied from r332375, head/sys/dev/ocs_fc/ user/jeff/numa/sys/dev/vmware/vmci/LICENSE - copied unchanged from r332375, head/sys/dev/vmware/vmci/LICENSE user/jeff/numa/sys/dts/arm/overlays/sun8i-a83t-bananapi-m3-emac.dtso - copied unchanged from r332375, head/sys/dts/arm/overlays/sun8i-a83t-bananapi-m3-emac.dtso user/jeff/numa/sys/dts/arm/overlays/sun8i-a83t-emac.dtso - copied unchanged from r332375, head/sys/dts/arm/overlays/sun8i-a83t-emac.dtso user/jeff/numa/sys/dts/arm/overlays/sun8i-a83t-sid.dtso - copied unchanged from r332375, head/sys/dts/arm/overlays/sun8i-a83t-sid.dtso user/jeff/numa/sys/modules/ocs_fc/ - copied from r332375, head/sys/modules/ocs_fc/ user/jeff/numa/tests/sys/netpfil/pf/ioctl/ - copied from r332375, head/tests/sys/netpfil/pf/ioctl/ user/jeff/numa/tools/diag/prtblknos/main.c - copied unchanged from r332375, head/tools/diag/prtblknos/main.c user/jeff/numa/usr.bin/etdump/ - copied from r332375, head/usr.bin/etdump/ Deleted: user/jeff/numa/lib/libc/aarch64/sys/shmat.S user/jeff/numa/lib/libc/aarch64/sys/sigreturn.S user/jeff/numa/lib/libc/amd64/sys/setlogin.S user/jeff/numa/lib/libc/amd64/sys/sigreturn.S user/jeff/numa/lib/libc/arm/sys/shmat.S user/jeff/numa/lib/libc/arm/sys/sigreturn.S user/jeff/numa/lib/libc/i386/sys/setlogin.S user/jeff/numa/lib/libc/i386/sys/sigreturn.S user/jeff/numa/lib/libc/mips/sys/shmat.S user/jeff/numa/lib/libc/powerpc/sys/setlogin.S user/jeff/numa/lib/libc/powerpc64/sys/setlogin.S user/jeff/numa/lib/libc/riscv/sys/shmat.S user/jeff/numa/lib/libc/riscv/sys/sigreturn.S user/jeff/numa/lib/libc/sparc64/sys/setlogin.S user/jeff/numa/stand/i386/libfirewire/fwohcireg.h user/jeff/numa/sys/arm/broadcom/bcm2835/bcm2835_gpio.h user/jeff/numa/sys/arm/mv/mv_machdep.c user/jeff/numa/sys/dts/arm/armada-380.dtsi user/jeff/numa/sys/dts/arm/armada-385-db-ap.dts user/jeff/numa/sys/dts/arm/armada-385.dtsi user/jeff/numa/sys/dts/arm/armada-388-clearfog.dts user/jeff/numa/sys/dts/arm/armada-388-gp.dts user/jeff/numa/sys/dts/arm/armada-388.dtsi user/jeff/numa/sys/dts/arm/armada-38x-solidrun-microsom.dtsi user/jeff/numa/sys/dts/arm/armada-38x.dtsi user/jeff/numa/sys/geom/geom_aes.c Modified: user/jeff/numa/Makefile.inc1 user/jeff/numa/UPDATING user/jeff/numa/etc/mtree/BSD.include.dist user/jeff/numa/etc/mtree/BSD.tests.dist user/jeff/numa/include/pthread.h user/jeff/numa/include/stdio.h user/jeff/numa/lib/Makefile user/jeff/numa/lib/libc/aarch64/sys/Makefile.inc user/jeff/numa/lib/libc/amd64/sys/Makefile.inc user/jeff/numa/lib/libc/arm/sys/Makefile.inc user/jeff/numa/lib/libc/gen/getlogin.c user/jeff/numa/lib/libc/gen/syslog.3 user/jeff/numa/lib/libc/gen/syslog.c user/jeff/numa/lib/libc/i386/sys/Makefile.inc user/jeff/numa/lib/libc/powerpc/sys/Makefile.inc user/jeff/numa/lib/libc/powerpc64/sys/Makefile.inc user/jeff/numa/lib/libc/riscv/sys/Makefile.inc user/jeff/numa/lib/libc/sparc64/sys/Makefile.inc user/jeff/numa/lib/libc/stdio/Makefile.inc user/jeff/numa/lib/libc/stdio/Symbol.map user/jeff/numa/lib/libc/stdio/fgets.3 user/jeff/numa/lib/libc/tests/stdio/Makefile user/jeff/numa/lib/libufs/inode.c user/jeff/numa/lib/libufs/type.c user/jeff/numa/lib/libvmmapi/vmmapi.c user/jeff/numa/lib/libvmmapi/vmmapi.h user/jeff/numa/release/Makefile.gce user/jeff/numa/release/amd64/mkisoimages.sh user/jeff/numa/sbin/camcontrol/camcontrol.8 user/jeff/numa/sbin/fsdb/Makefile user/jeff/numa/sbin/fsdb/fsdbutil.c user/jeff/numa/sbin/geom/class/eli/geli.8 user/jeff/numa/sbin/geom/class/eli/geom_eli.c user/jeff/numa/sbin/reboot/reboot.c user/jeff/numa/sbin/route/route.c user/jeff/numa/share/examples/etc/make.conf user/jeff/numa/share/man/man4/Makefile user/jeff/numa/share/man/man4/cfumass.4 user/jeff/numa/share/man/man4/cm.4 user/jeff/numa/share/man/man4/fpa.4 user/jeff/numa/share/man/man4/geom.4 user/jeff/numa/share/man/man4/snd_hda.4 user/jeff/numa/share/man/man4/vmci.4 user/jeff/numa/share/man/man7/development.7 user/jeff/numa/share/man/man7/hier.7 user/jeff/numa/share/man/man8/rc.subr.8 user/jeff/numa/share/man/man9/BUS_ADD_CHILD.9 user/jeff/numa/share/man/man9/Makefile user/jeff/numa/share/man/man9/timeout.9 user/jeff/numa/share/misc/committers-ports.dot user/jeff/numa/share/mk/bsd.cpu.mk user/jeff/numa/share/mk/bsd.libnames.mk user/jeff/numa/share/mk/src.libnames.mk user/jeff/numa/share/mk/src.opts.mk user/jeff/numa/stand/common/disk.c user/jeff/numa/stand/common/part.c user/jeff/numa/stand/common/part.h user/jeff/numa/stand/defaults/loader.conf user/jeff/numa/stand/efi/libefi/efinet.c user/jeff/numa/stand/forth/efi.4th user/jeff/numa/stand/forth/loader.4th user/jeff/numa/stand/forth/loader.rc user/jeff/numa/stand/i386/Makefile user/jeff/numa/stand/i386/Makefile.inc user/jeff/numa/stand/i386/gptboot/gptboot.c user/jeff/numa/stand/i386/libfirewire/firewire.c user/jeff/numa/stand/i386/libfirewire/fwohci.c user/jeff/numa/stand/i386/libfirewire/fwohci.h user/jeff/numa/stand/i386/loader/loader.rc user/jeff/numa/stand/libsa/cd9660.c user/jeff/numa/stand/lua/Makefile user/jeff/numa/stand/lua/config.lua user/jeff/numa/stand/lua/drawer.lua user/jeff/numa/stand/lua/loader.lua user/jeff/numa/sys/amd64/amd64/db_trace.c user/jeff/numa/sys/amd64/amd64/exception.S user/jeff/numa/sys/amd64/amd64/genassym.c user/jeff/numa/sys/amd64/amd64/machdep.c user/jeff/numa/sys/amd64/amd64/minidump_machdep.c user/jeff/numa/sys/amd64/amd64/mp_machdep.c user/jeff/numa/sys/amd64/amd64/mpboot.S user/jeff/numa/sys/amd64/amd64/pmap.c user/jeff/numa/sys/amd64/amd64/ptrace_machdep.c user/jeff/numa/sys/amd64/amd64/vm_machdep.c user/jeff/numa/sys/amd64/conf/GENERIC user/jeff/numa/sys/amd64/ia32/ia32_misc.c user/jeff/numa/sys/amd64/ia32/ia32_reg.c user/jeff/numa/sys/amd64/ia32/ia32_signal.c user/jeff/numa/sys/amd64/ia32/ia32_sigtramp.S user/jeff/numa/sys/amd64/ia32/ia32_syscall.c user/jeff/numa/sys/amd64/include/smp.h user/jeff/numa/sys/amd64/include/vmm.h user/jeff/numa/sys/amd64/include/vmm_dev.h user/jeff/numa/sys/amd64/linux/linux_dummy.c user/jeff/numa/sys/amd64/linux/linux_sysvec.c user/jeff/numa/sys/amd64/linux32/linux32_dummy.c user/jeff/numa/sys/amd64/linux32/linux32_sysent.c user/jeff/numa/sys/amd64/linux32/linux32_sysvec.c user/jeff/numa/sys/amd64/linux32/syscalls.master user/jeff/numa/sys/amd64/vmm/amd/svm.c user/jeff/numa/sys/amd64/vmm/intel/vmx.c user/jeff/numa/sys/amd64/vmm/vmm.c user/jeff/numa/sys/amd64/vmm/vmm_dev.c user/jeff/numa/sys/amd64/vmm/x86.c user/jeff/numa/sys/arm/allwinner/aw_gpio.c user/jeff/numa/sys/arm/allwinner/aw_if_dwc.c user/jeff/numa/sys/arm/allwinner/aw_sid.c user/jeff/numa/sys/arm/allwinner/axp81x.c user/jeff/numa/sys/arm/allwinner/clkng/aw_clk.h user/jeff/numa/sys/arm/allwinner/clkng/aw_clk_nm.c user/jeff/numa/sys/arm/allwinner/clkng/aw_clk_nm.h user/jeff/numa/sys/arm/allwinner/clkng/ccu_sun8i_r.c user/jeff/numa/sys/arm/allwinner/if_awg.c user/jeff/numa/sys/arm/amlogic/aml8726/aml8726_ccm.c user/jeff/numa/sys/arm/amlogic/aml8726/aml8726_mmc.c user/jeff/numa/sys/arm/amlogic/aml8726/aml8726_pinctrl.c user/jeff/numa/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c user/jeff/numa/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c user/jeff/numa/sys/arm/amlogic/aml8726/aml8726_usb_phy-m6.c user/jeff/numa/sys/arm/annapurna/alpine/alpine_pci_msix.c user/jeff/numa/sys/arm/arm/gic_acpi.c user/jeff/numa/sys/arm/arm/machdep.c user/jeff/numa/sys/arm/arm/vm_machdep.c user/jeff/numa/sys/arm/at91/at91_pinctrl.c user/jeff/numa/sys/arm/broadcom/bcm2835/bcm2835_bsc.c user/jeff/numa/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h user/jeff/numa/sys/arm/broadcom/bcm2835/bcm2835_gpio.c user/jeff/numa/sys/arm/broadcom/bcm2835/bcm2835_intr.c user/jeff/numa/sys/arm/broadcom/bcm2835/bcm2835_pwm.c user/jeff/numa/sys/arm/broadcom/bcm2835/bcm2835_spi.c user/jeff/numa/sys/arm/broadcom/bcm2835/bcm2835_spivar.h user/jeff/numa/sys/arm/broadcom/bcm2835/bcm2836.c user/jeff/numa/sys/arm/conf/ARMADA38X user/jeff/numa/sys/arm/conf/ARMADAXP user/jeff/numa/sys/arm/conf/RPI-B user/jeff/numa/sys/arm/conf/RPI2 user/jeff/numa/sys/arm/freescale/imx/imx_iomux.c user/jeff/numa/sys/arm/freescale/vybrid/vf_ccm.c user/jeff/numa/sys/arm/freescale/vybrid/vf_iomuxc.c user/jeff/numa/sys/arm/include/intr.h user/jeff/numa/sys/arm/mv/armada/wdt.c user/jeff/numa/sys/arm/mv/armada38x/armada38x.c user/jeff/numa/sys/arm/mv/armada38x/armada38x_mp.c user/jeff/numa/sys/arm/mv/armada38x/armada38x_pl310.c user/jeff/numa/sys/arm/mv/armada38x/std.armada38x user/jeff/numa/sys/arm/mv/armadaxp/armadaxp.c user/jeff/numa/sys/arm/mv/armadaxp/armadaxp_mp.c user/jeff/numa/sys/arm/mv/armadaxp/std.mv78x60 user/jeff/numa/sys/arm/mv/files.mv user/jeff/numa/sys/arm/mv/gpio.c user/jeff/numa/sys/arm/mv/mpic.c user/jeff/numa/sys/arm/mv/mv_common.c user/jeff/numa/sys/arm/mv/mv_localbus.c user/jeff/numa/sys/arm/mv/mv_pci.c user/jeff/numa/sys/arm/mv/mv_pci_ctrl.c user/jeff/numa/sys/arm/mv/mvreg.h user/jeff/numa/sys/arm/mv/mvvar.h user/jeff/numa/sys/arm/mv/mvwin.h user/jeff/numa/sys/arm/mv/std-pj4b.mv user/jeff/numa/sys/arm/mv/timer.c user/jeff/numa/sys/arm/nvidia/as3722_gpio.c user/jeff/numa/sys/arm/nvidia/as3722_regulators.c user/jeff/numa/sys/arm/nvidia/drm2/tegra_drm_subr.c user/jeff/numa/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c user/jeff/numa/sys/arm/nvidia/tegra_pinmux.c user/jeff/numa/sys/arm/nvidia/tegra_usbphy.c user/jeff/numa/sys/arm/ti/cpsw/if_cpsw.c user/jeff/numa/sys/arm/ti/ti_adc.c user/jeff/numa/sys/arm/ti/ti_hwmods.c user/jeff/numa/sys/arm/ti/ti_pinmux.c user/jeff/numa/sys/arm/ti/usb/omap_host.c user/jeff/numa/sys/arm/xilinx/zy7_gpio.c user/jeff/numa/sys/arm64/arm64/machdep.c user/jeff/numa/sys/arm64/arm64/trap.c user/jeff/numa/sys/arm64/conf/GENERIC user/jeff/numa/sys/cam/scsi/scsi_cd.c user/jeff/numa/sys/cam/scsi/scsi_da.c user/jeff/numa/sys/cam/scsi/scsi_enc.c user/jeff/numa/sys/cam/scsi/scsi_pass.c user/jeff/numa/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/jeff/numa/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/jeff/numa/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_removal.c user/jeff/numa/sys/cddl/dev/dtrace/dtrace_cddl.h user/jeff/numa/sys/compat/freebsd32/freebsd32_ioctl.c user/jeff/numa/sys/compat/freebsd32/freebsd32_misc.c user/jeff/numa/sys/compat/freebsd32/freebsd32_sysent.c user/jeff/numa/sys/compat/ia32/ia32_genassym.c user/jeff/numa/sys/compat/ia32/ia32_sysvec.c user/jeff/numa/sys/compat/linux/linux_emul.c user/jeff/numa/sys/compat/linux/linux_emul.h user/jeff/numa/sys/compat/linux/linux_ioctl.c user/jeff/numa/sys/compat/linux/linux_util.c user/jeff/numa/sys/compat/linuxkpi/common/include/asm/smp.h user/jeff/numa/sys/compat/linuxkpi/common/include/linux/module.h user/jeff/numa/sys/compat/linuxkpi/common/src/linux_compat.c user/jeff/numa/sys/compat/linuxkpi/common/src/linux_pci.c user/jeff/numa/sys/compat/linuxkpi/common/src/linux_rcu.c user/jeff/numa/sys/compat/linuxkpi/common/src/linux_schedule.c user/jeff/numa/sys/conf/NOTES user/jeff/numa/sys/conf/files user/jeff/numa/sys/conf/files.arm64 user/jeff/numa/sys/conf/kern.post.mk user/jeff/numa/sys/conf/options user/jeff/numa/sys/conf/options.amd64 user/jeff/numa/sys/conf/options.arm64 user/jeff/numa/sys/conf/options.mips user/jeff/numa/sys/conf/options.powerpc user/jeff/numa/sys/contrib/ck/FREEBSD-Xlist user/jeff/numa/sys/contrib/ck/include/ck_cc.h user/jeff/numa/sys/contrib/ck/include/ck_hs.h user/jeff/numa/sys/contrib/ck/include/ck_md.h user/jeff/numa/sys/contrib/ck/include/ck_pr.h user/jeff/numa/sys/contrib/ck/include/ck_queue.h user/jeff/numa/sys/contrib/ck/include/ck_ring.h user/jeff/numa/sys/contrib/ck/include/gcc/ck_cc.h user/jeff/numa/sys/contrib/ck/include/gcc/ck_pr.h user/jeff/numa/sys/contrib/ck/include/gcc/sparcv9/ck_pr.h user/jeff/numa/sys/contrib/ck/include/gcc/x86/ck_pr.h user/jeff/numa/sys/contrib/ck/include/gcc/x86_64/ck_pr.h user/jeff/numa/sys/contrib/ck/include/spinlock/dec.h user/jeff/numa/sys/contrib/ck/src/ck_hs.c user/jeff/numa/sys/contrib/ck/src/ck_ht.c user/jeff/numa/sys/contrib/ck/src/ck_ht_hash.h user/jeff/numa/sys/contrib/ck/src/ck_internal.h user/jeff/numa/sys/contrib/ck/src/ck_rhs.c user/jeff/numa/sys/dev/aac/aac.c user/jeff/numa/sys/dev/aacraid/aacraid.c user/jeff/numa/sys/dev/acpica/acpi_hpet.c user/jeff/numa/sys/dev/ahci/ahci_mv_fdt.c user/jeff/numa/sys/dev/altera/avgen/altera_avgen_fdt.c user/jeff/numa/sys/dev/an/if_an.c user/jeff/numa/sys/dev/ath/if_ath_ioctl.c user/jeff/numa/sys/dev/atkbdc/atkbd.c user/jeff/numa/sys/dev/atkbdc/atkbdc_ebus.c user/jeff/numa/sys/dev/cesa/cesa.c user/jeff/numa/sys/dev/cesa/cesa.h user/jeff/numa/sys/dev/cm/if_cm_isa.c user/jeff/numa/sys/dev/cpufreq/cpufreq_dt.c user/jeff/numa/sys/dev/cxgbe/adapter.h user/jeff/numa/sys/dev/cxgbe/common/common.h user/jeff/numa/sys/dev/cxgbe/t4_main.c user/jeff/numa/sys/dev/cxgbe/tom/t4_tom.c user/jeff/numa/sys/dev/cy/cy.c user/jeff/numa/sys/dev/dpaa/qman_fdt.c user/jeff/numa/sys/dev/drm2/drmP.h user/jeff/numa/sys/dev/drm2/drm_ioc32.c user/jeff/numa/sys/dev/drm2/i915/i915_ioc32.c user/jeff/numa/sys/dev/drm2/radeon/radeon_ioc32.c user/jeff/numa/sys/dev/etherswitch/e6000sw/e6000sw.c user/jeff/numa/sys/dev/ex/if_ex.c user/jeff/numa/sys/dev/extres/clk/clk.c user/jeff/numa/sys/dev/extres/phy/phy.c user/jeff/numa/sys/dev/extres/regulator/regulator.c user/jeff/numa/sys/dev/extres/syscon/syscon.c user/jeff/numa/sys/dev/fdt/fdt_clock.c user/jeff/numa/sys/dev/fdt/fdt_common.c user/jeff/numa/sys/dev/fdt/fdt_common.h user/jeff/numa/sys/dev/fdt/fdt_pinctrl.c user/jeff/numa/sys/dev/fdt/fdt_slicer.c user/jeff/numa/sys/dev/filemon/filemon.c user/jeff/numa/sys/dev/filemon/filemon_wrapper.c user/jeff/numa/sys/dev/firewire/fwohci_pci.c user/jeff/numa/sys/dev/firewire/fwohcireg.h user/jeff/numa/sys/dev/gpio/gpiokeys.c user/jeff/numa/sys/dev/gpio/gpioled_fdt.c user/jeff/numa/sys/dev/gpio/gpioregulator.c user/jeff/numa/sys/dev/gpio/ofw_gpiobus.c user/jeff/numa/sys/dev/hyperv/vmbus/hyperv.c user/jeff/numa/sys/dev/if_ndis/if_ndis.c user/jeff/numa/sys/dev/iicbus/adt746x.c user/jeff/numa/sys/dev/ipmi/ipmi_kcs.c user/jeff/numa/sys/dev/iwi/if_iwi.c user/jeff/numa/sys/dev/ixgb/if_ixgb.c user/jeff/numa/sys/dev/ixl/ixl_pf_main.c user/jeff/numa/sys/dev/kbdmux/kbdmux.c user/jeff/numa/sys/dev/le/lebuffer_sbus.c user/jeff/numa/sys/dev/md/md.c user/jeff/numa/sys/dev/mfi/mfi.c user/jeff/numa/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c user/jeff/numa/sys/dev/mlx5/driver.h user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_core.h user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_crspace.c user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_eq.c user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_health.c user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_main.c user/jeff/numa/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/jeff/numa/sys/dev/mpr/mpr_user.c user/jeff/numa/sys/dev/mps/mps_user.c user/jeff/numa/sys/dev/mrsas/mrsas_linux.c user/jeff/numa/sys/dev/mwl/if_mwl.c user/jeff/numa/sys/dev/neta/if_mvneta_fdt.c user/jeff/numa/sys/dev/netmap/if_em_netmap.h user/jeff/numa/sys/dev/netmap/if_igb_netmap.h user/jeff/numa/sys/dev/netmap/if_ixl_netmap.h user/jeff/numa/sys/dev/netmap/if_lem_netmap.h user/jeff/numa/sys/dev/netmap/if_ptnet.c user/jeff/numa/sys/dev/netmap/if_re_netmap.h user/jeff/numa/sys/dev/netmap/if_vtnet_netmap.h user/jeff/numa/sys/dev/netmap/ixgbe_netmap.h user/jeff/numa/sys/dev/netmap/netmap.c user/jeff/numa/sys/dev/netmap/netmap_freebsd.c user/jeff/numa/sys/dev/netmap/netmap_generic.c user/jeff/numa/sys/dev/netmap/netmap_kern.h user/jeff/numa/sys/dev/netmap/netmap_mem2.c user/jeff/numa/sys/dev/netmap/netmap_mem2.h user/jeff/numa/sys/dev/netmap/netmap_monitor.c user/jeff/numa/sys/dev/netmap/netmap_offloadings.c user/jeff/numa/sys/dev/netmap/netmap_pipe.c user/jeff/numa/sys/dev/netmap/netmap_pt.c user/jeff/numa/sys/dev/netmap/netmap_vale.c user/jeff/numa/sys/dev/null/null.c user/jeff/numa/sys/dev/nxge/if_nxge.c user/jeff/numa/sys/dev/oce/oce_if.c user/jeff/numa/sys/dev/ofw/ofw_bus_subr.c user/jeff/numa/sys/dev/ofw/ofw_bus_subr.h user/jeff/numa/sys/dev/ofw/openfirm.c user/jeff/numa/sys/dev/ofw/openfirm.h user/jeff/numa/sys/dev/pci/pci_user.c user/jeff/numa/sys/dev/pdq/if_fpa.c user/jeff/numa/sys/dev/qlnx/qlnxe/qlnx_os.c user/jeff/numa/sys/dev/rp/rp.c user/jeff/numa/sys/dev/sbni/if_sbni.c user/jeff/numa/sys/dev/sfxge/sfxge.c user/jeff/numa/sys/dev/sio/sio.c user/jeff/numa/sys/dev/spibus/ofw_spibus.c user/jeff/numa/sys/dev/spibus/spibus.c user/jeff/numa/sys/dev/spibus/spibusvar.h user/jeff/numa/sys/dev/spibus/spigen.c user/jeff/numa/sys/dev/syscons/scvidctl.c user/jeff/numa/sys/dev/syscons/syscons.c user/jeff/numa/sys/dev/uart/uart_kbd_sun.c user/jeff/numa/sys/dev/usb/controller/ehci_fsl.c user/jeff/numa/sys/dev/usb/input/ukbd.c user/jeff/numa/sys/dev/vkbd/vkbd.c user/jeff/numa/sys/dev/vmware/vmci/vmci.c user/jeff/numa/sys/dev/vmware/vmci/vmci.h user/jeff/numa/sys/dev/vmware/vmci/vmci_call_defs.h user/jeff/numa/sys/dev/vmware/vmci/vmci_datagram.c user/jeff/numa/sys/dev/vmware/vmci/vmci_datagram.h user/jeff/numa/sys/dev/vmware/vmci/vmci_defs.h user/jeff/numa/sys/dev/vmware/vmci/vmci_doorbell.c user/jeff/numa/sys/dev/vmware/vmci/vmci_doorbell.h user/jeff/numa/sys/dev/vmware/vmci/vmci_driver.c user/jeff/numa/sys/dev/vmware/vmci/vmci_driver.h user/jeff/numa/sys/dev/vmware/vmci/vmci_event.c user/jeff/numa/sys/dev/vmware/vmci/vmci_event.h user/jeff/numa/sys/dev/vmware/vmci/vmci_hashtable.c user/jeff/numa/sys/dev/vmware/vmci/vmci_hashtable.h user/jeff/numa/sys/dev/vmware/vmci/vmci_kernel_api.h user/jeff/numa/sys/dev/vmware/vmci/vmci_kernel_api_1.h user/jeff/numa/sys/dev/vmware/vmci/vmci_kernel_api_2.h user/jeff/numa/sys/dev/vmware/vmci/vmci_kernel_defs.h user/jeff/numa/sys/dev/vmware/vmci/vmci_kernel_if.c user/jeff/numa/sys/dev/vmware/vmci/vmci_kernel_if.h user/jeff/numa/sys/dev/vmware/vmci/vmci_qpair.c user/jeff/numa/sys/dev/vmware/vmci/vmci_queue.h user/jeff/numa/sys/dev/vmware/vmci/vmci_queue_pair.c user/jeff/numa/sys/dev/vmware/vmci/vmci_queue_pair.h user/jeff/numa/sys/dev/vmware/vmci/vmci_resource.c user/jeff/numa/sys/dev/vmware/vmci/vmci_resource.h user/jeff/numa/sys/dev/vmware/vmci/vmci_utils.h user/jeff/numa/sys/dev/vnic/thunder_bgx_fdt.c user/jeff/numa/sys/dev/vt/vt_core.c user/jeff/numa/sys/dev/vt/vt_font.c user/jeff/numa/sys/dev/vxge/vxge.c user/jeff/numa/sys/dts/arm/db78460.dts user/jeff/numa/sys/dts/arm/rpi.dts user/jeff/numa/sys/dts/arm/rpi2.dts user/jeff/numa/sys/fs/cd9660/iso.h user/jeff/numa/sys/fs/cuse/cuse.c user/jeff/numa/sys/fs/devfs/devfs_devs.c user/jeff/numa/sys/fs/procfs/procfs_dbregs.c user/jeff/numa/sys/fs/procfs/procfs_fpregs.c user/jeff/numa/sys/fs/procfs/procfs_ioctl.c user/jeff/numa/sys/fs/procfs/procfs_map.c user/jeff/numa/sys/fs/procfs/procfs_regs.c user/jeff/numa/sys/geom/eli/g_eli_ctl.c user/jeff/numa/sys/geom/geom_dev.c user/jeff/numa/sys/geom/geom_subr.c user/jeff/numa/sys/geom/label/g_label_disk_ident.c user/jeff/numa/sys/geom/raid/md_ddf.c user/jeff/numa/sys/geom/raid/md_intel.c user/jeff/numa/sys/i386/i386/genassym.c user/jeff/numa/sys/i386/i386/locore.s user/jeff/numa/sys/i386/i386/machdep.c user/jeff/numa/sys/i386/i386/mp_machdep.c user/jeff/numa/sys/i386/i386/sigtramp.s user/jeff/numa/sys/i386/i386/vm_machdep.c user/jeff/numa/sys/i386/include/smp.h user/jeff/numa/sys/i386/linux/linux_dummy.c user/jeff/numa/sys/i386/linux/linux_sysvec.c user/jeff/numa/sys/kern/imgact_elf.c user/jeff/numa/sys/kern/init_sysent.c user/jeff/numa/sys/kern/kern_descrip.c user/jeff/numa/sys/kern/kern_event.c user/jeff/numa/sys/kern/kern_exec.c user/jeff/numa/sys/kern/kern_exit.c user/jeff/numa/sys/kern/kern_jail.c user/jeff/numa/sys/kern/kern_mib.c user/jeff/numa/sys/kern/kern_module.c user/jeff/numa/sys/kern/kern_proc.c user/jeff/numa/sys/kern/kern_prot.c user/jeff/numa/sys/kern/kern_resource.c user/jeff/numa/sys/kern/kern_sendfile.c user/jeff/numa/sys/kern/kern_sharedpage.c user/jeff/numa/sys/kern/kern_sig.c user/jeff/numa/sys/kern/kern_sysctl.c user/jeff/numa/sys/kern/kern_tc.c user/jeff/numa/sys/kern/kern_thr.c user/jeff/numa/sys/kern/kern_umtx.c user/jeff/numa/sys/kern/kern_xxx.c user/jeff/numa/sys/kern/makesyscalls.sh user/jeff/numa/sys/kern/subr_dummy_vdso_tc.c user/jeff/numa/sys/kern/subr_lock.c user/jeff/numa/sys/kern/sys_generic.c user/jeff/numa/sys/kern/sys_getrandom.c user/jeff/numa/sys/kern/sys_pipe.c user/jeff/numa/sys/kern/sys_process.c user/jeff/numa/sys/kern/syscalls.master user/jeff/numa/sys/kern/sysv_ipc.c user/jeff/numa/sys/kern/sysv_msg.c user/jeff/numa/sys/kern/sysv_sem.c user/jeff/numa/sys/kern/sysv_shm.c user/jeff/numa/sys/kern/tty.c user/jeff/numa/sys/kern/tty_compat.c user/jeff/numa/sys/kern/uipc_mqueue.c user/jeff/numa/sys/kern/uipc_sem.c user/jeff/numa/sys/kern/uipc_socket.c user/jeff/numa/sys/kern/uipc_syscalls.c user/jeff/numa/sys/kern/vfs_aio.c user/jeff/numa/sys/kern/vfs_bio.c user/jeff/numa/sys/kern/vfs_subr.c user/jeff/numa/sys/kern/vfs_syscalls.c user/jeff/numa/sys/mips/include/reg.h user/jeff/numa/sys/mips/include/sigframe.h user/jeff/numa/sys/mips/include/tls.h user/jeff/numa/sys/mips/include/ucontext.h user/jeff/numa/sys/mips/ingenic/jz4780_pinctrl.c user/jeff/numa/sys/mips/mediatek/fdt_reset.c user/jeff/numa/sys/mips/mediatek/mtk_pinctrl.c user/jeff/numa/sys/mips/mips/freebsd32_machdep.c user/jeff/numa/sys/mips/mips/pm_machdep.c user/jeff/numa/sys/mips/mips/swtch.S user/jeff/numa/sys/mips/mips/trap.c user/jeff/numa/sys/mips/mips/vm_machdep.c user/jeff/numa/sys/modules/Makefile user/jeff/numa/sys/modules/aac/Makefile user/jeff/numa/sys/modules/aacraid/Makefile user/jeff/numa/sys/modules/cam/Makefile user/jeff/numa/sys/modules/cryptodev/Makefile user/jeff/numa/sys/modules/cuse/Makefile user/jeff/numa/sys/modules/drm2/drm2/Makefile user/jeff/numa/sys/modules/drm2/i915kms/Makefile user/jeff/numa/sys/modules/drm2/radeonkms/Makefile user/jeff/numa/sys/modules/dtrace/dtrace/Makefile user/jeff/numa/sys/modules/dtrace/dtraceall/Makefile user/jeff/numa/sys/modules/dtrace/dtraceall/dtraceall.c user/jeff/numa/sys/modules/dtrace/fasttrap/Makefile user/jeff/numa/sys/modules/filemon/Makefile user/jeff/numa/sys/modules/hyperv/vmbus/Makefile user/jeff/numa/sys/modules/i2c/iicbus/Makefile user/jeff/numa/sys/modules/i2c/isl/Makefile user/jeff/numa/sys/modules/if_tap/Makefile user/jeff/numa/sys/modules/isp/Makefile user/jeff/numa/sys/modules/kbdmux/Makefile user/jeff/numa/sys/modules/linux/Makefile user/jeff/numa/sys/modules/linux64/Makefile user/jeff/numa/sys/modules/linux_common/Makefile user/jeff/numa/sys/modules/mfi/Makefile user/jeff/numa/sys/modules/mpr/Makefile user/jeff/numa/sys/modules/mps/Makefile user/jeff/numa/sys/modules/mqueue/Makefile user/jeff/numa/sys/modules/procfs/Makefile user/jeff/numa/sys/modules/rp/Makefile user/jeff/numa/sys/modules/sem/Makefile user/jeff/numa/sys/modules/sgx/Makefile user/jeff/numa/sys/modules/sio/Makefile user/jeff/numa/sys/modules/spi/at45d/Makefile user/jeff/numa/sys/modules/spi/mx25l/Makefile user/jeff/numa/sys/modules/spi/spibus/Makefile user/jeff/numa/sys/modules/spigen/Makefile user/jeff/numa/sys/modules/sysvipc/sysvmsg/Makefile user/jeff/numa/sys/modules/sysvipc/sysvsem/Makefile user/jeff/numa/sys/modules/sysvipc/sysvshm/Makefile user/jeff/numa/sys/modules/usb/ukbd/Makefile user/jeff/numa/sys/modules/vkbd/Makefile user/jeff/numa/sys/modules/vmware/vmci/Makefile user/jeff/numa/sys/net/bpf.c user/jeff/numa/sys/net/if.c user/jeff/numa/sys/net/if.h user/jeff/numa/sys/net/if_gif.c user/jeff/numa/sys/net/if_gre.c user/jeff/numa/sys/net/if_ipsec.c user/jeff/numa/sys/net/if_spppsubr.c user/jeff/numa/sys/net/if_tap.c user/jeff/numa/sys/net/if_var.h user/jeff/numa/sys/net/if_vlan.c user/jeff/numa/sys/net/iflib.c user/jeff/numa/sys/net/netmap.h user/jeff/numa/sys/net/netmap_user.h user/jeff/numa/sys/net/netmap_virt.h user/jeff/numa/sys/net/pfvar.h user/jeff/numa/sys/net/rtsock.c user/jeff/numa/sys/net80211/ieee80211_ioctl.c user/jeff/numa/sys/netinet/in_jail.c user/jeff/numa/sys/netinet/in_pcb.c user/jeff/numa/sys/netinet/in_prot.c user/jeff/numa/sys/netinet/ip_carp.c user/jeff/numa/sys/netinet/sctp_input.c user/jeff/numa/sys/netinet/sctp_os_bsd.h user/jeff/numa/sys/netinet/sctp_syscalls.c user/jeff/numa/sys/netinet/sctp_usrreq.c user/jeff/numa/sys/netinet/tcp_offload.c user/jeff/numa/sys/netinet/tcp_offload.h user/jeff/numa/sys/netinet/tcp_seq.h user/jeff/numa/sys/netinet/tcp_subr.c user/jeff/numa/sys/netinet/tcp_usrreq.c user/jeff/numa/sys/netinet/toecore.c user/jeff/numa/sys/netinet/toecore.h user/jeff/numa/sys/netinet6/in6.c user/jeff/numa/sys/netinet6/in6_jail.c user/jeff/numa/sys/netinet6/sctp6_usrreq.c user/jeff/numa/sys/netpfil/pf/if_pfsync.c user/jeff/numa/sys/netpfil/pf/pf_ioctl.c user/jeff/numa/sys/netpfil/pf/pf_table.c user/jeff/numa/sys/opencrypto/cryptodev.c user/jeff/numa/sys/opencrypto/cryptosoft.c user/jeff/numa/sys/powerpc/aim/aim_machdep.c user/jeff/numa/sys/powerpc/aim/mmu_oea64.c user/jeff/numa/sys/powerpc/booke/booke_machdep.c user/jeff/numa/sys/powerpc/booke/pmap.c user/jeff/numa/sys/powerpc/include/reg.h user/jeff/numa/sys/powerpc/include/spr.h user/jeff/numa/sys/powerpc/include/vmparam.h user/jeff/numa/sys/powerpc/mpc85xx/fsl_diu.c user/jeff/numa/sys/powerpc/mpc85xx/lbc.c user/jeff/numa/sys/powerpc/ofw/ofw_real.c user/jeff/numa/sys/powerpc/powermac/macio.c user/jeff/numa/sys/powerpc/powermac/uninorth.c user/jeff/numa/sys/powerpc/powerpc/altivec.c user/jeff/numa/sys/powerpc/powerpc/cpu.c user/jeff/numa/sys/powerpc/powerpc/exec_machdep.c user/jeff/numa/sys/powerpc/powerpc/fpu.c user/jeff/numa/sys/powerpc/powerpc/machdep.c user/jeff/numa/sys/powerpc/powerpc/ptrace_machdep.c user/jeff/numa/sys/powerpc/powerpc/sys_machdep.c user/jeff/numa/sys/powerpc/powerpc/trap.c user/jeff/numa/sys/powerpc/psim/iobus.c user/jeff/numa/sys/security/mac/mac_net.c user/jeff/numa/sys/sparc64/central/central.c user/jeff/numa/sys/sparc64/ebus/ebus.c user/jeff/numa/sys/sparc64/fhc/fhc.c user/jeff/numa/sys/sparc64/isa/isa.c user/jeff/numa/sys/sparc64/pci/ofw_pci.c user/jeff/numa/sys/sparc64/sbus/dma_sbus.c user/jeff/numa/sys/sparc64/sbus/sbus.c user/jeff/numa/sys/sparc64/sparc64/exception.S user/jeff/numa/sys/sparc64/sparc64/machdep.c user/jeff/numa/sys/sparc64/sparc64/nexus.c user/jeff/numa/sys/sparc64/sparc64/upa.c user/jeff/numa/sys/sys/module.h user/jeff/numa/sys/sys/param.h user/jeff/numa/sys/sys/proc.h user/jeff/numa/sys/sys/spigenio.h user/jeff/numa/sys/teken/libteken/teken.3 user/jeff/numa/sys/teken/teken.c user/jeff/numa/sys/teken/teken.h user/jeff/numa/sys/teken/teken_scs.h user/jeff/numa/sys/teken/teken_subr.h user/jeff/numa/sys/teken/teken_subr_compat.h user/jeff/numa/sys/teken/teken_wcwidth.h user/jeff/numa/sys/ufs/ffs/ffs_softdep.c user/jeff/numa/sys/ufs/ffs/softdep.h user/jeff/numa/sys/vm/swap_pager.c user/jeff/numa/sys/vm/uma_core.c user/jeff/numa/sys/vm/vm_map.c user/jeff/numa/sys/vm/vm_map.h user/jeff/numa/sys/vm/vm_meter.c user/jeff/numa/sys/vm/vm_mmap.c user/jeff/numa/sys/vm/vm_page.c user/jeff/numa/sys/vm/vm_page.h user/jeff/numa/sys/vm/vm_pageout.c user/jeff/numa/sys/vm/vm_pagequeue.h user/jeff/numa/sys/vm/vm_unix.c user/jeff/numa/sys/x86/include/init.h user/jeff/numa/sys/x86/include/x86_smp.h user/jeff/numa/sys/x86/x86/cpu_machdep.c user/jeff/numa/sys/x86/x86/mp_x86.c user/jeff/numa/sys/x86/x86/tsc.c user/jeff/numa/tests/sys/netpfil/Makefile user/jeff/numa/tests/sys/netpfil/pf/Makefile user/jeff/numa/tools/diag/prtblknos/Makefile user/jeff/numa/tools/diag/prtblknos/prtblknos.c user/jeff/numa/usr.bin/Makefile user/jeff/numa/usr.bin/calendar/calendars/calendar.freebsd user/jeff/numa/usr.bin/head/head.1 user/jeff/numa/usr.bin/head/head.c user/jeff/numa/usr.bin/systat/sctp.c user/jeff/numa/usr.bin/tail/tail.1 user/jeff/numa/usr.bin/tail/tail.c user/jeff/numa/usr.bin/vtfontcvt/vtfontcvt.c user/jeff/numa/usr.sbin/bhyve/bhyve.8 user/jeff/numa/usr.sbin/bhyve/bhyverun.c user/jeff/numa/usr.sbin/bhyvectl/bhyvectl.c user/jeff/numa/usr.sbin/ctld/ctl.conf.5 user/jeff/numa/usr.sbin/makefs/cd9660.c user/jeff/numa/usr.sbin/makefs/cd9660/cd9660_eltorito.c user/jeff/numa/usr.sbin/makefs/cd9660/cd9660_eltorito.h user/jeff/numa/usr.sbin/makefs/ffs.c user/jeff/numa/usr.sbin/makefs/makefs.8 user/jeff/numa/usr.sbin/syslogd/Makefile user/jeff/numa/usr.sbin/syslogd/syslogd.c Directory Properties: user/jeff/numa/ (props changed) user/jeff/numa/sys/cddl/contrib/opensolaris/ (props changed) user/jeff/numa/sys/contrib/ck/ (props changed) Modified: user/jeff/numa/Makefile.inc1 ============================================================================== --- user/jeff/numa/Makefile.inc1 Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/Makefile.inc1 Tue Apr 10 15:19:30 2018 (r332376) @@ -802,11 +802,13 @@ _sanity_check: .PHONY .MAKE # tree changes, particularly with respect to removing source files and # replacing generated files. Handle these cases here in an ad-hoc fashion. _cleanobj_fast_depend_hack: .PHONY -# Syscall stubs rewritten in C +# Syscall stubs rewritten in C and obsolete MD assembly implementations # Date SVN Rev Syscalls -# 20160829 r305012 ptrace # 20170624 r320278 fstat fstatat fstatfs getdirentries getfsstat statfs -.for f in fstat fstatat fstatfs getdirentries getfsstat ptrace statfs +# 20180404 r332048 sigreturn +# 20180405 r332080 shmat +# 20180406 r332119 setlogin +.for f in fstat fstatat fstatfs getdirentries getfsstat setlogin shmat sigreturn statfs .if exists(${OBJTOP}/lib/libc/.depend.${f}.o) @if egrep -qw '${f}\.[sS]' \ ${OBJTOP}/lib/libc/.depend.${f}.o; then \ Modified: user/jeff/numa/UPDATING ============================================================================== --- user/jeff/numa/UPDATING Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/UPDATING Tue Apr 10 15:19:30 2018 (r332376) @@ -51,6 +51,45 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** SPECIAL WARNING: ****************************** +20180406: + In addition to supporting RFC 3164 formatted messages, the + syslogd(8) service is now capable of parsing RFC 5424 formatted + log messages. The main benefit of using RFC 5424 is that clients + may now send log messages with timestamps containing year numbers, + microseconds and time zone offsets. + + Similarly, the syslog(3) C library function has been altered to + send RFC 5424 formatted messages to the local system logging + daemon. On systems using syslogd(8), this change should have no + negative impact, as long as syslogd(8) and the C library are + updated at the same time. On systems using a different system + logging daemon, it may be necessary to make configuration + adjustments, depending on the software used. + + When using syslog-ng, add the 'syslog-protocol' flag to local + input sources to enable parsing of RFC 5424 formatted messages: + + source src { + unix-dgram("/var/run/log" flags(syslog-protocol)); + } + + When using rsyslog, disable the 'SysSock.UseSpecialParser' option + of the 'imuxsock' module to let messages be processed by the + regular RFC 3164/5424 parsing pipeline: + + module(load="imuxsock" SysSock.UseSpecialParser="off") + + Do note that these changes only affect communication between local + applications and syslogd(8). The format that syslogd(8) uses to + store messages on disk or forward messages to other systems + remains unchanged. syslogd(8) still uses RFC 3164 for these + purposes. Options to customize this behaviour will be added in the + future. Utilities that process log files stored in /var/log are + thus expected to continue to function as before. + + __FreeBSD_version has been incremented to 1200061 to denote this + change. + 20180328: Support for token ring networks has been removed. If you have "device token" in your kernel config you should remove Modified: user/jeff/numa/etc/mtree/BSD.include.dist ============================================================================== --- user/jeff/numa/etc/mtree/BSD.include.dist Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/etc/mtree/BSD.include.dist Tue Apr 10 15:19:30 2018 (r332376) @@ -317,6 +317,18 @@ .. nfsserver .. + opencsd + c_api + .. + etmv3 + .. + etmv4 + .. + ptm + .. + stm + .. + .. openssl .. pcap Modified: user/jeff/numa/etc/mtree/BSD.tests.dist ============================================================================== --- user/jeff/numa/etc/mtree/BSD.tests.dist Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/etc/mtree/BSD.tests.dist Tue Apr 10 15:19:30 2018 (r332376) @@ -742,6 +742,8 @@ .. netpfil pf + ioctl + .. .. .. opencrypto Modified: user/jeff/numa/include/pthread.h ============================================================================== --- user/jeff/numa/include/pthread.h Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/include/pthread.h Tue Apr 10 15:19:30 2018 (r332376) @@ -48,8 +48,6 @@ #include <sched.h> #include <time.h> -__NULLABILITY_PRAGMA_PUSH - /* * Run-time invariant values: */ @@ -151,35 +149,33 @@ struct _pthread_cleanup_info { */ __BEGIN_DECLS int pthread_atfork(void (*)(void), void (*)(void), void (*)(void)); -int pthread_attr_destroy(pthread_attr_t * _Nonnull); +int pthread_attr_destroy(pthread_attr_t *); int pthread_attr_getstack( - const pthread_attr_t * _Nonnull __restrict, - void ** _Nonnull __restrict, - size_t * _Nonnull __restrict); -int pthread_attr_getstacksize(const pthread_attr_t * _Nonnull, - size_t * _Nonnull); -int pthread_attr_getguardsize(const pthread_attr_t * _Nonnull, - size_t * _Nonnull); + const pthread_attr_t * __restrict, void ** __restrict, + size_t * __restrict); +int pthread_attr_getstacksize(const pthread_attr_t *, + size_t *); +int pthread_attr_getguardsize(const pthread_attr_t *, + size_t *); int pthread_attr_getstackaddr(const pthread_attr_t *, void **); -int pthread_attr_getdetachstate(const pthread_attr_t * _Nonnull, - int * _Nonnull); -int pthread_attr_init(pthread_attr_t * _Nonnull); -int pthread_attr_setstacksize(pthread_attr_t * _Nonnull, size_t); -int pthread_attr_setguardsize(pthread_attr_t * _Nonnull, size_t); -int pthread_attr_setstack(pthread_attr_t * _Nonnull, void *, +int pthread_attr_getdetachstate(const pthread_attr_t *, + int *); +int pthread_attr_init(pthread_attr_t *); +int pthread_attr_setstacksize(pthread_attr_t *, size_t); +int pthread_attr_setguardsize(pthread_attr_t *, size_t); +int pthread_attr_setstack(pthread_attr_t *, void *, size_t); int pthread_attr_setstackaddr(pthread_attr_t *, void *); -int pthread_attr_setdetachstate(pthread_attr_t * _Nonnull, int); -int pthread_barrier_destroy(pthread_barrier_t * _Nonnull); -int pthread_barrier_init(pthread_barrier_t * _Nonnull, +int pthread_attr_setdetachstate(pthread_attr_t *, int); +int pthread_barrier_destroy(pthread_barrier_t *); +int pthread_barrier_init(pthread_barrier_t *, const pthread_barrierattr_t *, unsigned); -int pthread_barrier_wait(pthread_barrier_t * _Nonnull); -int pthread_barrierattr_destroy(pthread_barrierattr_t * _Nonnull); +int pthread_barrier_wait(pthread_barrier_t *); +int pthread_barrierattr_destroy(pthread_barrierattr_t *); int pthread_barrierattr_getpshared( - const pthread_barrierattr_t * _Nonnull, int * _Nonnull); -int pthread_barrierattr_init(pthread_barrierattr_t * _Nonnull); -int pthread_barrierattr_setpshared(pthread_barrierattr_t * _Nonnull, - int); + const pthread_barrierattr_t *, int *); +int pthread_barrierattr_init(pthread_barrierattr_t *); +int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int); #define pthread_cleanup_push(cleanup_routine, cleanup_arg) \ { \ @@ -194,108 +190,99 @@ int pthread_barrierattr_setpshared(pthread_barrieratt __pthread_cleanup_pop_imp(execute); \ } -int pthread_condattr_destroy(pthread_condattr_t * _Nonnull); -int pthread_condattr_getclock(const pthread_condattr_t * _Nonnull, - clockid_t * _Nonnull); -int pthread_condattr_getpshared(const pthread_condattr_t * _Nonnull, - int * _Nonnull); -int pthread_condattr_init(pthread_condattr_t * _Nonnull); -int pthread_condattr_setclock(pthread_condattr_t * _Nonnull, - clockid_t); -int pthread_condattr_setpshared(pthread_condattr_t * _Nonnull, int); -int pthread_cond_broadcast(pthread_cond_t * _Nonnull); -int pthread_cond_destroy(pthread_cond_t * _Nonnull); -int pthread_cond_init(pthread_cond_t * _Nonnull, - const pthread_condattr_t *); -int pthread_cond_signal(pthread_cond_t * _Nonnull); -int pthread_cond_timedwait(pthread_cond_t * _Nonnull, - pthread_mutex_t * _Nonnull __mutex, - const struct timespec * _Nonnull) +int pthread_condattr_destroy(pthread_condattr_t *); +int pthread_condattr_getclock(const pthread_condattr_t *, + clockid_t *); +int pthread_condattr_getpshared(const pthread_condattr_t *, int *); +int pthread_condattr_init(pthread_condattr_t *); +int pthread_condattr_setclock(pthread_condattr_t *, clockid_t); +int pthread_condattr_setpshared(pthread_condattr_t *, int); +int pthread_cond_broadcast(pthread_cond_t *); +int pthread_cond_destroy(pthread_cond_t *); +int pthread_cond_init(pthread_cond_t *, const pthread_condattr_t *); +int pthread_cond_signal(pthread_cond_t *); +int pthread_cond_timedwait(pthread_cond_t *, + pthread_mutex_t * __mutex, + const struct timespec *) __requires_exclusive(*__mutex); -int pthread_cond_wait(pthread_cond_t * _Nonnull, - pthread_mutex_t * _Nonnull __mutex) +int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t * __mutex) __requires_exclusive(*__mutex); -int pthread_create(pthread_t * _Nonnull, const pthread_attr_t *, - void *(* _Nonnull) (void *), void *); +int pthread_create(pthread_t *, const pthread_attr_t *, + void *(*) (void *), void *); int pthread_detach(pthread_t); int pthread_equal(pthread_t, pthread_t); void pthread_exit(void *) __dead2; void *pthread_getspecific(pthread_key_t); -int pthread_getcpuclockid(pthread_t, clockid_t * _Nonnull); +int pthread_getcpuclockid(pthread_t, clockid_t *); int pthread_join(pthread_t, void **); -int pthread_key_create(pthread_key_t * _Nonnull, - void (*) (void *)); +int pthread_key_create(pthread_key_t *, void (*) (void *)); int pthread_key_delete(pthread_key_t); -int pthread_mutexattr_init(pthread_mutexattr_t * _Nonnull); -int pthread_mutexattr_destroy(pthread_mutexattr_t * _Nonnull); -int pthread_mutexattr_getpshared( - const pthread_mutexattr_t * _Nonnull, int * _Nonnull); -int pthread_mutexattr_gettype(pthread_mutexattr_t * _Nonnull, - int * _Nonnull); -int pthread_mutexattr_settype(pthread_mutexattr_t * _Nonnull, int); -int pthread_mutexattr_setpshared(pthread_mutexattr_t * _Nonnull, - int); -int pthread_mutex_consistent(pthread_mutex_t * _Nonnull __mutex) +int pthread_mutexattr_init(pthread_mutexattr_t *); +int pthread_mutexattr_destroy(pthread_mutexattr_t *); +int pthread_mutexattr_getpshared(const pthread_mutexattr_t *, + int *); +int pthread_mutexattr_gettype(pthread_mutexattr_t *, int *); +int pthread_mutexattr_settype(pthread_mutexattr_t *, int); +int pthread_mutexattr_setpshared(pthread_mutexattr_t *, int); +int pthread_mutex_consistent(pthread_mutex_t * __mutex) __requires_exclusive(*__mutex); -int pthread_mutex_destroy(pthread_mutex_t * _Nonnull __mutex) +int pthread_mutex_destroy(pthread_mutex_t * __mutex) __requires_unlocked(*__mutex); -int pthread_mutex_init(pthread_mutex_t * _Nonnull __mutex, +int pthread_mutex_init(pthread_mutex_t * __mutex, const pthread_mutexattr_t *) __requires_unlocked(*__mutex); -int pthread_mutex_lock(pthread_mutex_t * _Nonnull __mutex) +int pthread_mutex_lock(pthread_mutex_t * __mutex) __locks_exclusive(*__mutex); -int pthread_mutex_trylock(pthread_mutex_t * _Nonnull __mutex) +int pthread_mutex_trylock(pthread_mutex_t * __mutex) __trylocks_exclusive(0, *__mutex); -int pthread_mutex_timedlock(pthread_mutex_t * _Nonnull __mutex, - const struct timespec * _Nonnull) +int pthread_mutex_timedlock(pthread_mutex_t * __mutex, + const struct timespec *) __trylocks_exclusive(0, *__mutex); -int pthread_mutex_unlock(pthread_mutex_t * _Nonnull __mutex) +int pthread_mutex_unlock(pthread_mutex_t * __mutex) __unlocks(*__mutex); -int pthread_once(pthread_once_t * _Nonnull, - void (* _Nonnull) (void)); -int pthread_rwlock_destroy(pthread_rwlock_t * _Nonnull __rwlock) +int pthread_once(pthread_once_t *, void (*) (void)); +int pthread_rwlock_destroy(pthread_rwlock_t * __rwlock) __requires_unlocked(*__rwlock); -int pthread_rwlock_init(pthread_rwlock_t * _Nonnull __rwlock, +int pthread_rwlock_init(pthread_rwlock_t * __rwlock, const pthread_rwlockattr_t *) __requires_unlocked(*__rwlock); -int pthread_rwlock_rdlock(pthread_rwlock_t * _Nonnull __rwlock) +int pthread_rwlock_rdlock(pthread_rwlock_t * __rwlock) __locks_shared(*__rwlock); -int pthread_rwlock_timedrdlock(pthread_rwlock_t * _Nonnull __rwlock, - const struct timespec * _Nonnull) +int pthread_rwlock_timedrdlock(pthread_rwlock_t * __rwlock, + const struct timespec *) __trylocks_shared(0, *__rwlock); -int pthread_rwlock_timedwrlock(pthread_rwlock_t * _Nonnull __rwlock, - const struct timespec * _Nonnull) +int pthread_rwlock_timedwrlock(pthread_rwlock_t * __rwlock, + const struct timespec *) __trylocks_exclusive(0, *__rwlock); -int pthread_rwlock_tryrdlock(pthread_rwlock_t * _Nonnull __rwlock) +int pthread_rwlock_tryrdlock(pthread_rwlock_t * __rwlock) __trylocks_shared(0, *__rwlock); -int pthread_rwlock_trywrlock(pthread_rwlock_t * _Nonnull __rwlock) +int pthread_rwlock_trywrlock(pthread_rwlock_t * __rwlock) __trylocks_exclusive(0, *__rwlock); -int pthread_rwlock_unlock(pthread_rwlock_t * _Nonnull __rwlock) +int pthread_rwlock_unlock(pthread_rwlock_t * __rwlock) __unlocks(*__rwlock); -int pthread_rwlock_wrlock(pthread_rwlock_t * _Nonnull __rwlock) +int pthread_rwlock_wrlock(pthread_rwlock_t * __rwlock) __locks_exclusive(*__rwlock); -int pthread_rwlockattr_destroy(pthread_rwlockattr_t * _Nonnull); -int pthread_rwlockattr_getkind_np( - const pthread_rwlockattr_t * _Nonnull, int *); -int pthread_rwlockattr_getpshared( - const pthread_rwlockattr_t * _Nonnull, int * _Nonnull); -int pthread_rwlockattr_init(pthread_rwlockattr_t * _Nonnull); -int pthread_rwlockattr_setkind_np(pthread_rwlockattr_t * _Nonnull, +int pthread_rwlockattr_destroy(pthread_rwlockattr_t *); +int pthread_rwlockattr_getkind_np(const pthread_rwlockattr_t *, + int *); +int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *, + int *); +int pthread_rwlockattr_init(pthread_rwlockattr_t *); +int pthread_rwlockattr_setkind_np(pthread_rwlockattr_t *, int); -int pthread_rwlockattr_setpshared(pthread_rwlockattr_t * _Nonnull, - int); +int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int); pthread_t pthread_self(void); int pthread_setspecific(pthread_key_t, const void *); -int pthread_spin_init(pthread_spinlock_t * _Nonnull __spin, int) +int pthread_spin_init(pthread_spinlock_t * __spin, int) __requires_unlocked(*__spin); -int pthread_spin_destroy(pthread_spinlock_t * _Nonnull __spin) +int pthread_spin_destroy(pthread_spinlock_t * __spin) __requires_unlocked(*__spin); -int pthread_spin_lock(pthread_spinlock_t * _Nonnull __spin) +int pthread_spin_lock(pthread_spinlock_t * __spin) __locks_exclusive(*__spin); -int pthread_spin_trylock(pthread_spinlock_t * _Nonnull __spin) +int pthread_spin_trylock(pthread_spinlock_t * __spin) __trylocks_exclusive(0, *__spin); -int pthread_spin_unlock(pthread_spinlock_t * _Nonnull __spin) +int pthread_spin_unlock(pthread_spinlock_t * __spin) __unlocks(*__spin); int pthread_cancel(pthread_t); int pthread_setcancelstate(int, int *); @@ -317,27 +304,23 @@ int pthread_mutexattr_getprotocol(pthread_mutexattr_t int pthread_mutexattr_setprotocol(pthread_mutexattr_t *, int); int pthread_mutexattr_getrobust( - pthread_mutexattr_t * _Nonnull __restrict, - int * _Nonnull __restrict); -int pthread_mutexattr_setrobust(pthread_mutexattr_t * _Nonnull, - int); + pthread_mutexattr_t * __restrict, int * __restrict); +int pthread_mutexattr_setrobust(pthread_mutexattr_t *, int); int pthread_attr_getinheritsched(const pthread_attr_t *, int *); -int pthread_attr_getschedparam(const pthread_attr_t * _Nonnull, - struct sched_param * _Nonnull); -int pthread_attr_getschedpolicy(const pthread_attr_t * _Nonnull, - int * _Nonnull); -int pthread_attr_getscope(const pthread_attr_t * _Nonnull, - int * _Nonnull); +int pthread_attr_getschedparam(const pthread_attr_t *, + struct sched_param *); +int pthread_attr_getschedpolicy(const pthread_attr_t *, int *); +int pthread_attr_getscope(const pthread_attr_t *, int *); int pthread_attr_setinheritsched(pthread_attr_t *, int); -int pthread_attr_setschedparam(pthread_attr_t * _Nonnull, - const struct sched_param * _Nonnull); -int pthread_attr_setschedpolicy(pthread_attr_t * _Nonnull, int); -int pthread_attr_setscope(pthread_attr_t * _Nonnull, int); -int pthread_getschedparam(pthread_t pthread, int * _Nonnull, - struct sched_param * _Nonnull); +int pthread_attr_setschedparam(pthread_attr_t *, + const struct sched_param *); +int pthread_attr_setschedpolicy(pthread_attr_t *, int); +int pthread_attr_setscope(pthread_attr_t *, int); +int pthread_getschedparam(pthread_t pthread, int *, + struct sched_param *); int pthread_setschedparam(pthread_t, int, - const struct sched_param * _Nonnull); + const struct sched_param *); #if __XSI_VISIBLE int pthread_getconcurrency(void); int pthread_setconcurrency(int); @@ -347,6 +330,5 @@ void __pthread_cleanup_push_imp(void (*)(void *), voi struct _pthread_cleanup_info *); void __pthread_cleanup_pop_imp(int); __END_DECLS -__NULLABILITY_PRAGMA_POP #endif /* !_PTHREAD_H_ */ Modified: user/jeff/numa/include/stdio.h ============================================================================== --- user/jeff/numa/include/stdio.h Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/include/stdio.h Tue Apr 10 15:19:30 2018 (r332376) @@ -51,6 +51,11 @@ typedef __size_t size_t; #define _SIZE_T_DECLARED #endif +#ifndef _RSIZE_T_DEFINED +#define _RSIZE_T_DEFINED +typedef size_t rsize_t; +#endif + #if __POSIX_VISIBLE >= 200809 #ifndef _OFF_T_DECLARED #define _OFF_T_DECLARED @@ -265,6 +270,9 @@ size_t fwrite(const void * __restrict, size_t, size_t int getc(FILE *); int getchar(void); char *gets(char *); +#if __EXT1_VISIBLE +char *gets_s(char *, rsize_t); +#endif void perror(const char *); int printf(const char * __restrict, ...); int putc(int, FILE *); Modified: user/jeff/numa/lib/Makefile ============================================================================== --- user/jeff/numa/lib/Makefile Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/Makefile Tue Apr 10 15:19:30 2018 (r332376) @@ -175,6 +175,10 @@ SUBDIR.${MK_NIS}+= libypclnt _libvgl= libvgl .endif +.if ${MACHINE_CPUARCH} == "aarch64" +SUBDIR.${MK_PMC}+= libopencsd +.endif + .if ${MACHINE_CPUARCH} == "amd64" SUBDIR.${MK_PMC}+= libipt SUBDIR.${MK_BHYVE}+= libvmmapi Modified: user/jeff/numa/lib/libc/aarch64/sys/Makefile.inc ============================================================================== --- user/jeff/numa/lib/libc/aarch64/sys/Makefile.inc Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/aarch64/sys/Makefile.inc Tue Apr 10 15:19:30 2018 (r332376) @@ -5,8 +5,6 @@ MIASM:= ${MIASM:Nfreebsd[467]_*} SRCS+= __vdso_gettc.c MDASM= cerror.S \ - shmat.S \ - sigreturn.S \ syscall.S \ vfork.S Modified: user/jeff/numa/lib/libc/amd64/sys/Makefile.inc ============================================================================== --- user/jeff/numa/lib/libc/amd64/sys/Makefile.inc Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/amd64/sys/Makefile.inc Tue Apr 10 15:19:30 2018 (r332376) @@ -9,7 +9,7 @@ SRCS+= \ amd64_set_gsbase.c MDASM= vfork.S brk.S cerror.S exect.S getcontext.S \ - sbrk.S setlogin.S sigreturn.S + sbrk.S # Don't generate default code for these syscalls: NOASM+= vfork.o Modified: user/jeff/numa/lib/libc/arm/sys/Makefile.inc ============================================================================== --- user/jeff/numa/lib/libc/arm/sys/Makefile.inc Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/arm/sys/Makefile.inc Tue Apr 10 15:19:30 2018 (r332376) @@ -2,7 +2,7 @@ SRCS+= __vdso_gettc.c -MDASM= Ovfork.S brk.S cerror.S sbrk.S shmat.S sigreturn.S syscall.S +MDASM= Ovfork.S brk.S cerror.S sbrk.S syscall.S # Don't generate default code for these syscalls: NOASM+= vfork.o Modified: user/jeff/numa/lib/libc/gen/getlogin.c ============================================================================== --- user/jeff/numa/lib/libc/gen/getlogin.c Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/gen/getlogin.c Tue Apr 10 15:19:30 2018 (r332376) @@ -47,62 +47,33 @@ __FBSDID("$FreeBSD$"); #include "libc_private.h" -#define THREAD_LOCK() if (__isthreaded) _pthread_mutex_lock(&logname_mutex) -#define THREAD_UNLOCK() if (__isthreaded) _pthread_mutex_unlock(&logname_mutex) - extern int _getlogin(char *, int); -int _logname_valid __hidden; /* known to setlogin() */ -static pthread_mutex_t logname_mutex = PTHREAD_MUTEX_INITIALIZER; - -static char * -getlogin_basic(int *status) -{ - static char logname[MAXLOGNAME]; - - if (_logname_valid == 0) { - if (_getlogin(logname, sizeof(logname)) < 0) { - *status = errno; - return (NULL); - } - _logname_valid = 1; - } - *status = 0; - return (*logname ? logname : NULL); -} - char * getlogin(void) { - char *result; - int status; + static char logname[MAXLOGNAME]; - THREAD_LOCK(); - result = getlogin_basic(&status); - THREAD_UNLOCK(); - return (result); + if (_getlogin(logname, sizeof(logname)) < 0) + return (NULL); + return (logname[0] != '\0' ? logname : NULL); } int getlogin_r(char *logname, int namelen) { - char *result; + char tmpname[MAXLOGNAME]; int len; - int status; if (namelen < 1) return (ERANGE); logname[0] = '\0'; - THREAD_LOCK(); - result = getlogin_basic(&status); - if (status == 0 && result != NULL) { - len = strlen(result) + 1; - if (len > namelen) - status = ERANGE; - else - strncpy(logname, result, len); - } - THREAD_UNLOCK(); - return (status); + if (_getlogin(tmpname, sizeof(tmpname)) < 0) + return (errno); + len = strlen(tmpname) + 1; + if (len > namelen) + return (ERANGE); + strlcpy(logname, tmpname, len); + return (0); } Modified: user/jeff/numa/lib/libc/gen/syslog.3 ============================================================================== --- user/jeff/numa/lib/libc/gen/syslog.3 Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/gen/syslog.3 Tue Apr 10 15:19:30 2018 (r332376) @@ -28,7 +28,7 @@ .\" @(#)syslog.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd November 5, 2017 +.Dd April 6, 2018 .Dt SYSLOG 3 .Os .Sh NAME @@ -156,6 +156,9 @@ Write the message to standard error output as well to .It Dv LOG_PID Log the process id with each message: useful for identifying instantiations of daemons. +On +.Fx , +this option is enabled by default. .El .Pp The Modified: user/jeff/numa/lib/libc/gen/syslog.c ============================================================================== --- user/jeff/numa/lib/libc/gen/syslog.c Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/gen/syslog.c Tue Apr 10 15:19:30 2018 (r332376) @@ -36,9 +36,10 @@ static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <sys/types.h> +#include <sys/param.h> #include <sys/socket.h> #include <sys/syslog.h> +#include <sys/time.h> #include <sys/uio.h> #include <sys/un.h> #include <netdb.h> @@ -134,11 +135,13 @@ syslog(int pri, const char *fmt, ...) static void vsyslog1(int pri, const char *fmt, va_list ap) { - int cnt; + struct timeval now; + struct tm tm; char ch, *p; - time_t now; - int fd, saved_errno; - char *stdp, tbuf[2048], fmt_cpy[1024], timbuf[26], errstr[64]; + long tz_offset; + int cnt, fd, saved_errno; + char hostname[MAXHOSTNAMELEN], *stdp, tbuf[2048], fmt_cpy[1024], + errstr[64], tz_sign; FILE *fp, *fmt_fp; struct bufcookie tbuf_cookie; struct bufcookie fmt_cookie; @@ -168,24 +171,46 @@ vsyslog1(int pri, const char *fmt, va_list ap) if (fp == NULL) return; - /* Build the message. */ - (void)time(&now); - (void)fprintf(fp, "<%d>", pri); - (void)fprintf(fp, "%.15s ", ctime_r(&now, timbuf) + 4); + /* Build the message according to RFC 5424. Tag and version. */ + (void)fprintf(fp, "<%d>1 ", pri); + /* Timestamp similar to RFC 3339. */ + if (gettimeofday(&now, NULL) == 0 && + localtime_r(&now.tv_sec, &tm) != NULL) { + if (tm.tm_gmtoff < 0) { + tz_sign = '-'; + tz_offset = -tm.tm_gmtoff; + } else { + tz_sign = '+'; + tz_offset = tm.tm_gmtoff; + } + + (void)fprintf(fp, + "%04d-%02d-%02d" /* Date. */ + "T%02d:%02d:%02d.%06ld" /* Time. */ + "%c%02ld:%02ld ", /* Time zone offset. */ + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, now.tv_usec, + tz_sign, tz_offset / 3600, (tz_offset % 3600) / 60); + } else + (void)fprintf(fp, "- "); + /* Hostname. */ + (void)gethostname(hostname, sizeof(hostname)); + (void)fprintf(fp, "%s ", hostname); if (LogStat & LOG_PERROR) { /* Transfer to string buffer */ (void)fflush(fp); stdp = tbuf + (sizeof(tbuf) - tbuf_cookie.left); } + /* + * Application name, process ID, message ID and structured data. + * Provide the process ID regardless of whether LOG_PID has been + * specified, as it provides valuable information. Many + * applications tend not to use this, even though they should. + */ if (LogTag == NULL) LogTag = _getprogname(); - if (LogTag != NULL) - (void)fprintf(fp, "%s", LogTag); - if (LogStat & LOG_PID) - (void)fprintf(fp, "[%d]", getpid()); - if (LogTag != NULL) { - (void)fprintf(fp, ": "); - } + (void)fprintf(fp, "%s %d - - ", + LogTag == NULL ? "-" : LogTag, getpid()); /* Check to see if we can skip expanding the %m */ if (strstr(fmt, "%m")) { @@ -313,7 +338,7 @@ vsyslog1(int pri, const char *fmt, va_list ap) struct iovec iov[2]; struct iovec *v = iov; - p = strchr(tbuf, '>') + 1; + p = strchr(tbuf, '>') + 3; v->iov_base = p; v->iov_len = cnt - (p - tbuf); ++v; Modified: user/jeff/numa/lib/libc/i386/sys/Makefile.inc ============================================================================== --- user/jeff/numa/lib/libc/i386/sys/Makefile.inc Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/i386/sys/Makefile.inc Tue Apr 10 15:19:30 2018 (r332376) @@ -8,7 +8,7 @@ SRCS+= i386_get_fsbase.c i386_get_gsbase.c i386_get_io i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c MDASM= Ovfork.S brk.S cerror.S exect.S getcontext.S \ - sbrk.S setlogin.S sigreturn.S syscall.S + sbrk.S syscall.S NOASM+= vfork.o Modified: user/jeff/numa/lib/libc/powerpc/sys/Makefile.inc ============================================================================== --- user/jeff/numa/lib/libc/powerpc/sys/Makefile.inc Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/powerpc/sys/Makefile.inc Tue Apr 10 15:19:30 2018 (r332376) @@ -1,3 +1,3 @@ # $FreeBSD$ -MDASM+= brk.S cerror.S exect.S sbrk.S setlogin.S +MDASM+= brk.S cerror.S exect.S sbrk.S Modified: user/jeff/numa/lib/libc/powerpc64/sys/Makefile.inc ============================================================================== --- user/jeff/numa/lib/libc/powerpc64/sys/Makefile.inc Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/powerpc64/sys/Makefile.inc Tue Apr 10 15:19:30 2018 (r332376) @@ -1,3 +1,3 @@ # $FreeBSD$ -MDASM+= brk.S cerror.S exect.S sbrk.S setlogin.S +MDASM+= brk.S cerror.S exect.S sbrk.S Modified: user/jeff/numa/lib/libc/riscv/sys/Makefile.inc ============================================================================== --- user/jeff/numa/lib/libc/riscv/sys/Makefile.inc Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/riscv/sys/Makefile.inc Tue Apr 10 15:19:30 2018 (r332376) @@ -2,10 +2,7 @@ SRCS+= trivial-vdso_tc.c -#MDASM= ptrace.S MDASM= cerror.S \ - shmat.S \ - sigreturn.S \ syscall.S \ vfork.S Modified: user/jeff/numa/lib/libc/sparc64/sys/Makefile.inc ============================================================================== --- user/jeff/numa/lib/libc/sparc64/sys/Makefile.inc Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/sparc64/sys/Makefile.inc Tue Apr 10 15:19:30 2018 (r332376) @@ -12,4 +12,4 @@ SRCS+= __sparc_sigtramp_setup.c \ CFLAGS+= -I${LIBC_SRCTOP}/sparc64/fpu -MDASM+= brk.S cerror.S exect.S sbrk.S setlogin.S sigaction1.S +MDASM+= brk.S cerror.S exect.S sbrk.S sigaction1.S Modified: user/jeff/numa/lib/libc/stdio/Makefile.inc ============================================================================== --- user/jeff/numa/lib/libc/stdio/Makefile.inc Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/stdio/Makefile.inc Tue Apr 10 15:19:30 2018 (r332376) @@ -14,7 +14,7 @@ SRCS+= _flock_stub.c asprintf.c clrerr.c dprintf.c \ fputwc.c fputws.c fread.c freopen.c fscanf.c fseek.c fsetpos.c \ ftell.c funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwscanf.c \ fwrite.c getc.c getchar.c getdelim.c getline.c \ - gets.c getw.c getwc.c getwchar.c makebuf.c mktemp.c \ + gets.c gets_s.c getw.c getwc.c getwchar.c makebuf.c mktemp.c \ open_memstream.c open_wmemstream.c \ perror.c printf.c printf-pos.c putc.c putchar.c \ puts.c putw.c putwc.c putwchar.c \ @@ -50,6 +50,7 @@ MLINKS+=ferror.3 ferror_unlocked.3 \ ferror.3 fileno.3 ferror.3 fileno_unlocked.3 MLINKS+=fflush.3 fpurge.3 MLINKS+=fgets.3 gets.3 +MLINKS+=fgets.3 gets_s.3 MLINKS+=flockfile.3 ftrylockfile.3 flockfile.3 funlockfile.3 MLINKS+=fopen.3 fdopen.3 fopen.3 freopen.3 fopen.3 fmemopen.3 MLINKS+=fputs.3 puts.3 Modified: user/jeff/numa/lib/libc/stdio/Symbol.map ============================================================================== --- user/jeff/numa/lib/libc/stdio/Symbol.map Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/stdio/Symbol.map Tue Apr 10 15:19:30 2018 (r332376) @@ -167,6 +167,10 @@ FBSD_1.4 { fopencookie; }; +FBSD_1.5 { + gets_s; +}; + FBSDprivate_1.0 { _flockfile; _flockfile_debug_stub; Modified: user/jeff/numa/lib/libc/stdio/fgets.3 ============================================================================== --- user/jeff/numa/lib/libc/stdio/fgets.3 Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/stdio/fgets.3 Tue Apr 10 15:19:30 2018 (r332376) @@ -32,12 +32,13 @@ .\" @(#)fgets.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd May 5, 2012 +.Dd April 3, 2018 .Dt FGETS 3 .Os .Sh NAME .Nm fgets , -.Nm gets +.Nm gets , +.Nm gets_s .Nd get a line from a stream .Sh LIBRARY .Lb libc @@ -46,6 +47,8 @@ .Ft char * .Fn fgets "char * restrict str" "int size" "FILE * restrict stream" .Ft char * +.Fn gets_s "char *str" "rsize_t size" +.Ft char * .Fn gets "char *str" .Sh DESCRIPTION The @@ -65,6 +68,17 @@ If any characters are read and there is no error, a character is appended to end the string. .Pp The +.Fn gets_s +function +is equivalent to +.Fn fgets +with a +.Fa stream +of +.Dv stdin , +except that the newline character (if any) is not stored in the string. +.Pp +The .Fn gets function is equivalent to @@ -80,7 +94,8 @@ It is the caller's responsibility to ensure that the i if any, is sufficiently short to fit in the string. .Sh RETURN VALUES Upon successful completion, -.Fn fgets +.Fn fgets , +.Fn gets_s , and .Fn gets return @@ -94,7 +109,8 @@ they return .Dv NULL and the buffer contents are indeterminate. The -.Fn fgets +.Fn fgets , +.Fn gets_s , and .Fn gets functions @@ -141,6 +157,13 @@ and .Fn gets conform to .St -isoC-99 . +.Fn gets_s +conforms to +.St -isoC-2011 +K.3.7.4.1. +.Fn gets +has been removed from +.St -isoC-2011 . .Sh SECURITY CONSIDERATIONS The .Fn gets Copied: user/jeff/numa/lib/libc/stdio/gets_s.c (from r332375, head/lib/libc/stdio/gets_s.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jeff/numa/lib/libc/stdio/gets_s.c Tue Apr 10 15:19:30 2018 (r332376, copy of r332375, head/lib/libc/stdio/gets_s.c) @@ -0,0 +1,102 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * Copyright (c) 2017, 2018 + * Cyril S. E. Schubert. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include "namespace.h" +#include <errno.h> +#include <unistd.h> +#include <stdint.h> +#include <stdio.h> +#include "un-namespace.h" +#include "libc_private.h" +#include "local.h" + +static inline char * +_gets_s(char *buf, rsize_t n) +{ + int c; + char *s; + + ORIENT(stdin, -1); + for (s = buf, n--; (c = __sgetc(stdin)) != '\n' && n > 0 ; n--) { + if (c == EOF) { + if (s == buf) { + return (NULL); + } else + break; + } else + *s++ = c; + } + + /* + * If end of buffer reached, discard until \n or eof. + * Then throw an error. + */ + if (n == 0) { + /* discard */ + while ((c = __sgetc(stdin)) != '\n' && c != EOF); + /* throw the error after lock released prior to exit */ + __throw_constraint_handler_s("gets_s : end of buffer", E2BIG); + return (NULL); + } + *s = 0; + return (buf); +} + +/* ISO/IEC 9899:2011 K.3.7.4.1 */ +char * +gets_s(char *buf, rsize_t n) +{ + char *ret; + if (buf == NULL) { + __throw_constraint_handler_s("gets_s : str is NULL", EINVAL); + return(NULL); + } else if (n > RSIZE_MAX) { + __throw_constraint_handler_s("gets_s : n > RSIZE_MAX", + EINVAL); + return(NULL); + } else if (n == 0) { + __throw_constraint_handler_s("gets_s : n == 0", EINVAL); + return(NULL); + } + + FLOCKFILE_CANCELSAFE(stdin); + ret = _gets_s(buf, n); + FUNLOCKFILE_CANCELSAFE(); + return (ret); +} Modified: user/jeff/numa/lib/libc/tests/stdio/Makefile ============================================================================== --- user/jeff/numa/lib/libc/tests/stdio/Makefile Tue Apr 10 15:02:24 2018 (r332375) +++ user/jeff/numa/lib/libc/tests/stdio/Makefile Tue Apr 10 15:19:30 2018 (r332376) @@ -7,6 +7,7 @@ ATF_TESTS_C+= fmemopen2_test ATF_TESTS_C+= fopen2_test ATF_TESTS_C+= freopen_test ATF_TESTS_C+= getdelim_test +ATF_TESTS_C+= gets_s_test ATF_TESTS_C+= mkostemp_test ATF_TESTS_C+= open_memstream2_test ATF_TESTS_C+= open_wmemstream_test Copied: user/jeff/numa/lib/libc/tests/stdio/gets_s_test.c (from r332375, head/lib/libc/tests/stdio/gets_s_test.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/jeff/numa/lib/libc/tests/stdio/gets_s_test.c Tue Apr 10 15:19:30 2018 (r332376, copy of r332375, head/lib/libc/tests/stdio/gets_s_test.c) @@ -0,0 +1,145 @@ +/*- + * Copyright (c) 2017 Cyril S. E. Schubert. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <assert.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <sys/types.h> +#include <unistd.h> +#include <sys/wait.h> + +#include <atf-c.h> + +static errno_t error_code; +static const char * message; + +void +h(const char * msg, void * ptr __unused, errno_t error) +{ + error_code = error; + message = msg; +} + +/* null ptr */ +ATF_TC_WITHOUT_HEAD(null_ptr); +ATF_TC_BODY(null_ptr, tc) +{ + ATF_CHECK_MSG(gets_s(NULL, 1) == NULL, + "gets_s() failed to handle NULL pointer"); +} + +/* normal */ +ATF_TC_WITHOUT_HEAD(normal); +ATF_TC_BODY(normal, tc) +{ + pid_t kidpid; + int fd[2]; + int nfd; + + // close(STDIN_FILENO); + // close(STDOUT_FILENO); + pipe(fd); + + if ((kidpid = fork()) == 0) { + char b[10]; + + close(fd[1]); + nfd = dup2(fd[0], 0); + close(fd[0]); + stdin = fdopen(nfd, "r"); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804101519.w3AFJVl9013754>