svn commit: r295886 - in projects/release-pkg: bin/dd bin/sh bin/sh/tests/parser cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool contrib/binutils/bfd lib/libc/gen lib/libc/sys l...
Glen Barber
gjb at FreeBSD.org
Mon Feb 22 12:28:29 UTC 2016
Author: gjb
Date: Mon Feb 22 12:28:23 2016
New Revision: 295886
URL: https://svnweb.freebsd.org/changeset/base/295886
Log:
MFH
Sponsored by: The FreeBSD Foundation
Added:
projects/release-pkg/bin/dd/ref.obs_zeroes
- copied unchanged from r295885, head/bin/dd/ref.obs_zeroes
projects/release-pkg/bin/sh/tests/parser/comment1.0
- copied unchanged from r295885, head/bin/sh/tests/parser/comment1.0
projects/release-pkg/bin/sh/tests/parser/comment2.42
- copied unchanged from r295885, head/bin/sh/tests/parser/comment2.42
projects/release-pkg/bin/sh/tests/parser/nul1.0
- copied unchanged from r295885, head/bin/sh/tests/parser/nul1.0
projects/release-pkg/sys/arm/arm/busdma_machdep-v4.c
- copied unchanged from r295885, head/sys/arm/arm/busdma_machdep-v4.c
projects/release-pkg/sys/arm/arm/pmap-v4.c
- copied unchanged from r295885, head/sys/arm/arm/pmap-v4.c
projects/release-pkg/sys/arm/arm/trap-v4.c
- copied unchanged from r295885, head/sys/arm/arm/trap-v4.c
projects/release-pkg/sys/arm/include/pmap-v4.h
- copied unchanged from r295885, head/sys/arm/include/pmap-v4.h
projects/release-pkg/sys/arm/include/pte-v4.h
- copied unchanged from r295885, head/sys/arm/include/pte-v4.h
Replaced:
projects/release-pkg/sys/arm/include/pmap.h
- copied unchanged from r295885, head/sys/arm/include/pmap.h
Deleted:
projects/release-pkg/sys/arm/arm/busdma_machdep.c
projects/release-pkg/sys/arm/arm/pmap.c
projects/release-pkg/sys/arm/arm/trap.c
projects/release-pkg/sys/arm/include/pte.h
Modified:
projects/release-pkg/bin/dd/Makefile
projects/release-pkg/bin/dd/args.c
projects/release-pkg/bin/dd/dd.c
projects/release-pkg/bin/dd/dd.h
projects/release-pkg/bin/dd/gen.c
projects/release-pkg/bin/sh/alias.c
projects/release-pkg/bin/sh/input.c
projects/release-pkg/bin/sh/parser.c
projects/release-pkg/bin/sh/tests/parser/Makefile
projects/release-pkg/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
projects/release-pkg/contrib/binutils/bfd/elf32-arm.c
projects/release-pkg/lib/libc/gen/directory.3
projects/release-pkg/lib/libc/sys/lseek.2
projects/release-pkg/lib/libc/tests/gen/posix_spawn/Makefile
projects/release-pkg/lib/libc/tests/sys/Makefile
projects/release-pkg/lib/libkvm/kvm_arm.c
projects/release-pkg/lib/libkvm/kvm_arm.h
projects/release-pkg/lib/libvmmapi/vmmapi.c
projects/release-pkg/sbin/ifconfig/ifclone.c
projects/release-pkg/sbin/ifconfig/ifconfig.c
projects/release-pkg/sbin/ifconfig/ifconfig.h
projects/release-pkg/share/man/man4/geom_uncompress.4
projects/release-pkg/share/man/man5/mailer.conf.5
projects/release-pkg/share/man/man9/bios.9
projects/release-pkg/share/mk/bsd.dep.mk
projects/release-pkg/share/mk/local.meta.sys.mk
projects/release-pkg/sys/amd64/amd64/minidump_machdep.c
projects/release-pkg/sys/amd64/cloudabi64/cloudabi64_sysvec.c
projects/release-pkg/sys/amd64/vmm/amd/npt.c
projects/release-pkg/sys/amd64/vmm/amd/svm.c
projects/release-pkg/sys/amd64/vmm/vmm.c
projects/release-pkg/sys/arm/allwinner/a20/std.a20
projects/release-pkg/sys/arm/allwinner/allwinner_machdep.c
projects/release-pkg/sys/arm/allwinner/allwinner_machdep.h
projects/release-pkg/sys/arm/allwinner/std.a10
projects/release-pkg/sys/arm/altera/socfpga/std.socfpga
projects/release-pkg/sys/arm/amlogic/aml8726/std.aml8726
projects/release-pkg/sys/arm/annapurna/alpine/alpine_machdep.c
projects/release-pkg/sys/arm/annapurna/alpine/std.alpine
projects/release-pkg/sys/arm/arm/debug_monitor.c
projects/release-pkg/sys/arm/arm/elf_trampoline.c
projects/release-pkg/sys/arm/arm/genassym.c
projects/release-pkg/sys/arm/arm/locore-v4.S
projects/release-pkg/sys/arm/arm/locore-v6.S
projects/release-pkg/sys/arm/arm/mp_machdep.c
projects/release-pkg/sys/arm/arm/nexus.c
projects/release-pkg/sys/arm/arm/pmap-v6.c
projects/release-pkg/sys/arm/arm/trap-v6.c
projects/release-pkg/sys/arm/at91/at91.c
projects/release-pkg/sys/arm/at91/at91_pinctrl.c
projects/release-pkg/sys/arm/broadcom/bcm2835/std.bcm2836
projects/release-pkg/sys/arm/cavium/cns11xx/econa.c
projects/release-pkg/sys/arm/conf/std.armv6
projects/release-pkg/sys/arm/freescale/imx/std.imx51
projects/release-pkg/sys/arm/freescale/imx/std.imx53
projects/release-pkg/sys/arm/freescale/imx/std.imx6
projects/release-pkg/sys/arm/freescale/vybrid/std.vybrid
projects/release-pkg/sys/arm/include/pmap-v6.h
projects/release-pkg/sys/arm/include/pte-v6.h
projects/release-pkg/sys/arm/mv/armadaxp/std.armadaxp
projects/release-pkg/sys/arm/mv/mv_localbus.c
projects/release-pkg/sys/arm/mv/mv_pci.c
projects/release-pkg/sys/arm/mv/mvvar.h
projects/release-pkg/sys/arm/qemu/std.virt
projects/release-pkg/sys/arm/rockchip/std.rk30xx
projects/release-pkg/sys/arm/samsung/exynos/std.exynos5250
projects/release-pkg/sys/arm/samsung/exynos/std.exynos5420
projects/release-pkg/sys/arm/ti/am335x/std.am335x
projects/release-pkg/sys/arm/ti/omap4/std.omap4
projects/release-pkg/sys/arm/xilinx/std.zynq7
projects/release-pkg/sys/arm64/arm64/debug_monitor.c
projects/release-pkg/sys/arm64/arm64/gic_fdt.c
projects/release-pkg/sys/arm64/arm64/gic_v3_fdt.c
projects/release-pkg/sys/arm64/arm64/gic_v3_its.c
projects/release-pkg/sys/arm64/arm64/minidump_machdep.c
projects/release-pkg/sys/arm64/arm64/nexus.c
projects/release-pkg/sys/arm64/arm64/trap.c
projects/release-pkg/sys/arm64/cavium/thunder_pcie.c
projects/release-pkg/sys/arm64/cavium/thunder_pcie_fdt.c
projects/release-pkg/sys/arm64/cavium/thunder_pcie_pem.c
projects/release-pkg/sys/arm64/cloudabi64/cloudabi64_sysvec.c
projects/release-pkg/sys/boot/efi/boot1/Makefile
projects/release-pkg/sys/boot/efi/include/efilib.h
projects/release-pkg/sys/boot/efi/libefi/time.c
projects/release-pkg/sys/boot/efi/loader/arch/arm64/exec.c
projects/release-pkg/sys/boot/i386/boot2/Makefile
projects/release-pkg/sys/boot/i386/pxeldr/Makefile
projects/release-pkg/sys/boot/i386/zfsboot/Makefile
projects/release-pkg/sys/cam/scsi/scsi_da.c
projects/release-pkg/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
projects/release-pkg/sys/cddl/dev/dtrace/arm/dtrace_isa.c
projects/release-pkg/sys/cddl/dev/dtrace/mips/dtrace_isa.c
projects/release-pkg/sys/compat/linprocfs/linprocfs.c
projects/release-pkg/sys/compat/linux/linux_util.h
projects/release-pkg/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
projects/release-pkg/sys/compat/linuxkpi/common/include/linux/list.h
projects/release-pkg/sys/compat/linuxkpi/common/src/linux_compat.c
projects/release-pkg/sys/compat/linuxkpi/common/src/linux_pci.c
projects/release-pkg/sys/compat/svr4/svr4_misc.c
projects/release-pkg/sys/compat/svr4/svr4_util.h
projects/release-pkg/sys/compat/x86bios/x86bios.c
projects/release-pkg/sys/conf/files.arm
projects/release-pkg/sys/conf/kern.mk
projects/release-pkg/sys/conf/kern.post.mk
projects/release-pkg/sys/conf/options
projects/release-pkg/sys/contrib/x86emu/x86emu.c
projects/release-pkg/sys/dev/acpica/acpi.c
projects/release-pkg/sys/dev/acpica/acpi_hpet.c
projects/release-pkg/sys/dev/acpica/acpi_package.c
projects/release-pkg/sys/dev/acpica/acpivar.h
projects/release-pkg/sys/dev/age/if_age.c
projects/release-pkg/sys/dev/alc/if_alc.c
projects/release-pkg/sys/dev/ale/if_ale.c
projects/release-pkg/sys/dev/altera/avgen/altera_avgen.c
projects/release-pkg/sys/dev/altera/avgen/altera_avgen_fdt.c
projects/release-pkg/sys/dev/altera/avgen/altera_avgen_nexus.c
projects/release-pkg/sys/dev/arcmsr/arcmsr.c
projects/release-pkg/sys/dev/bxe/bxe.c
projects/release-pkg/sys/dev/bxe/bxe.h
projects/release-pkg/sys/dev/bxe/bxe_stats.c
projects/release-pkg/sys/dev/bxe/ecore_init.h
projects/release-pkg/sys/dev/ce/if_ce.c
projects/release-pkg/sys/dev/cp/if_cp.c
projects/release-pkg/sys/dev/cxgbe/adapter.h
projects/release-pkg/sys/dev/cxgbe/common/common.h
projects/release-pkg/sys/dev/cxgbe/common/t4_hw.h
projects/release-pkg/sys/dev/cxgbe/common/t4_msg.h
projects/release-pkg/sys/dev/cxgbe/common/t4_regs.h
projects/release-pkg/sys/dev/cxgbe/common/t4_regs_values.h
projects/release-pkg/sys/dev/cxgbe/common/t4_tcb.h
projects/release-pkg/sys/dev/cxgbe/tom/t4_connect.c
projects/release-pkg/sys/dev/cy/cy_isa.c
projects/release-pkg/sys/dev/cy/cy_pci.c
projects/release-pkg/sys/dev/drm/drmP.h
projects/release-pkg/sys/dev/drm2/drmP.h
projects/release-pkg/sys/dev/ed/if_ed_pccard.c
projects/release-pkg/sys/dev/eisa/eisaconf.c
projects/release-pkg/sys/dev/fb/machfb.c
projects/release-pkg/sys/dev/fb/s3_pci.c
projects/release-pkg/sys/dev/fdc/fdc_pccard.c
projects/release-pkg/sys/dev/fdt/simplebus.c
projects/release-pkg/sys/dev/firewire/sbp_targ.c
projects/release-pkg/sys/dev/gpio/gpiobus.c
projects/release-pkg/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
projects/release-pkg/sys/dev/hptiop/hptiop.c
projects/release-pkg/sys/dev/hptmv/entry.c
projects/release-pkg/sys/dev/hptnr/hptnr_osm_bsd.c
projects/release-pkg/sys/dev/hptrr/hptrr_osm_bsd.c
projects/release-pkg/sys/dev/hyperv/netvsc/hv_net_vsc.h
projects/release-pkg/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
projects/release-pkg/sys/dev/isci/isci.c
projects/release-pkg/sys/dev/isci/isci_oem_parameters.c
projects/release-pkg/sys/dev/iwn/if_iwn.c
projects/release-pkg/sys/dev/ixgb/if_ixgb.c
projects/release-pkg/sys/dev/ixl/if_ixl.c
projects/release-pkg/sys/dev/ixl/ixl_txrx.c
projects/release-pkg/sys/dev/jme/if_jme.c
projects/release-pkg/sys/dev/lmc/if_lmc.c
projects/release-pkg/sys/dev/mca/mca_bus.c
projects/release-pkg/sys/dev/mrsas/mrsas.c
projects/release-pkg/sys/dev/msk/if_msk.c
projects/release-pkg/sys/dev/mxge/if_mxge.c
projects/release-pkg/sys/dev/ntb/if_ntb/if_ntb.c
projects/release-pkg/sys/dev/ntb/ntb_hw/ntb_hw.c
projects/release-pkg/sys/dev/nvme/nvme_ctrlr.c
projects/release-pkg/sys/dev/ofw/ofw_subr.c
projects/release-pkg/sys/dev/ofw/ofwbus.c
projects/release-pkg/sys/dev/pccard/pccard.c
projects/release-pkg/sys/dev/pci/pci_user.c
projects/release-pkg/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
projects/release-pkg/sys/dev/pms/freebsd/driver/ini/src/osapi.c
projects/release-pkg/sys/dev/qlxgb/qla_hw.c
projects/release-pkg/sys/dev/quicc/quicc_core.c
projects/release-pkg/sys/dev/rl/if_rl.c
projects/release-pkg/sys/dev/rt/if_rt.c
projects/release-pkg/sys/dev/rtwn/if_rtwn.c
projects/release-pkg/sys/dev/siba/siba.c
projects/release-pkg/sys/dev/siba/siba_pcib.c
projects/release-pkg/sys/dev/sk/if_sk.c
projects/release-pkg/sys/dev/sound/pci/envy24.c
projects/release-pkg/sys/dev/sound/pci/envy24ht.c
projects/release-pkg/sys/dev/sound/pci/hdspe.c
projects/release-pkg/sys/dev/sound/pci/vibes.c
projects/release-pkg/sys/dev/stge/if_stge.c
projects/release-pkg/sys/dev/twa/tw_osl_freebsd.c
projects/release-pkg/sys/dev/tws/tws.c
projects/release-pkg/sys/dev/usb/wlan/if_urtwn.c
projects/release-pkg/sys/dev/usb/wlan/if_urtwnreg.h
projects/release-pkg/sys/dev/usb/wlan/if_urtwnvar.h
projects/release-pkg/sys/dev/vnic/mrml_bridge.c
projects/release-pkg/sys/dev/vt/hw/efifb/efifb.c
projects/release-pkg/sys/dev/vte/if_vte.c
projects/release-pkg/sys/fs/ext2fs/ext2_vnops.c
projects/release-pkg/sys/i386/bios/mca_machdep.c
projects/release-pkg/sys/i386/i386/machdep.c
projects/release-pkg/sys/i386/pci/pci_cfgreg.c
projects/release-pkg/sys/isa/isa_common.c
projects/release-pkg/sys/isa/vga_isa.c
projects/release-pkg/sys/kern/bus_if.m
projects/release-pkg/sys/kern/kern_environment.c
projects/release-pkg/sys/kern/kern_event.c
projects/release-pkg/sys/kern/subr_bus.c
projects/release-pkg/sys/mips/adm5120/admpci.c
projects/release-pkg/sys/mips/adm5120/obio.c
projects/release-pkg/sys/mips/alchemy/obio.c
projects/release-pkg/sys/mips/atheros/apb.c
projects/release-pkg/sys/mips/atheros/ar71xx_fixup.c
projects/release-pkg/sys/mips/atheros/ar71xx_pci.c
projects/release-pkg/sys/mips/atheros/ar71xx_spi.c
projects/release-pkg/sys/mips/atheros/ar724x_pci.c
projects/release-pkg/sys/mips/atheros/if_arge.c
projects/release-pkg/sys/mips/atheros/qca955x_pci.c
projects/release-pkg/sys/mips/beri/beri_simplebus.c
projects/release-pkg/sys/mips/cavium/cvmx_config.h
projects/release-pkg/sys/mips/cavium/octopci.c
projects/release-pkg/sys/mips/idt/idtpci.c
projects/release-pkg/sys/mips/idt/obio.c
projects/release-pkg/sys/mips/malta/gt_pci.c
projects/release-pkg/sys/mips/mips/minidump_machdep.c
projects/release-pkg/sys/mips/mips/nexus.c
projects/release-pkg/sys/mips/mips/stack_machdep.c
projects/release-pkg/sys/mips/nlm/cms.c
projects/release-pkg/sys/mips/nlm/dev/net/xlpge.c
projects/release-pkg/sys/mips/nlm/xlp_simplebus.c
projects/release-pkg/sys/mips/rmi/dev/nlge/if_nlge.c
projects/release-pkg/sys/mips/rmi/fmn.c
projects/release-pkg/sys/mips/rmi/iodi.c
projects/release-pkg/sys/mips/rt305x/obio.c
projects/release-pkg/sys/mips/rt305x/rt305x_pci.c
projects/release-pkg/sys/mips/sibyte/ata_zbbus.c
projects/release-pkg/sys/mips/sibyte/sb_zbbus.c
projects/release-pkg/sys/mips/sibyte/sb_zbpci.c
projects/release-pkg/sys/modules/usb/Makefile
projects/release-pkg/sys/modules/usb/urtwn/Makefile
projects/release-pkg/sys/net/if_lagg.c
projects/release-pkg/sys/net80211/ieee80211.h
projects/release-pkg/sys/net80211/ieee80211_adhoc.c
projects/release-pkg/sys/net80211/ieee80211_hostap.c
projects/release-pkg/sys/net80211/ieee80211_mesh.c
projects/release-pkg/sys/net80211/ieee80211_proto.c
projects/release-pkg/sys/net80211/ieee80211_sta.c
projects/release-pkg/sys/net80211/ieee80211_wds.c
projects/release-pkg/sys/netinet/sctp_input.c
projects/release-pkg/sys/netinet/sctp_output.c
projects/release-pkg/sys/netinet/sctp_pcb.c
projects/release-pkg/sys/netinet/tcp_lro.c
projects/release-pkg/sys/netinet/tcp_lro.h
projects/release-pkg/sys/netinet6/sctp6_usrreq.c
projects/release-pkg/sys/netpfil/ipfw/ip_fw_sockopt.c
projects/release-pkg/sys/netpfil/pf/pf.c
projects/release-pkg/sys/powerpc/aim/slb.c
projects/release-pkg/sys/powerpc/mpc85xx/isa.c
projects/release-pkg/sys/powerpc/ofw/ofw_real.c
projects/release-pkg/sys/powerpc/ofw/rtas.c
projects/release-pkg/sys/powerpc/powermac/macgpio.c
projects/release-pkg/sys/powerpc/powermac/macio.c
projects/release-pkg/sys/powerpc/powermac/platform_powermac.c
projects/release-pkg/sys/powerpc/powerpc/genassym.c
projects/release-pkg/sys/powerpc/powerpc/nexus.c
projects/release-pkg/sys/powerpc/powerpc/trap.c
projects/release-pkg/sys/powerpc/ps3/if_glc.c
projects/release-pkg/sys/powerpc/ps3/platform_ps3.c
projects/release-pkg/sys/powerpc/ps3/ps3_syscons.c
projects/release-pkg/sys/powerpc/ps3/ps3bus.c
projects/release-pkg/sys/powerpc/ps3/ps3cdrom.c
projects/release-pkg/sys/powerpc/ps3/ps3disk.c
projects/release-pkg/sys/powerpc/pseries/platform_chrp.c
projects/release-pkg/sys/powerpc/psim/iobus.c
projects/release-pkg/sys/riscv/include/vmparam.h
projects/release-pkg/sys/riscv/riscv/genassym.c
projects/release-pkg/sys/riscv/riscv/locore.S
projects/release-pkg/sys/riscv/riscv/minidump_machdep.c
projects/release-pkg/sys/riscv/riscv/nexus.c
projects/release-pkg/sys/riscv/riscv/pmap.c
projects/release-pkg/sys/riscv/riscv/trap.c
projects/release-pkg/sys/sparc64/central/central.c
projects/release-pkg/sys/sparc64/ebus/ebus.c
projects/release-pkg/sys/sparc64/fhc/fhc.c
projects/release-pkg/sys/sparc64/isa/isa.c
projects/release-pkg/sys/sparc64/pci/apb.c
projects/release-pkg/sys/sparc64/pci/fire.c
projects/release-pkg/sys/sparc64/sbus/sbus.c
projects/release-pkg/sys/sparc64/sparc64/iommu.c
projects/release-pkg/sys/sparc64/sparc64/nexus.c
projects/release-pkg/sys/sparc64/sparc64/tlb.c
projects/release-pkg/sys/sparc64/sparc64/upa.c
projects/release-pkg/sys/sys/bus.h
projects/release-pkg/sys/sys/param.h
projects/release-pkg/sys/sys/rman.h
projects/release-pkg/sys/x86/acpica/acpi_wakeup.c
projects/release-pkg/sys/x86/iommu/intel_drv.c
projects/release-pkg/sys/x86/isa/isa.c
projects/release-pkg/sys/x86/x86/nexus.c
projects/release-pkg/tests/sys/kqueue/read.c
projects/release-pkg/tools/build/mk/OptionalObsoleteFiles.inc
projects/release-pkg/usr.bin/cap_mkdb/cap_mkdb.c
projects/release-pkg/usr.bin/clang/llvm-ar/Makefile.depend
projects/release-pkg/usr.sbin/config/config.5
projects/release-pkg/usr.sbin/iostat/Makefile
projects/release-pkg/usr.sbin/iostat/iostat.c
projects/release-pkg/usr.sbin/pciconf/Makefile
projects/release-pkg/usr.sbin/pciconf/cap.c
projects/release-pkg/usr.sbin/pciconf/pciconf.c
projects/release-pkg/usr.sbin/rtsold/rtsold.c
Directory Properties:
projects/release-pkg/ (props changed)
projects/release-pkg/cddl/ (props changed)
projects/release-pkg/cddl/contrib/opensolaris/ (props changed)
projects/release-pkg/cddl/contrib/opensolaris/cmd/zfs/ (props changed)
projects/release-pkg/contrib/binutils/ (props changed)
projects/release-pkg/lib/libc/ (props changed)
projects/release-pkg/lib/libvmmapi/ (props changed)
projects/release-pkg/sbin/ (props changed)
projects/release-pkg/share/ (props changed)
projects/release-pkg/share/man/man4/ (props changed)
projects/release-pkg/sys/ (props changed)
projects/release-pkg/sys/amd64/vmm/ (props changed)
projects/release-pkg/sys/boot/ (props changed)
projects/release-pkg/sys/conf/ (props changed)
projects/release-pkg/sys/contrib/x86emu/ (props changed)
projects/release-pkg/sys/dev/hyperv/ (props changed)
projects/release-pkg/usr.sbin/rtsold/ (props changed)
Modified: projects/release-pkg/bin/dd/Makefile
==============================================================================
--- projects/release-pkg/bin/dd/Makefile Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/bin/dd/Makefile Mon Feb 22 12:28:23 2016 (r295886)
@@ -25,7 +25,18 @@ test: ${PROG} gen
LC_ALL=en_US.US-ASCII hexdump -C | \
diff -I FreeBSD - ${.CURDIR}/ref.${conv}
.endfor
- @rm -f gen
+ @${ECHO} "testing sparse file (obs zeroes)"
+ @./gen 189284 | ./dd ibs=16 obs=8 conv=sparse of=obs_zeroes 2> /dev/null
+ @hexdump -C obs_zeroes | diff -I FreeBSD - ${.CURDIR}/ref.obs_zeroes
+
+ @${ECHO} "testing spase file (all zeroes)"
+ @./dd if=/dev/zero of=1M_zeroes bs=1048576 count=1 2> /dev/null
+ @./dd if=1M_zeroes of=1M_zeroes.1 bs=1048576 conv=sparse 2> /dev/null
+ @./dd if=1M_zeroes of=1M_zeroes.2 bs=1048576 2> /dev/null
+ @diff 1M_zeroes 1M_zeroes.1
+ @diff 1M_zeroes 1M_zeroes.2
+
+ @rm -f gen 1M_zeroes* obs_zeroes
.if ${MK_TESTS} != "no"
SUBDIR+= tests
Modified: projects/release-pkg/bin/dd/args.c
==============================================================================
--- projects/release-pkg/bin/dd/args.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/bin/dd/args.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -422,11 +422,10 @@ get_num(const char *val)
errno = 0;
num = strtoumax(val, &expr, 0);
- if (errno != 0) /* Overflow or underflow. */
- err(1, "%s", oper);
-
if (expr == val) /* No valid digits. */
- errx(1, "%s: illegal numeric value", oper);
+ errx(1, "%s: invalid numeric value", oper);
+ if (errno != 0)
+ err(1, "%s", oper);
mult = postfix_to_mult(*expr);
@@ -472,11 +471,10 @@ get_off_t(const char *val)
errno = 0;
num = strtoimax(val, &expr, 0);
- if (errno != 0) /* Overflow or underflow. */
- err(1, "%s", oper);
-
if (expr == val) /* No valid digits. */
- errx(1, "%s: illegal numeric value", oper);
+ errx(1, "%s: invalid numeric value", oper);
+ if (errno != 0)
+ err(1, "%s", oper);
mult = postfix_to_mult(*expr);
Modified: projects/release-pkg/bin/dd/dd.c
==============================================================================
--- projects/release-pkg/bin/dd/dd.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/bin/dd/dd.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -77,7 +77,6 @@ STAT st; /* statistics */
void (*cfunc)(void); /* conversion function */
uintmax_t cpy_cnt; /* # of blocks to copy */
static off_t pending = 0; /* pending seek if sparse */
-static off_t last_sp = 0; /* size of last added sparse block */
u_int ddflags = 0; /* conversion options */
size_t cbsz; /* conversion block size */
uintmax_t files_cnt = 1; /* # of files to copy */
@@ -409,6 +408,15 @@ dd_close(void)
}
if (out.dbcnt || pending)
dd_out(1);
+
+ /*
+ * If the file ends with a hole, ftruncate it to extend its size
+ * up to the end of the hole (without having to write any data).
+ */
+ if (out.seek_offset > 0 && (out.flags & ISTRUNC)) {
+ if (ftruncate(out.fd, out.seek_offset) == -1)
+ err(1, "truncating %s", out.name);
+ }
}
void
@@ -457,29 +465,27 @@ dd_out(int force)
}
if (sparse && !force) {
pending += cnt;
- last_sp = cnt;
nw = cnt;
} else {
if (pending != 0) {
- /* If forced to write, and we have no
- * data left, we need to write the last
- * sparse block explicitly.
+ /*
+ * Seek past hole. Note that we need to record the
+ * reached offset, because we might have no more data
+ * to write, in which case we'll need to call
+ * ftruncate to extend the file size.
*/
- if (force && cnt == 0) {
- pending -= last_sp;
- assert(outp == out.db);
- memset(outp, 0, cnt);
- }
- if (lseek(out.fd, pending, SEEK_CUR) ==
- -1)
+ out.seek_offset = lseek(out.fd, pending, SEEK_CUR);
+ if (out.seek_offset == -1)
err(2, "%s: seek error creating sparse file",
out.name);
- pending = last_sp = 0;
+ pending = 0;
}
- if (cnt)
+ if (cnt) {
nw = write(out.fd, outp, cnt);
- else
+ out.seek_offset = 0;
+ } else {
return;
+ }
}
if (nw <= 0) {
Modified: projects/release-pkg/bin/dd/dd.h
==============================================================================
--- projects/release-pkg/bin/dd/dd.h Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/bin/dd/dd.h Mon Feb 22 12:28:23 2016 (r295886)
@@ -54,6 +54,7 @@ typedef struct {
const char *name; /* name */
int fd; /* file descriptor */
off_t offset; /* # of blocks to skip */
+ off_t seek_offset; /* offset of last seek past output hole */
} IO;
typedef struct {
Modified: projects/release-pkg/bin/dd/gen.c
==============================================================================
--- projects/release-pkg/bin/dd/gen.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/bin/dd/gen.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -5,13 +5,20 @@
*/
#include <stdio.h>
+#include <string.h>
int
-main(int argc __unused, char **argv __unused)
+main(int argc, char **argv)
{
int i;
- for (i = 0; i < 256; i++)
- putchar(i);
+ if (argc > 1 && !strcmp(argv[1], "189284")) {
+ fputs("ABCDEFGH", stdout);
+ for (i = 0; i < 8; i++)
+ putchar(0);
+ } else {
+ for (i = 0; i < 256; i++)
+ putchar(i);
+ }
return (0);
}
Copied: projects/release-pkg/bin/dd/ref.obs_zeroes (from r295885, head/bin/dd/ref.obs_zeroes)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-pkg/bin/dd/ref.obs_zeroes Mon Feb 22 12:28:23 2016 (r295886, copy of r295885, head/bin/dd/ref.obs_zeroes)
@@ -0,0 +1,3 @@
+$FreeBSD$
+00000000 41 42 43 44 45 46 47 48 00 00 00 00 00 00 00 00 |ABCDEFGH........|
+00000010
Modified: projects/release-pkg/bin/sh/alias.c
==============================================================================
--- projects/release-pkg/bin/sh/alias.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/bin/sh/alias.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -144,9 +144,11 @@ rmaliases(void)
struct alias *
lookupalias(const char *name, int check)
{
- struct alias *ap = *hashalias(name);
+ struct alias *ap;
- for (; ap; ap = ap->next) {
+ if (aliases == 0)
+ return (NULL);
+ for (ap = *hashalias(name); ap; ap = ap->next) {
if (equal(name, ap->name)) {
if (check && (ap->flag & ALIASINUSE))
return (NULL);
Modified: projects/release-pkg/bin/sh/input.c
==============================================================================
--- projects/release-pkg/bin/sh/input.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/bin/sh/input.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -195,8 +195,7 @@ retry:
int
preadbuffer(void)
{
- char *p, *q;
- int more;
+ char *p, *q, *r, *end;
char savec;
while (parsefile->strpush) {
@@ -213,8 +212,6 @@ preadbuffer(void)
}
if (parsenleft == EOF_NLEFT || parsefile->buf == NULL)
return PEOF;
- flushout(&output);
- flushout(&errout);
again:
if (parselleft <= 0) {
@@ -224,34 +221,31 @@ again:
}
}
- q = p = parsefile->buf + (parsenextc - parsefile->buf);
-
- /* delete nul characters */
- for (more = 1; more;) {
- switch (*p) {
- case '\0':
- p++; /* Skip nul */
- goto check;
-
- case '\n':
- parsenleft = q - parsenextc;
- more = 0; /* Stop processing here */
- break;
-
- default:
- break;
- }
-
- *q++ = *p++;
-check:
- if (--parselleft <= 0) {
- parsenleft = q - parsenextc - 1;
- if (parsenleft < 0)
- goto again;
- *q = '\0';
- more = 0;
+ p = parsefile->buf + (parsenextc - parsefile->buf);
+ end = p + parselleft;
+ *end = '\0';
+ q = strchrnul(p, '\n');
+ if (q != end && *q == '\0') {
+ /* delete nul characters */
+ for (r = q; q != end; q++) {
+ if (*q != '\0')
+ *r++ = *q;
}
+ parselleft -= end - r;
+ if (parselleft == 0)
+ goto again;
+ end = p + parselleft;
+ *end = '\0';
+ q = strchrnul(p, '\n');
+ }
+ if (q == end) {
+ parsenleft = parselleft;
+ parselleft = 0;
+ } else /* *q == '\n' */ {
+ parsenleft = q - parsenextc + 1;
+ parselleft -= parsenleft;
}
+ parsenleft--;
savec = *q;
*q = '\0';
Modified: projects/release-pkg/bin/sh/parser.c
==============================================================================
--- projects/release-pkg/bin/sh/parser.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/bin/sh/parser.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -1930,6 +1930,8 @@ static void
setprompt(int which)
{
whichprompt = which;
+ if (which == 0)
+ return;
#ifndef NO_HISTORY
if (!el)
Modified: projects/release-pkg/bin/sh/tests/parser/Makefile
==============================================================================
--- projects/release-pkg/bin/sh/tests/parser/Makefile Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/bin/sh/tests/parser/Makefile Mon Feb 22 12:28:23 2016 (r295886)
@@ -28,6 +28,8 @@ FILES+= alias15.0 alias15.0.stdout
FILES+= and-pipe-not.0
FILES+= case1.0
FILES+= case2.0
+FILES+= comment1.0
+FILES+= comment2.42
FILES+= dollar-quote1.0
FILES+= dollar-quote2.0
FILES+= dollar-quote3.0
@@ -74,6 +76,7 @@ FILES+= line-cont10.0
FILES+= line-cont11.0
FILES+= no-space1.0
FILES+= no-space2.0
+FILES+= nul1.0
FILES+= only-redir1.0
FILES+= only-redir2.0
FILES+= only-redir3.0
Copied: projects/release-pkg/bin/sh/tests/parser/comment1.0 (from r295885, head/bin/sh/tests/parser/comment1.0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-pkg/bin/sh/tests/parser/comment1.0 Mon Feb 22 12:28:23 2016 (r295886, copy of r295885, head/bin/sh/tests/parser/comment1.0)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+${SH} -c '#'
Copied: projects/release-pkg/bin/sh/tests/parser/comment2.42 (from r295885, head/bin/sh/tests/parser/comment2.42)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-pkg/bin/sh/tests/parser/comment2.42 Mon Feb 22 12:28:23 2016 (r295886, copy of r295885, head/bin/sh/tests/parser/comment2.42)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+${SH} -c '#
+exit 42'
Copied: projects/release-pkg/bin/sh/tests/parser/nul1.0 (from r295885, head/bin/sh/tests/parser/nul1.0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-pkg/bin/sh/tests/parser/nul1.0 Mon Feb 22 12:28:23 2016 (r295886, copy of r295885, head/bin/sh/tests/parser/nul1.0)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+# Although POSIX does not specify the effect of NUL bytes in scripts,
+# we ignore them.
+
+{
+ printf 'v=%03000d\0%02000d' 7 2
+ dd if=/dev/zero bs=1000 count=1 status=none
+ printf '1 w=%03000d%02000d1\0\n' 7 2
+ printf '\0l\0v\0=\0$\0{\0#\0v\0}\n'
+ printf '\0l\0w\0=\0\0$\0{\0#\0w}\0\0\0\n'
+ printf '[ "$lv.$lw.$v" = "5001.5001.$w" ]\n'
+} | ${SH}
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -1713,7 +1713,7 @@ zfs_do_get(int argc, char **argv)
default:
(void) fprintf(stderr,
gettext("invalid column name "
- "'%s'\n"), value);
+ "'%s'\n"), suboptarg);
usage(B_FALSE);
}
}
@@ -1750,7 +1750,7 @@ zfs_do_get(int argc, char **argv)
default:
(void) fprintf(stderr,
gettext("invalid source "
- "'%s'\n"), value);
+ "'%s'\n"), suboptarg);
usage(B_FALSE);
}
}
@@ -1786,7 +1786,7 @@ zfs_do_get(int argc, char **argv)
default:
(void) fprintf(stderr,
gettext("invalid type '%s'\n"),
- value);
+ suboptarg);
usage(B_FALSE);
}
}
@@ -3156,7 +3156,7 @@ zfs_do_list(int argc, char **argv)
default:
(void) fprintf(stderr,
gettext("invalid type '%s'\n"),
- value);
+ suboptarg);
usage(B_FALSE);
}
}
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -5431,7 +5431,7 @@ zpool_do_get(int argc, char **argv)
default:
(void) fprintf(stderr,
gettext("invalid column name "
- "'%s'\n"), value);
+ "'%s'\n"), suboptarg);
usage(B_FALSE);
}
}
Modified: projects/release-pkg/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- projects/release-pkg/contrib/binutils/bfd/elf32-arm.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/contrib/binutils/bfd/elf32-arm.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -59,13 +59,6 @@
#define elf_info_to_howto 0
#define elf_info_to_howto_rel elf32_arm_info_to_howto
-#define ARM_ELF_ABI_VERSION 0
-#ifdef __FreeBSD__
-#define ARM_ELF_OS_ABI_VERSION ELFOSABI_FREEBSD
-#else
-#define ARM_ELF_OS_ABI_VERSION ELFOSABI_ARM
-#endif
-
static struct elf_backend_data elf32_arm_vxworks_bed;
/* Note: code such as elf32_arm_reloc_type_lookup expect to use e.g.
@@ -9377,11 +9370,8 @@ elf32_arm_post_process_headers (bfd * ab
i_ehdrp = elf_elfheader (abfd);
- if (EF_ARM_EABI_VERSION (i_ehdrp->e_flags) == EF_ARM_EABI_UNKNOWN)
- i_ehdrp->e_ident[EI_OSABI] = ARM_ELF_OS_ABI_VERSION;
- else
- i_ehdrp->e_ident[EI_OSABI] = 0;
- i_ehdrp->e_ident[EI_ABIVERSION] = ARM_ELF_ABI_VERSION;
+ i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD;
+ i_ehdrp->e_ident[EI_ABIVERSION] = 0;
if (link_info)
{
Modified: projects/release-pkg/lib/libc/gen/directory.3
==============================================================================
--- projects/release-pkg/lib/libc/gen/directory.3 Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/lib/libc/gen/directory.3 Mon Feb 22 12:28:23 2016 (r295886)
@@ -28,7 +28,7 @@
.\" @(#)directory.3 8.1 (Berkeley) 6/4/93
.\" $FreeBSD$
.\"
-.Dd May 6, 2015
+.Dd February 19, 2016
.Dt DIRECTORY 3
.Os
.Sh NAME
@@ -46,7 +46,6 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.In sys/types.h
.In dirent.h
.Ft DIR *
.Fn opendir "const char *filename"
Modified: projects/release-pkg/lib/libc/sys/lseek.2
==============================================================================
--- projects/release-pkg/lib/libc/sys/lseek.2 Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/lib/libc/sys/lseek.2 Mon Feb 22 12:28:23 2016 (r295886)
@@ -28,7 +28,7 @@
.\" @(#)lseek.2 8.3 (Berkeley) 4/19/94
.\" $FreeBSD$
.\"
-.Dd May 26, 2012
+.Dd February 18, 2016
.Dt LSEEK 2
.Os
.Sh NAME
@@ -131,8 +131,14 @@ Applications can use
.Dv SEEK_HOLE
to optimise their behavior for ranges of zeros, but must not depend on it to
find all such ranges in a file.
+Each file is presented as having a zero-size virtual hole at the very
+end of the file.
The existence of a hole at the end of every data region allows for easy
-programming and implies that a virtual hole exists at the end of the file.
+programming and also provides compatibility to the original implementation
+in Solaris.
+It also causes the current file size (i.e., end-of-file offset) to be returned
+to indicate that there are no more holes past the supplied
+.Fa offset .
Applications should use
.Fn fpathconf _PC_MIN_HOLE_SIZE
or
@@ -176,9 +182,11 @@ be negative for a non-character special
For
.Dv SEEK_DATA ,
there are no more data regions past the supplied offset.
-For
-.Dv SEEK_HOLE ,
-there are no more holes past the supplied offset.
+Due to existence of the hole at the end of the file, for
+.Dv SEEK_HOLE
+this error is only returned when the
+.Fa offset
+already points to the end-of-file position.
.It Bq Er EOVERFLOW
The resulting file offset would be a value which cannot be represented
correctly in an object of type
Modified: projects/release-pkg/lib/libc/tests/gen/posix_spawn/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/gen/posix_spawn/Makefile Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/lib/libc/tests/gen/posix_spawn/Makefile Mon Feb 22 12:28:23 2016 (r295886)
@@ -24,7 +24,7 @@ CLEANFILES+= h_nonexec
.include "../../Makefile.netbsd-tests"
h_zero:
- dd if=/dev/zero of=h_zero bs=1k count=2
+ dd if=/dev/zero of=h_zero bs=1k count=2 status=none
chmod a+x h_zero
CLEANFILES+= h_zero
Modified: projects/release-pkg/lib/libc/tests/sys/Makefile
==============================================================================
--- projects/release-pkg/lib/libc/tests/sys/Makefile Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/lib/libc/tests/sys/Makefile Mon Feb 22 12:28:23 2016 (r295886)
@@ -84,6 +84,6 @@ FILESPACKAGE= ${PACKAGE}
CLEANFILES= truncate_test.root_owned
truncate_test.root_owned:
- dd if=/dev/null bs=1 count=1 of=${.TARGET}
+ dd if=/dev/null bs=1 count=1 of=${.TARGET} status=none
.include <bsd.test.mk>
Modified: projects/release-pkg/lib/libkvm/kvm_arm.c
==============================================================================
--- projects/release-pkg/lib/libkvm/kvm_arm.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/lib/libkvm/kvm_arm.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -183,7 +183,7 @@ _arm_initvtop(kvm_t *kd)
#define l1pte_section_p(pde) (((pde) & ARM_L1_TYPE_MASK) == ARM_L1_TYPE_S)
#define l1pte_valid(pde) ((pde) != 0)
#define l2pte_valid(pte) ((pte) != 0)
-#define l2pte_index(v) (((v) & ARM_L2_ADDR_BITS) >> ARM_L2_S_SHIFT)
+#define l2pte_index(v) (((v) & ARM_L1_S_OFFSET) >> ARM_L2_S_SHIFT)
static int
Modified: projects/release-pkg/lib/libkvm/kvm_arm.h
==============================================================================
--- projects/release-pkg/lib/libkvm/kvm_arm.h Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/lib/libkvm/kvm_arm.h Mon Feb 22 12:28:23 2016 (r295886)
@@ -29,10 +29,6 @@
#ifndef __KVM_ARM_H__
#define __KVM_ARM_H__
-#ifdef __arm__
-#include <machine/pte.h>
-#endif
-
typedef uint32_t arm_physaddr_t;
typedef uint32_t arm_pd_entry_t;
typedef uint32_t arm_pt_entry_t;
@@ -72,11 +68,15 @@ typedef uint32_t arm_pt_entry_t;
#define ARM_L2_TYPE_T 0x03 /* Tiny Page - 1k - not used */
#define ARM_L2_TYPE_MASK 0x03
-#define ARM_L2_ADDR_BITS 0x000ff000 /* L2 PTE address bits */
-
#ifdef __arm__
#include <machine/acle-compat.h>
+#if __ARM_ARCH >= 6
+#include <machine/pte-v6.h>
+#else
+#include <machine/pte-v4.h>
+#endif
+
_Static_assert(PAGE_SHIFT == ARM_PAGE_SHIFT, "PAGE_SHIFT mismatch");
_Static_assert(PAGE_SIZE == ARM_PAGE_SIZE, "PAGE_SIZE mismatch");
_Static_assert(PAGE_MASK == ARM_PAGE_MASK, "PAGE_MASK mismatch");
@@ -106,7 +106,6 @@ _Static_assert(L2_TYPE_S == ARM_L2_TYPE_
_Static_assert(L2_TYPE_T == ARM_L2_TYPE_T, "L2_TYPE_T mismatch");
#endif
_Static_assert(L2_TYPE_MASK == ARM_L2_TYPE_MASK, "L2_TYPE_MASK mismatch");
-_Static_assert(L2_ADDR_BITS == ARM_L2_ADDR_BITS, "L2_ADDR_BITS mismatch");
#endif
int _arm_native(kvm_t *);
Modified: projects/release-pkg/lib/libvmmapi/vmmapi.c
==============================================================================
--- projects/release-pkg/lib/libvmmapi/vmmapi.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/lib/libvmmapi/vmmapi.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include <x86/segments.h>
#include <machine/specialreg.h>
-#include <machine/param.h>
#include <errno.h>
#include <stdio.h>
Modified: projects/release-pkg/sbin/ifconfig/ifclone.c
==============================================================================
--- projects/release-pkg/sbin/ifconfig/ifclone.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sbin/ifconfig/ifclone.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -144,11 +144,12 @@ ifclonecreate(int s, void *arg)
}
/*
- * If we get a different name back than we put in, print it.
+ * If we get a different name back than we put in, update record and
+ * indicate it should be printed later.
*/
if (strncmp(name, ifr.ifr_name, sizeof(name)) != 0) {
strlcpy(name, ifr.ifr_name, sizeof(name));
- printf("%s\n", name);
+ printifname = 1;
}
}
Modified: projects/release-pkg/sbin/ifconfig/ifconfig.c
==============================================================================
--- projects/release-pkg/sbin/ifconfig/ifconfig.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sbin/ifconfig/ifconfig.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -93,6 +93,7 @@ int clearaddr;
int newaddr = 1;
int verbose;
int noload;
+int printifname = 0;
int supmedia = 0;
int printkeys = 0; /* Print keying material for interfaces. */
@@ -108,6 +109,8 @@ static struct afswtch *af_getbyname(cons
static struct afswtch *af_getbyfamily(int af);
static void af_other_status(int);
+void printifnamemaybe(void);
+
static struct option *opts = NULL;
struct ifa_order_elt {
@@ -297,6 +300,12 @@ sortifaddrs(struct ifaddrs *list,
return (result);
}
+void printifnamemaybe()
+{
+ if (printifname)
+ printf("%s\n", name);
+}
+
int
main(int argc, char *argv[])
{
@@ -314,6 +323,12 @@ main(int argc, char *argv[])
size_t iflen;
all = downonly = uponly = namesonly = noload = verbose = 0;
+
+ /*
+ * Ensure we print interface name when expected to,
+ * even if we terminate early due to error.
+ */
+ atexit(printifnamemaybe);
/* Parse leading line options */
strlcpy(options, "adklmnuv", sizeof(options));
@@ -1011,6 +1026,8 @@ setifname(const char *val, int dummy __u
const struct afswtch *afp)
{
char *newname;
+
+ strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
newname = strdup(val);
if (newname == NULL)
@@ -1020,6 +1037,7 @@ setifname(const char *val, int dummy __u
free(newname);
err(1, "ioctl SIOCSIFNAME (set name)");
}
+ printifname = 1;
strlcpy(name, newname, sizeof(name));
free(newname);
}
@@ -1031,6 +1049,8 @@ setifdescr(const char *val, int dummy __
{
char *newdescr;
+ strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
+
ifr.ifr_buffer.length = strlen(val) + 1;
if (ifr.ifr_buffer.length == 1) {
ifr.ifr_buffer.buffer = newdescr = NULL;
Modified: projects/release-pkg/sbin/ifconfig/ifconfig.h
==============================================================================
--- projects/release-pkg/sbin/ifconfig/ifconfig.h Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sbin/ifconfig/ifconfig.h Mon Feb 22 12:28:23 2016 (r295886)
@@ -133,6 +133,7 @@ extern int supmedia;
extern int printkeys;
extern int newaddr;
extern int verbose;
+extern int printifname;
void setifcap(const char *, int value, int s, const struct afswtch *);
Modified: projects/release-pkg/share/man/man4/geom_uncompress.4
==============================================================================
--- projects/release-pkg/share/man/man4/geom_uncompress.4 Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/share/man/man4/geom_uncompress.4 Mon Feb 22 12:28:23 2016 (r295886)
@@ -1,3 +1,4 @@
+.\" Copyright (c) 2006, Ceri Davies <ceri at FreeBSD.org>
.\" Copyright (c) 2014, Luiz Otavio O Souza <loos at FreeBSD.org>
.\" All rights reserved.
.\"
@@ -100,8 +101,18 @@ Consumers:
The
.Nm
driver was written by
-.An Maxim Sobolev Aq Mt sobomax at FreeBSD.org
-and
-.An Aleksandr Rybalko Aq Mt ray at FreeBSD.org .
+.An Max Khon Aq Mt fjoe at FreeBSD.org
+as
+.Xr geom_uzip 4 .
+.An Aleksandr Rybalko Aq Mt ray at FreeBSD.org
+copied it over as
+.Nm
+and added LZMA functionality .
This manual page was written by
-.An Luiz Otavio O Souza Aq Mt loos at FreeBSD.org .
+.An Ceri Davies Aq Mt ceri at FreeBSD.org
+for the
+.Xr geom_uzip 4 ,
+and modified by
+.An Luiz Otavio O Souza Aq Mt loos at FreeBSD.org
+to match
+.Nm .
Modified: projects/release-pkg/share/man/man5/mailer.conf.5
==============================================================================
--- projects/release-pkg/share/man/man5/mailer.conf.5 Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/share/man/man5/mailer.conf.5 Mon Feb 22 12:28:23 2016 (r295886)
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 8, 2010
+.Dd February 18, 2016
.Dt MAILER.CONF 5
.Os
.Sh NAME
@@ -101,9 +101,10 @@ mailq /usr/libexec/sendmail/sendmail
newaliases /usr/libexec/sendmail/sendmail
.Ed
.Pp
-This example shows how to invoke a sendmail-workalike like
+Using
.Nm Postfix
-in place of
+(from ports)
+to replace
.Xr sendmail 8 :
.Bd -literal -offset indent
# Emulate sendmail using postfix
@@ -113,12 +114,10 @@ mailq /usr/local/sbin/sendmail
newaliases /usr/local/sbin/sendmail
.Ed
.Pp
-This example shows
-how to invoke
-a sendmail-workalike with
+Using
.Nm Exim
(from ports)
-in place of
+to replace
.Xr sendmail 8 :
.Bd -literal -offset indent
# Emulate sendmail using exim
@@ -129,24 +128,40 @@ newaliases /usr/bin/true
rmail /usr/local/sbin/exim -i -oee
.Ed
.Pp
-This example shows the use of the
+Using
.Nm mini_sendmail
-package from ports in place of
-.Xr sendmail 8 .
-Note the use of additional arguments.
+(from ports)
+to replace
+.Xr sendmail 8 :
.Bd -literal -offset indent
# Send outgoing mail to a smart relay using mini_sendmail
sendmail /usr/local/bin/mini_sendmail -srelayhost
send-mail /usr/local/bin/mini_sendmail -srelayhost
.Ed
+.Pp
+Using
+.Xr dma 8
+to replace
+.Xr sendmail 8 :
+.Bd -literal -offset indent
+# Execute dma instead of sendmail
+sendmail /usr/libexec/dma
+send-mail /usr/libexec/dma
+mailq /usr/libexec/dma
+newaliases /usr/libexec/dma
+rmail /usr/libexec/dma
+.Ed
.Sh SEE ALSO
.Xr mail 1 ,
.Xr mailq 1 ,
.Xr newaliases 1 ,
+.Xr dma 8 ,
.Xr mailwrapper 8 ,
.Xr sendmail 8
.Pp
.Xr postfix 1 Pq Pa ports/mail/postfix ,
+.Xr dma 8 Pq Pa ports/mail/dma ,
+.Xr exim 8 Pq Pa ports/mail/exim ,
.Xr mini_sendmail 8 Pq Pa ports/mail/mini_sendmail
.Sh HISTORY
.Nm
Modified: projects/release-pkg/share/man/man9/bios.9
==============================================================================
--- projects/release-pkg/share/man/man9/bios.9 Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/share/man/man9/bios.9 Mon Feb 22 12:28:23 2016 (r295886)
@@ -37,8 +37,6 @@
.In sys/param.h
.In vm/vm.h
.In vm/pmap.h
-.In machine/param.h
-.In machine/pmap.h
.In machine/pc/bios.h
.Ft uint32_t
.Fn bios_sigsearch "uint32_t start" "u_char *sig" "int siglen" "int paralen" "int sigofs"
Modified: projects/release-pkg/share/mk/bsd.dep.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.dep.mk Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/share/mk/bsd.dep.mk Mon Feb 22 12:28:23 2016 (r295886)
@@ -81,6 +81,16 @@ tags: ${SRCS}
.endif
.endif
+# Skip reading .depend when not needed to speed up tree-walks
+# and simple lookups.
+.if !empty(.MAKEFLAGS:M-V${_V_READ_DEPEND}) || make(obj) || make(clean*) || \
+ make(install*)
+_SKIP_READ_DEPEND= 1
+.if ${MK_DIRDEPS_BUILD} == "no"
+.MAKE.DEPENDFILE= /dev/null
+.endif
+.endif
+
.if defined(SRCS)
CLEANFILES?=
@@ -181,7 +191,7 @@ DEPENDSRCS= ${SRCS:M*.[cSC]} ${SRCS:M*.c
DEPENDOBJS+= ${DEPENDSRCS:R:S,$,.o,}
.endif
DEPENDFILES_OBJS= ${DEPENDOBJS:O:u:${DEPEND_FILTER}:C/^/${DEPENDFILE}./}
-.if ${.MAKEFLAGS:M-V} == ""
+.if !defined(_SKIP_READ_DEPEND)
.for __depend_obj in ${DEPENDFILES_OBJS}
.sinclude "${__depend_obj}"
.endfor
Modified: projects/release-pkg/share/mk/local.meta.sys.mk
==============================================================================
--- projects/release-pkg/share/mk/local.meta.sys.mk Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/share/mk/local.meta.sys.mk Mon Feb 22 12:28:23 2016 (r295886)
@@ -204,6 +204,7 @@ CSU_DIR := ${CSU_DIR.${MACHINE_ARCH}}
.if !empty(TIME_STAMP)
TRACER= ${TIME_STAMP} ${:U}
.endif
+WITH_META_STATS= t
# toolchains can be a pain - especially bootstrappping them
.if ${MACHINE} == "host"
Modified: projects/release-pkg/sys/amd64/amd64/minidump_machdep.c
==============================================================================
--- projects/release-pkg/sys/amd64/amd64/minidump_machdep.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sys/amd64/amd64/minidump_machdep.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <machine/atomic.h>
#include <machine/elf.h>
#include <machine/md_var.h>
-#include <machine/vmparam.h>
#include <machine/minidump.h>
CTASSERT(sizeof(struct kerneldumpheader) == 512);
Modified: projects/release-pkg/sys/amd64/cloudabi64/cloudabi64_sysvec.c
==============================================================================
--- projects/release-pkg/sys/amd64/cloudabi64/cloudabi64_sysvec.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sys/amd64/cloudabi64/cloudabi64_sysvec.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include <machine/frame.h>
#include <machine/pcb.h>
-#include <machine/pmap.h>
#include <machine/vmparam.h>
#include <compat/cloudabi/cloudabi_util.h>
Modified: projects/release-pkg/sys/amd64/vmm/amd/npt.c
==============================================================================
--- projects/release-pkg/sys/amd64/vmm/amd/npt.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sys/amd64/vmm/amd/npt.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -36,8 +36,6 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <vm/vm_extern.h>
-#include <machine/pmap.h>
-
#include "npt.h"
SYSCTL_DECL(_hw_vmm);
Modified: projects/release-pkg/sys/amd64/vmm/amd/svm.c
==============================================================================
--- projects/release-pkg/sys/amd64/vmm/amd/svm.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sys/amd64/vmm/amd/svm.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cpufunc.h>
#include <machine/psl.h>
-#include <machine/pmap.h>
#include <machine/md_var.h>
#include <machine/specialreg.h>
#include <machine/smp.h>
Modified: projects/release-pkg/sys/amd64/vmm/vmm.c
==============================================================================
--- projects/release-pkg/sys/amd64/vmm/vmm.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sys/amd64/vmm/vmm.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -53,12 +53,10 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_param.h>
#include <machine/cpu.h>
-#include <machine/vm.h>
#include <machine/pcb.h>
#include <machine/smp.h>
#include <x86/psl.h>
#include <x86/apicreg.h>
-#include <machine/vmparam.h>
#include <machine/vmm.h>
#include <machine/vmm_dev.h>
Modified: projects/release-pkg/sys/arm/allwinner/a20/std.a20
==============================================================================
--- projects/release-pkg/sys/arm/allwinner/a20/std.a20 Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sys/arm/allwinner/a20/std.a20 Mon Feb 22 12:28:23 2016 (r295886)
@@ -8,8 +8,6 @@ makeoptions CONF_CFLAGS="-march=armv7a"
makeoptions KERNVIRTADDR=0xc0200000
options KERNVIRTADDR=0xc0200000
-options ARM_L2_PIPT
-
options IPI_IRQ_START=0
options IPI_IRQ_END=15
Modified: projects/release-pkg/sys/arm/allwinner/allwinner_machdep.c
==============================================================================
--- projects/release-pkg/sys/arm/allwinner/allwinner_machdep.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sys/arm/allwinner/allwinner_machdep.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -75,6 +75,23 @@ a20_attach(platform_t plat)
return (0);
}
+static int
+a31_attach(platform_t plat)
+{
+ soc_type = ALLWINNERSOC_A31;
+ soc_family = ALLWINNERSOC_SUN6I;
+
+ return (0);
+}
+
+static int
+a31s_attach(platform_t plat)
+{
+ soc_type = ALLWINNERSOC_A31S;
+ soc_family = ALLWINNERSOC_SUN6I;
+
+ return (0);
+}
static vm_offset_t
allwinner_lastaddr(platform_t plat)
@@ -138,6 +155,22 @@ static platform_method_t a20_methods[] =
PLATFORMMETHOD_END,
};
+static platform_method_t a31_methods[] = {
+ PLATFORMMETHOD(platform_attach, a31_attach),
+ PLATFORMMETHOD(platform_lastaddr, allwinner_lastaddr),
+ PLATFORMMETHOD(platform_devmap_init, allwinner_devmap_init),
+
+ PLATFORMMETHOD_END,
+};
+
+static platform_method_t a31s_methods[] = {
+ PLATFORMMETHOD(platform_attach, a31s_attach),
+ PLATFORMMETHOD(platform_lastaddr, allwinner_lastaddr),
+ PLATFORMMETHOD(platform_devmap_init, allwinner_devmap_init),
+
+ PLATFORMMETHOD_END,
+};
+
u_int
allwinner_soc_type(void)
{
@@ -152,3 +185,5 @@ allwinner_soc_family(void)
FDT_PLATFORM_DEF(a10, "a10", 0, "allwinner,sun4i-a10");
FDT_PLATFORM_DEF(a20, "a20", 0, "allwinner,sun7i-a20");
+FDT_PLATFORM_DEF(a31, "a31", 0, "allwinner,sun6i-a31");
+FDT_PLATFORM_DEF(a31s, "a31s", 0, "allwinner,sun6i-a31s");
Modified: projects/release-pkg/sys/arm/allwinner/allwinner_machdep.h
==============================================================================
--- projects/release-pkg/sys/arm/allwinner/allwinner_machdep.h Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sys/arm/allwinner/allwinner_machdep.h Mon Feb 22 12:28:23 2016 (r295886)
@@ -34,9 +34,12 @@
#define ALLWINNERSOC_A13 0x13000000
#define ALLWINNERSOC_A10S 0x10000001
#define ALLWINNERSOC_A20 0x20000000
+#define ALLWINNERSOC_A31 0x31000000
+#define ALLWINNERSOC_A31S 0x31000001
#define ALLWINNERSOC_SUN4I 0x40000000
#define ALLWINNERSOC_SUN5I 0x50000000
+#define ALLWINNERSOC_SUN6I 0x60000000
#define ALLWINNERSOC_SUN7I 0x70000000
u_int allwinner_soc_type(void);
Modified: projects/release-pkg/sys/arm/allwinner/std.a10
==============================================================================
--- projects/release-pkg/sys/arm/allwinner/std.a10 Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sys/arm/allwinner/std.a10 Mon Feb 22 12:28:23 2016 (r295886)
@@ -8,7 +8,5 @@ makeoptions CONF_CFLAGS="-march=armv7a"
makeoptions KERNVIRTADDR=0xc0200000
options KERNVIRTADDR=0xc0200000
-options ARM_L2_PIPT
-
files "../allwinner/files.allwinner"
files "../allwinner/files.a10"
Modified: projects/release-pkg/sys/arm/altera/socfpga/std.socfpga
==============================================================================
--- projects/release-pkg/sys/arm/altera/socfpga/std.socfpga Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sys/arm/altera/socfpga/std.socfpga Mon Feb 22 12:28:23 2016 (r295886)
@@ -7,8 +7,6 @@ makeoptions CONF_CFLAGS="-march=armv7a"
makeoptions KERNVIRTADDR=0xc0f00000
options KERNVIRTADDR=0xc0f00000
-options ARM_L2_PIPT
-
options IPI_IRQ_START=0
options IPI_IRQ_END=15
Modified: projects/release-pkg/sys/arm/amlogic/aml8726/std.aml8726
==============================================================================
--- projects/release-pkg/sys/arm/amlogic/aml8726/std.aml8726 Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sys/arm/amlogic/aml8726/std.aml8726 Mon Feb 22 12:28:23 2016 (r295886)
@@ -17,8 +17,6 @@ device fdt_pinctrl
files "../amlogic/aml8726/files.aml8726"
-options ARM_L2_PIPT
-
# Set all global interrupts to be edge triggered, active high.
options GIC_DEFAULT_ICFGR_INIT=0xffffffff
Modified: projects/release-pkg/sys/arm/annapurna/alpine/alpine_machdep.c
==============================================================================
--- projects/release-pkg/sys/arm/annapurna/alpine/alpine_machdep.c Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sys/arm/annapurna/alpine/alpine_machdep.c Mon Feb 22 12:28:23 2016 (r295886)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
#include <machine/machdep.h>
-#include <machine/pmap.h>
#include <machine/devmap.h>
#include <machine/platform.h>
#include <machine/fdt.h>
Modified: projects/release-pkg/sys/arm/annapurna/alpine/std.alpine
==============================================================================
--- projects/release-pkg/sys/arm/annapurna/alpine/std.alpine Mon Feb 22 11:47:28 2016 (r295885)
+++ projects/release-pkg/sys/arm/annapurna/alpine/std.alpine Mon Feb 22 12:28:23 2016 (r295886)
@@ -10,8 +10,6 @@ options KERNVIRTADDR=0xa0200000
makeoptions KERNBASE=0xa0000000
options KERNBASE=0xa0000000
-options ARM_L2_PIPT
-
options IPI_IRQ_START=0
options IPI_IRQ_END=15
Copied: projects/release-pkg/sys/arm/arm/busdma_machdep-v4.c (from r295885, head/sys/arm/arm/busdma_machdep-v4.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-pkg/sys/arm/arm/busdma_machdep-v4.c Mon Feb 22 12:28:23 2016 (r295886, copy of r295885, head/sys/arm/arm/busdma_machdep-v4.c)
@@ -0,0 +1,1609 @@
+/*-
+ * Copyright (c) 2012 Ian Lepore
+ * Copyright (c) 2004 Olivier Houchard
+ * Copyright (c) 2002 Peter Grehan
+ * Copyright (c) 1997, 1998 Justin T. Gibbs.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list