Date: Mon, 29 Jan 2018 18:49:29 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r328558 - in user/markj/netdump: . bin/date bin/dd bin/pax bin/ps cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/common cddl/lib... Message-ID: <201801291849.w0TInTmH012797@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Mon Jan 29 18:49:28 2018 New Revision: 328558 URL: https://svnweb.freebsd.org/changeset/base/328558 Log: MFH at r328557. Added: user/markj/netdump/contrib/libarchive/cat/test/test_stdin.c - copied unchanged from r328557, head/contrib/libarchive/cat/test/test_stdin.c user/markj/netdump/contrib/libarchive/libarchive/test/test_compat_zip_8.zip.uu - copied unchanged from r328557, head/contrib/libarchive/libarchive/test/test_compat_zip_8.zip.uu user/markj/netdump/contrib/lua/src/luaconf.h.dist - copied unchanged from r328557, head/contrib/lua/src/luaconf.h.dist user/markj/netdump/contrib/tzdata/pacificnew - copied unchanged from r328557, head/contrib/tzdata/pacificnew user/markj/netdump/lib/libc/tests/regex/Makefile.inc - copied unchanged from r328557, head/lib/libc/tests/regex/Makefile.inc user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.3 - copied unchanged from r328557, head/lib/libcasper/services/cap_grp/cap_grp.3 user/markj/netdump/lib/libcasper/services/cap_random/cap_random.3 - copied unchanged from r328557, head/lib/libcasper/services/cap_random/cap_random.3 user/markj/netdump/lib/libcasper/services/cap_syslog/cap_syslog.3 - copied unchanged from r328557, head/lib/libcasper/services/cap_syslog/cap_syslog.3 user/markj/netdump/lib/libregex/ - copied from r328557, head/lib/libregex/ user/markj/netdump/share/man/man4/bcm283x_pwm.4 - copied unchanged from r328557, head/share/man/man4/bcm283x_pwm.4 user/markj/netdump/stand/libsa/abort.c - copied unchanged from r328557, head/stand/libsa/abort.c user/markj/netdump/sys/arm/broadcom/bcm2835/bcm2835_clkman.c - copied unchanged from r328557, head/sys/arm/broadcom/bcm2835/bcm2835_clkman.c user/markj/netdump/sys/arm/broadcom/bcm2835/bcm2835_clkman.h - copied unchanged from r328557, head/sys/arm/broadcom/bcm2835/bcm2835_clkman.h user/markj/netdump/sys/dev/usb/controller/ehci_msm.c - copied unchanged from r328557, head/sys/dev/usb/controller/ehci_msm.c user/markj/netdump/sys/modules/bcm283x_clkman/ - copied from r328557, head/sys/modules/bcm283x_clkman/ Deleted: user/markj/netdump/contrib/lua/src/luaconf.h user/markj/netdump/sys/arm/conf/EA3250 user/markj/netdump/sys/arm/lpc/files.lpc user/markj/netdump/sys/arm/lpc/if_lpe.c user/markj/netdump/sys/arm/lpc/if_lpereg.h user/markj/netdump/sys/arm/lpc/lpc_dmac.c user/markj/netdump/sys/arm/lpc/lpc_fb.c user/markj/netdump/sys/arm/lpc/lpc_gpio.c user/markj/netdump/sys/arm/lpc/lpc_intc.c user/markj/netdump/sys/arm/lpc/lpc_machdep.c user/markj/netdump/sys/arm/lpc/lpc_mmc.c user/markj/netdump/sys/arm/lpc/lpc_ohci.c user/markj/netdump/sys/arm/lpc/lpc_pll.c user/markj/netdump/sys/arm/lpc/lpc_pwr.c user/markj/netdump/sys/arm/lpc/lpc_rtc.c user/markj/netdump/sys/arm/lpc/lpc_spi.c user/markj/netdump/sys/arm/lpc/lpc_timer.c user/markj/netdump/sys/arm/lpc/lpcreg.h user/markj/netdump/sys/arm/lpc/lpcvar.h user/markj/netdump/sys/arm/lpc/ssd1289.c user/markj/netdump/sys/arm/lpc/std.lpc user/markj/netdump/sys/dev/uart/uart_dev_lpc.c Modified: user/markj/netdump/Makefile.inc1 user/markj/netdump/Makefile.libcompat user/markj/netdump/bin/date/date.c user/markj/netdump/bin/dd/dd.c user/markj/netdump/bin/pax/pax.c user/markj/netdump/bin/ps/keyword.c user/markj/netdump/bin/ps/ps.1 user/markj/netdump/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/markj/netdump/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c user/markj/netdump/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c user/markj/netdump/cddl/lib/libdtrace/tcp.d user/markj/netdump/contrib/compiler-rt/lib/builtins/clear_cache.c user/markj/netdump/contrib/libarchive/cat/bsdcat.c user/markj/netdump/contrib/libarchive/libarchive/archive_acl.c user/markj/netdump/contrib/libarchive/libarchive/archive_disk_acl_freebsd.c user/markj/netdump/contrib/libarchive/libarchive/archive_match.c user/markj/netdump/contrib/libarchive/libarchive/archive_platform.h user/markj/netdump/contrib/libarchive/libarchive/archive_ppmd7.c user/markj/netdump/contrib/libarchive/libarchive/archive_ppmd7_private.h user/markj/netdump/contrib/libarchive/libarchive/archive_ppmd_private.h user/markj/netdump/contrib/libarchive/libarchive/archive_read.c user/markj/netdump/contrib/libarchive/libarchive/archive_read_disk_posix.c user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_7zip.c user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_mtree.c user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_rar.c user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_tar.c user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_zip.c user/markj/netdump/contrib/libarchive/libarchive/archive_util.c user/markj/netdump/contrib/libarchive/libarchive/archive_virtual.c user/markj/netdump/contrib/libarchive/libarchive/archive_write.c user/markj/netdump/contrib/libarchive/libarchive/archive_write_disk_posix.c user/markj/netdump/contrib/libarchive/libarchive/archive_write_set_format_7zip.c user/markj/netdump/contrib/libarchive/libarchive/test/read_open_memory.c user/markj/netdump/contrib/libarchive/libarchive/test/test.h user/markj/netdump/contrib/libarchive/libarchive/test/test_acl_platform_nfs4.c user/markj/netdump/contrib/libarchive/libarchive/test/test_compat_zip.c user/markj/netdump/contrib/libarchive/libarchive/test/test_read_format_zip.c user/markj/netdump/contrib/libarchive/libarchive/test/test_write_disk_perms.c user/markj/netdump/contrib/libarchive/tar/test/test_option_acls.c user/markj/netdump/contrib/llvm/include/llvm/Analysis/RegionInfoImpl.h user/markj/netdump/contrib/llvm/include/llvm/CodeGen/SelectionDAGAddressAnalysis.h user/markj/netdump/contrib/llvm/include/llvm/MC/MCCodeView.h user/markj/netdump/contrib/llvm/include/llvm/Support/GenericDomTreeConstruction.h user/markj/netdump/contrib/llvm/lib/CodeGen/GlobalMerge.cpp user/markj/netdump/contrib/llvm/lib/CodeGen/PeepholeOptimizer.cpp user/markj/netdump/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp user/markj/netdump/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp user/markj/netdump/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp user/markj/netdump/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGAddressAnalysis.cpp user/markj/netdump/contrib/llvm/lib/CodeGen/TargetLoweringBase.cpp user/markj/netdump/contrib/llvm/lib/Linker/IRMover.cpp user/markj/netdump/contrib/llvm/lib/MC/MCCodeView.cpp user/markj/netdump/contrib/llvm/lib/Target/AArch64/AArch64InstructionSelector.cpp user/markj/netdump/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp user/markj/netdump/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp user/markj/netdump/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h user/markj/netdump/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td user/markj/netdump/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp user/markj/netdump/contrib/llvm/lib/Transforms/Scalar/GVNHoist.cpp user/markj/netdump/contrib/llvm/lib/Transforms/Scalar/StructurizeCFG.cpp user/markj/netdump/contrib/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp user/markj/netdump/contrib/llvm/tools/clang/include/clang/Basic/Attr.td user/markj/netdump/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsX86.def user/markj/netdump/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td user/markj/netdump/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.def user/markj/netdump/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugType.h user/markj/netdump/contrib/llvm/tools/clang/lib/AST/DeclBase.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/AST/ODRHash.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/Basic/Targets/X86.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/CodeGen/CGBuiltin.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/Lex/Lexer.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/Lex/PPCaching.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/Lex/PPLexerChange.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/Sema/Scope.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/Sema/SemaTemplateDeduction.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ValistChecker.cpp user/markj/netdump/contrib/llvm/tools/lld/COFF/Driver.cpp user/markj/netdump/contrib/llvm/tools/lld/ELF/LinkerScript.cpp user/markj/netdump/contrib/llvm/tools/lld/ELF/LinkerScript.h user/markj/netdump/contrib/llvm/tools/lld/ELF/OutputSections.h user/markj/netdump/contrib/llvm/tools/lld/ELF/ScriptParser.cpp user/markj/netdump/contrib/llvm/tools/lld/ELF/SymbolTable.cpp user/markj/netdump/contrib/llvm/tools/lld/ELF/SyntheticSections.cpp user/markj/netdump/contrib/llvm/tools/lld/ELF/Writer.cpp user/markj/netdump/contrib/llvm/tools/lld/ELF/Writer.h user/markj/netdump/contrib/llvm/tools/llvm-readobj/MachODumper.cpp user/markj/netdump/contrib/lua/src/lstrlib.c user/markj/netdump/contrib/netbsd-tests/lib/libc/sys/t_mlock.c user/markj/netdump/contrib/tnftp/src/cmds.c user/markj/netdump/contrib/traceroute/traceroute.c user/markj/netdump/contrib/tzdata/Makefile user/markj/netdump/contrib/tzdata/NEWS user/markj/netdump/contrib/tzdata/README user/markj/netdump/contrib/tzdata/asia user/markj/netdump/contrib/tzdata/europe user/markj/netdump/contrib/tzdata/leap-seconds.list user/markj/netdump/contrib/tzdata/leapseconds user/markj/netdump/contrib/tzdata/theory.html user/markj/netdump/contrib/tzdata/version user/markj/netdump/contrib/tzdata/zishrink.awk user/markj/netdump/crypto/openssl/ssl/srtp.h user/markj/netdump/etc/Makefile user/markj/netdump/etc/mtree/BSD.root.dist user/markj/netdump/etc/mtree/BSD.tests.dist user/markj/netdump/etc/rc.subr user/markj/netdump/include/err.h user/markj/netdump/include/stdlib.h user/markj/netdump/lib/Makefile user/markj/netdump/lib/clang/include/clang/Basic/Version.inc user/markj/netdump/lib/clang/include/lld/Common/Version.inc user/markj/netdump/lib/clang/include/llvm/Support/VCSRevision.h user/markj/netdump/lib/libarchive/tests/Makefile user/markj/netdump/lib/libc/gen/getgrent.c user/markj/netdump/lib/libc/mips/gen/makecontext.c user/markj/netdump/lib/libc/regex/Makefile.inc user/markj/netdump/lib/libc/regex/regcomp.c user/markj/netdump/lib/libc/sys/mlock.2 user/markj/netdump/lib/libc/sys/setgroups.2 user/markj/netdump/lib/libc/sys/shmat.2 user/markj/netdump/lib/libc/tests/regex/Makefile user/markj/netdump/lib/libcasper/libcasper/libcasper.c user/markj/netdump/lib/libcasper/libcasper/libcasper.h user/markj/netdump/lib/libcasper/libcasper/libcasper_impl.c user/markj/netdump/lib/libcasper/libcasper/libcasper_impl.h user/markj/netdump/lib/libcasper/libcasper/libcasper_service.c user/markj/netdump/lib/libcasper/libcasper/libcasper_service.h user/markj/netdump/lib/libcasper/libcasper/service.c user/markj/netdump/lib/libcasper/libcasper/zygote.c user/markj/netdump/lib/libcasper/libcasper/zygote.h user/markj/netdump/lib/libcasper/services/cap_dns/cap_dns.c user/markj/netdump/lib/libcasper/services/cap_dns/tests/dns_test.c user/markj/netdump/lib/libcasper/services/cap_grp/Makefile user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.c user/markj/netdump/lib/libcasper/services/cap_grp/tests/grp_test.c user/markj/netdump/lib/libcasper/services/cap_pwd/cap_pwd.c user/markj/netdump/lib/libcasper/services/cap_pwd/tests/pwd_test.c user/markj/netdump/lib/libcasper/services/cap_random/Makefile user/markj/netdump/lib/libcasper/services/cap_random/cap_random.c user/markj/netdump/lib/libcasper/services/cap_sysctl/cap_sysctl.c user/markj/netdump/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c user/markj/netdump/lib/libcasper/services/cap_syslog/Makefile user/markj/netdump/lib/libcasper/services/cap_syslog/cap_syslog.c user/markj/netdump/lib/libcxxrt/Version.map user/markj/netdump/lib/libthr/thread/thr_printf.c user/markj/netdump/lib/libufs/Makefile user/markj/netdump/lib/libufs/libufs.h user/markj/netdump/lib/libufs/sblock.c user/markj/netdump/lib/libufs/sbread.3 user/markj/netdump/release/release.sh user/markj/netdump/sbin/clri/Makefile user/markj/netdump/sbin/clri/clri.c user/markj/netdump/sbin/decryptcore/decryptcore.8 user/markj/netdump/sbin/devd/devd.cc user/markj/netdump/sbin/dump/Makefile user/markj/netdump/sbin/dump/dump.h user/markj/netdump/sbin/dump/main.c user/markj/netdump/sbin/fsck_ffs/fsck.h user/markj/netdump/sbin/fsck_ffs/fsutil.c user/markj/netdump/sbin/fsck_ffs/gjournal.c user/markj/netdump/sbin/fsck_ffs/globs.c user/markj/netdump/sbin/fsck_ffs/setup.c user/markj/netdump/sbin/fsck_ffs/suj.c user/markj/netdump/sbin/fsirand/Makefile user/markj/netdump/sbin/fsirand/fsirand.c user/markj/netdump/sbin/growfs/growfs.c user/markj/netdump/sbin/newfs/mkfs.c user/markj/netdump/sbin/pfctl/pfctl_optimize.c user/markj/netdump/sbin/quotacheck/Makefile user/markj/netdump/sbin/quotacheck/quotacheck.c user/markj/netdump/share/examples/kld/cdev/module/cdev.c user/markj/netdump/share/examples/kld/cdev/module/cdevmod.c user/markj/netdump/share/man/man4/Makefile user/markj/netdump/share/man/man4/nmdm.4 user/markj/netdump/share/man/man7/hier.7 user/markj/netdump/share/man/man8/Makefile user/markj/netdump/share/man/man8/uefi.8 user/markj/netdump/share/man/man9/malloc.9 user/markj/netdump/share/man/man9/style.9 user/markj/netdump/share/mk/bsd.libnames.mk user/markj/netdump/share/mk/src.libnames.mk user/markj/netdump/share/vt/keymaps/us.kbd user/markj/netdump/stand/common/boot.c user/markj/netdump/stand/common/bootstrap.h user/markj/netdump/stand/common/commands.c user/markj/netdump/stand/common/interp.c user/markj/netdump/stand/common/load_elf.c user/markj/netdump/stand/common/misc.c user/markj/netdump/stand/efi/fdt/efi_fdt.c user/markj/netdump/stand/efi/include/efiapi.h user/markj/netdump/stand/efi/loader/main.c user/markj/netdump/stand/fdt/fdt_loader_cmd.c user/markj/netdump/stand/fdt/fdt_platform.h user/markj/netdump/stand/i386/gptboot/gptboot.c user/markj/netdump/stand/libsa/Makefile user/markj/netdump/stand/libsa/environment.c user/markj/netdump/stand/libsa/panic.c user/markj/netdump/stand/libsa/stand.h user/markj/netdump/stand/libsa/ufs.c user/markj/netdump/stand/mips/beri/boot2/boot2.c user/markj/netdump/stand/mips/beri/loader/main.c user/markj/netdump/stand/mips/uboot/conf.c user/markj/netdump/stand/powerpc/kboot/conf.c user/markj/netdump/stand/powerpc/kboot/host_syscall.S user/markj/netdump/stand/powerpc/kboot/host_syscall.h user/markj/netdump/stand/powerpc/kboot/hostdisk.c user/markj/netdump/stand/powerpc/kboot/kerneltramp.S user/markj/netdump/stand/powerpc/kboot/main.c user/markj/netdump/stand/powerpc/kboot/metadata.c user/markj/netdump/stand/powerpc/kboot/ppc64_elf_freebsd.c user/markj/netdump/stand/uboot/common/main.c user/markj/netdump/stand/uboot/fdt/uboot_fdt.c user/markj/netdump/stand/uboot/lib/glue.c user/markj/netdump/stand/uboot/lib/glue.h user/markj/netdump/sys/amd64/amd64/apic_vector.S user/markj/netdump/sys/amd64/amd64/fpu.c user/markj/netdump/sys/amd64/amd64/mp_machdep.c user/markj/netdump/sys/amd64/amd64/pmap.c user/markj/netdump/sys/amd64/amd64/support.S user/markj/netdump/sys/amd64/include/pmap.h user/markj/netdump/sys/amd64/include/smp.h user/markj/netdump/sys/amd64/linux/linux_ptrace.c user/markj/netdump/sys/amd64/linux/linux_support.s user/markj/netdump/sys/amd64/linux32/linux32_support.s user/markj/netdump/sys/arm/arm/cpuinfo.c user/markj/netdump/sys/arm/arm/genassym.c user/markj/netdump/sys/arm/arm/machdep.c user/markj/netdump/sys/arm/arm/mp_machdep.c user/markj/netdump/sys/arm/arm/swtch-v6.S user/markj/netdump/sys/arm/arm/trap-v6.c user/markj/netdump/sys/arm/broadcom/bcm2835/bcm2835_pwm.c user/markj/netdump/sys/arm/freescale/imx/imx_machdep.c user/markj/netdump/sys/arm/freescale/imx/imx_machdep.h user/markj/netdump/sys/arm/freescale/imx/imx_wdog.c user/markj/netdump/sys/arm/freescale/imx/imx_wdogreg.h user/markj/netdump/sys/arm/include/cpuinfo.h user/markj/netdump/sys/arm/include/pcpu.h user/markj/netdump/sys/arm/mv/armada38x/files.armada38x user/markj/netdump/sys/arm/xilinx/files.zynq7 user/markj/netdump/sys/arm64/arm64/cpufunc_asm.S user/markj/netdump/sys/arm64/arm64/pmap.c user/markj/netdump/sys/cam/cam_periph.h user/markj/netdump/sys/cam/cam_xpt.c user/markj/netdump/sys/cam/ctl/ctl_frontend_cam_sim.c user/markj/netdump/sys/cam/ctl/scsi_ctl.c user/markj/netdump/sys/cam/nvme/nvme_da.c user/markj/netdump/sys/cam/scsi/scsi_ch.c user/markj/netdump/sys/cam/scsi/scsi_da.c user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h user/markj/netdump/sys/compat/linuxkpi/common/src/linux_compat.c user/markj/netdump/sys/compat/linuxkpi/common/src/linux_idr.c user/markj/netdump/sys/compat/linuxkpi/common/src/linux_page.c user/markj/netdump/sys/conf/files user/markj/netdump/sys/conf/files.amd64 user/markj/netdump/sys/conf/files.i386 user/markj/netdump/sys/conf/kern.post.mk user/markj/netdump/sys/conf/options user/markj/netdump/sys/contrib/ipfilter/netinet/ip_compat.h user/markj/netdump/sys/contrib/libfdt/fdt.c user/markj/netdump/sys/contrib/libfdt/fdt_overlay.c user/markj/netdump/sys/contrib/libfdt/fdt_ro.c user/markj/netdump/sys/contrib/libfdt/libfdt.h user/markj/netdump/sys/contrib/libnv/cnvlist.c user/markj/netdump/sys/contrib/libnv/dnvlist.c user/markj/netdump/sys/contrib/libnv/nv_impl.h user/markj/netdump/sys/contrib/libnv/nvlist.c user/markj/netdump/sys/contrib/libnv/nvlist_impl.h user/markj/netdump/sys/contrib/libnv/nvpair.c user/markj/netdump/sys/contrib/libnv/nvpair_impl.h user/markj/netdump/sys/crypto/ccp/ccp.c user/markj/netdump/sys/dev/advansys/advansys.c user/markj/netdump/sys/dev/advansys/adwcam.c user/markj/netdump/sys/dev/aha/aha.c user/markj/netdump/sys/dev/aic/aic.c user/markj/netdump/sys/dev/ata/ata-isa.c user/markj/netdump/sys/dev/atkbdc/psm.c user/markj/netdump/sys/dev/buslogic/bt.c user/markj/netdump/sys/dev/cxgb/cxgb_main.c user/markj/netdump/sys/dev/cxgbe/common/t4_hw.c user/markj/netdump/sys/dev/cxgbe/crypto/t4_crypto.c user/markj/netdump/sys/dev/cxgbe/t4_main.c user/markj/netdump/sys/dev/dpt/dpt_pci.c user/markj/netdump/sys/dev/drm2/drm_mem_util.h user/markj/netdump/sys/dev/etherswitch/arswitch/arswitch.c user/markj/netdump/sys/dev/etherswitch/e6000sw/e6060sw.c user/markj/netdump/sys/dev/etherswitch/infineon/adm6996fc.c user/markj/netdump/sys/dev/etherswitch/ip17x/ip17x.c user/markj/netdump/sys/dev/etherswitch/micrel/ksz8995ma.c user/markj/netdump/sys/dev/etherswitch/mtkswitch/mtkswitch.c user/markj/netdump/sys/dev/etherswitch/rtl8366/rtl8366rb.c user/markj/netdump/sys/dev/etherswitch/ukswitch/ukswitch.c user/markj/netdump/sys/dev/extres/clk/clk.c user/markj/netdump/sys/dev/iicbus/ds1307.c user/markj/netdump/sys/dev/iicbus/ds13rtc.c user/markj/netdump/sys/dev/iicbus/iiconf.c user/markj/netdump/sys/dev/iicbus/iiconf.h user/markj/netdump/sys/dev/iicbus/isl12xx.c user/markj/netdump/sys/dev/iicbus/nxprtc.c user/markj/netdump/sys/dev/iscsi/icl_conn_if.m user/markj/netdump/sys/dev/iscsi/icl_soft.c user/markj/netdump/sys/dev/iscsi/icl_wrappers.h user/markj/netdump/sys/dev/ixgbe/if_ixv.c user/markj/netdump/sys/dev/joy/joy.c user/markj/netdump/sys/dev/mps/mps.c user/markj/netdump/sys/dev/mse/mse.c user/markj/netdump/sys/dev/ncv/ncr53c500_pccard.c user/markj/netdump/sys/dev/nsp/nsp_pccard.c user/markj/netdump/sys/dev/ntb/ntb_transport.c user/markj/netdump/sys/dev/nvme/nvme.c user/markj/netdump/sys/dev/nvme/nvme_ctrlr.c user/markj/netdump/sys/dev/nvme/nvme_private.h user/markj/netdump/sys/dev/ofw/ofw_bus_subr.c user/markj/netdump/sys/dev/sbni/if_sbni_isa.c user/markj/netdump/sys/dev/sdhci/sdhci_fdt.c user/markj/netdump/sys/dev/sound/isa/ess.c user/markj/netdump/sys/dev/sound/isa/gusc.c user/markj/netdump/sys/dev/sound/isa/mss.c user/markj/netdump/sys/dev/sound/isa/sbc.c user/markj/netdump/sys/dev/stg/tmc18c30.c user/markj/netdump/sys/dev/usb/quirk/usb_quirk.c user/markj/netdump/sys/dev/usb/storage/cfumass.c user/markj/netdump/sys/dev/usb/usbdevs user/markj/netdump/sys/dts/arm/bcm2836.dtsi user/markj/netdump/sys/fs/autofs/autofs.h user/markj/netdump/sys/fs/autofs/autofs_ioctl.h user/markj/netdump/sys/fs/autofs/autofs_vfsops.c user/markj/netdump/sys/fs/autofs/autofs_vnops.c user/markj/netdump/sys/fs/cd9660/cd9660_vnops.c user/markj/netdump/sys/fs/ext2fs/ext2_csum.c user/markj/netdump/sys/fs/ext2fs/ext2_extents.c user/markj/netdump/sys/fs/ext2fs/ext2_lookup.c user/markj/netdump/sys/fs/ext2fs/ext2_vfsops.c user/markj/netdump/sys/fs/nandfs/nandfs_vfsops.c user/markj/netdump/sys/fs/nfs/nfs_commonkrpc.c user/markj/netdump/sys/fs/nfs/nfs_commonsubs.c user/markj/netdump/sys/fs/nfs/nfsport.h user/markj/netdump/sys/fs/nfsclient/nfs_clcomsubs.c user/markj/netdump/sys/fs/nfsclient/nfs_clnode.c user/markj/netdump/sys/fs/nfsclient/nfs_clport.c user/markj/netdump/sys/fs/nfsclient/nfs_clrpcops.c user/markj/netdump/sys/fs/nfsclient/nfs_clstate.c user/markj/netdump/sys/fs/nfsclient/nfs_clsubs.c user/markj/netdump/sys/fs/nfsclient/nfs_clvfsops.c user/markj/netdump/sys/fs/nfsclient/nfs_clvnops.c user/markj/netdump/sys/fs/nfsclient/nfsnode.h user/markj/netdump/sys/fs/nfsserver/nfs_nfsdcache.c user/markj/netdump/sys/fs/nfsserver/nfs_nfsdport.c user/markj/netdump/sys/fs/nfsserver/nfs_nfsdserv.c user/markj/netdump/sys/fs/nfsserver/nfs_nfsdstate.c user/markj/netdump/sys/geom/geom.h user/markj/netdump/sys/geom/geom_io.c user/markj/netdump/sys/geom/journal/g_journal_ufs.c user/markj/netdump/sys/geom/label/g_label.c user/markj/netdump/sys/geom/label/g_label_ufs.c user/markj/netdump/sys/i386/i386/npx.c user/markj/netdump/sys/i386/i386/pmap.c user/markj/netdump/sys/i386/i386/vm_machdep.c user/markj/netdump/sys/i386/linux/linux_support.s user/markj/netdump/sys/isa/vga_isa.c user/markj/netdump/sys/kern/kern_exec.c user/markj/netdump/sys/kern/kern_malloc.c user/markj/netdump/sys/kern/link_elf_obj.c user/markj/netdump/sys/kern/subr_bus.c user/markj/netdump/sys/kern/subr_hash.c user/markj/netdump/sys/kern/uipc_usrreq.c user/markj/netdump/sys/kern/vfs_default.c user/markj/netdump/sys/modules/Makefile user/markj/netdump/sys/modules/cam/Makefile user/markj/netdump/sys/modules/geom/geom_label/Makefile user/markj/netdump/sys/modules/linux64/Makefile user/markj/netdump/sys/modules/uart/Makefile user/markj/netdump/sys/net/bpf.c user/markj/netdump/sys/net/ieee8023ad_lacp.c user/markj/netdump/sys/net/route.c user/markj/netdump/sys/net/route.h user/markj/netdump/sys/net/rtsock.c user/markj/netdump/sys/netinet/in_kdtrace.c user/markj/netdump/sys/netinet/in_pcb.c user/markj/netdump/sys/netinet/ip_mroute.c user/markj/netdump/sys/netinet/ip_output.c user/markj/netdump/sys/netinet/ip_reass.c user/markj/netdump/sys/netinet/sctp_constants.h user/markj/netdump/sys/netinet6/frag6.c user/markj/netdump/sys/netinet6/in6.c user/markj/netdump/sys/netinet6/in6_ifattach.c user/markj/netdump/sys/netinet6/ip6_input.c user/markj/netdump/sys/netinet6/nd6.c user/markj/netdump/sys/netinet6/scope6.c user/markj/netdump/sys/netipsec/xform_ah.c user/markj/netdump/sys/netpfil/ipfw/ip_fw2.c user/markj/netdump/sys/netpfil/ipfw/ip_fw_sockopt.c user/markj/netdump/sys/netpfil/ipfw/ip_fw_table_algo.c user/markj/netdump/sys/netpfil/pf/pf.c user/markj/netdump/sys/netsmb/smb_crypt.c user/markj/netdump/sys/nfsclient/nfsnode.h user/markj/netdump/sys/opencrypto/cryptodev.c user/markj/netdump/sys/powerpc/aim/mmu_oea.c user/markj/netdump/sys/powerpc/aim/mmu_oea64.c user/markj/netdump/sys/powerpc/aim/mp_cpudep.c user/markj/netdump/sys/powerpc/booke/pmap.c user/markj/netdump/sys/powerpc/conf/QORIQ64 user/markj/netdump/sys/powerpc/include/pmap.h user/markj/netdump/sys/powerpc/include/spr.h user/markj/netdump/sys/powerpc/include/vmparam.h user/markj/netdump/sys/powerpc/mpc85xx/atpic.c user/markj/netdump/sys/powerpc/powernv/opal_pci.c user/markj/netdump/sys/powerpc/powernv/platform_powernv.c user/markj/netdump/sys/powerpc/powerpc/exec_machdep.c user/markj/netdump/sys/powerpc/powerpc/intr_machdep.c user/markj/netdump/sys/powerpc/powerpc/mmu_if.m user/markj/netdump/sys/powerpc/powerpc/mp_machdep.c user/markj/netdump/sys/powerpc/powerpc/pmap_dispatch.c user/markj/netdump/sys/powerpc/powerpc/trap.c user/markj/netdump/sys/powerpc/pseries/platform_chrp.c user/markj/netdump/sys/powerpc/pseries/xics.c user/markj/netdump/sys/sparc64/sparc64/rtc.c user/markj/netdump/sys/sys/copyright.h user/markj/netdump/sys/sys/malloc.h user/markj/netdump/sys/sys/systm.h user/markj/netdump/sys/tools/usbdevs2h.awk user/markj/netdump/sys/ufs/ffs/ffs_extern.h user/markj/netdump/sys/ufs/ffs/ffs_snapshot.c user/markj/netdump/sys/ufs/ffs/ffs_softdep.c user/markj/netdump/sys/ufs/ffs/ffs_subr.c user/markj/netdump/sys/ufs/ffs/ffs_vfsops.c user/markj/netdump/sys/ufs/ffs/fs.h user/markj/netdump/sys/ufs/ufs/ufs_dirhash.c user/markj/netdump/sys/ufs/ufs/ufs_vnops.c user/markj/netdump/sys/x86/include/x86_smp.h user/markj/netdump/sys/x86/isa/atpic.c user/markj/netdump/sys/x86/isa/atrtc.c user/markj/netdump/sys/x86/isa/clock.c user/markj/netdump/sys/x86/isa/isa_dma.c user/markj/netdump/sys/x86/isa/orm.c user/markj/netdump/sys/x86/pci/pci_bus.c user/markj/netdump/sys/x86/x86/local_apic.c user/markj/netdump/sys/x86/x86/mca.c user/markj/netdump/sys/x86/x86/mp_x86.c user/markj/netdump/sys/x86/x86/nexus.c user/markj/netdump/tests/sys/kern/ptrace_test.c user/markj/netdump/tools/tools/README user/markj/netdump/usr.bin/awk/Makefile user/markj/netdump/usr.bin/bsdcat/tests/Makefile user/markj/netdump/usr.bin/fortune/fortune/fortune.c user/markj/netdump/usr.bin/m4/extern.h user/markj/netdump/usr.bin/procstat/procstat.1 user/markj/netdump/usr.bin/sockstat/sockstat.1 user/markj/netdump/usr.bin/sockstat/sockstat.c user/markj/netdump/usr.bin/time/time.c user/markj/netdump/usr.sbin/autofs/automount.c user/markj/netdump/usr.sbin/autofs/automountd.c user/markj/netdump/usr.sbin/autofs/autounmountd.c user/markj/netdump/usr.sbin/autofs/common.c user/markj/netdump/usr.sbin/autofs/common.h user/markj/netdump/usr.sbin/autofs/defined.c user/markj/netdump/usr.sbin/autofs/log.c user/markj/netdump/usr.sbin/autofs/popen.c user/markj/netdump/usr.sbin/autofs/token.l user/markj/netdump/usr.sbin/bsdinstall/partedit/gpart_ops.c user/markj/netdump/usr.sbin/ctld/chap.c user/markj/netdump/usr.sbin/ctld/isns.c user/markj/netdump/usr.sbin/ctld/uclparse.c user/markj/netdump/usr.sbin/daemon/daemon.8 user/markj/netdump/usr.sbin/fstyp/Makefile user/markj/netdump/usr.sbin/fstyp/ufs.c user/markj/netdump/usr.sbin/iscsid/chap.c user/markj/netdump/usr.sbin/pppctl/pppctl.c user/markj/netdump/usr.sbin/quot/Makefile user/markj/netdump/usr.sbin/quot/quot.c user/markj/netdump/usr.sbin/service/service.sh user/markj/netdump/usr.sbin/traceroute6/traceroute6.8 user/markj/netdump/usr.sbin/traceroute6/traceroute6.c user/markj/netdump/usr.sbin/uefisign/child.c user/markj/netdump/usr.sbin/uefisign/magic.h user/markj/netdump/usr.sbin/uefisign/pe.c user/markj/netdump/usr.sbin/uefisign/uefisign.c user/markj/netdump/usr.sbin/uefisign/uefisign.h Directory Properties: user/markj/netdump/ (props changed) user/markj/netdump/cddl/ (props changed) user/markj/netdump/cddl/contrib/opensolaris/ (props changed) user/markj/netdump/cddl/contrib/opensolaris/cmd/zfs/ (props changed) user/markj/netdump/cddl/contrib/opensolaris/lib/libzfs/ (props changed) user/markj/netdump/contrib/compiler-rt/ (props changed) user/markj/netdump/contrib/libarchive/ (props changed) user/markj/netdump/contrib/libc++/ (props changed) user/markj/netdump/contrib/llvm/ (props changed) user/markj/netdump/contrib/llvm/tools/clang/ (props changed) user/markj/netdump/contrib/llvm/tools/lld/ (props changed) user/markj/netdump/contrib/llvm/tools/lldb/ (props changed) user/markj/netdump/contrib/netbsd-tests/ (props changed) user/markj/netdump/contrib/tnftp/ (props changed) user/markj/netdump/contrib/tzdata/ (props changed) user/markj/netdump/crypto/openssl/ (props changed) user/markj/netdump/sys/cddl/contrib/opensolaris/ (props changed) user/markj/netdump/sys/contrib/ipfilter/ (props changed) user/markj/netdump/sys/contrib/libfdt/ (props changed) Modified: user/markj/netdump/Makefile.inc1 ============================================================================== --- user/markj/netdump/Makefile.inc1 Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/Makefile.inc1 Mon Jan 29 18:49:28 2018 (r328558) @@ -144,7 +144,10 @@ TEST_SYSTEM_COMPILER_VARS= \ WANT_COMPILER_FREEBSD_VERSION WANT_COMPILER_FREEBSD_VERSION_FILE \ CC COMPILER_TYPE COMPILER_FEATURES COMPILER_VERSION \ COMPILER_FREEBSD_VERSION \ - LINKER_TYPE LINKER_FEATURES LINKER_VERSION + X_COMPILER_TYPE X_COMPILER_FEATURES X_COMPILER_VERSION \ + X_COMPILER_FREEBSD_VERSION \ + LINKER_TYPE LINKER_FEATURES LINKER_VERSION \ + X_LINKER_TYPE X_LINKER_FEATURES X_LINKER_VERSION test-system-compiler: .PHONY .for v in ${TEST_SYSTEM_COMPILER_VARS} ${_+_}@printf "%-35s= %s\n" "${v}" "${${v}}" @@ -637,7 +640,8 @@ XCFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTM # combined with --sysroot. XCFLAGS+= -B${WORLDTMP}/usr/lib # Force using libc++ for external GCC. -.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 +.if defined(X_COMPILER_TYPE) && \ + ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 XCXXFLAGS+= -isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \ -nostdinc++ .endif @@ -1443,20 +1447,26 @@ reinstallkernel reinstallkernel.debug: _installcheck_k false .endif @echo "--------------------------------------------------------------" - @echo ">>> Installing kernel ${INSTALLKERNEL}" + @echo ">>> Installing kernel ${INSTALLKERNEL} on $$(LC_ALL=C date)" @echo "--------------------------------------------------------------" ${_+_}cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} + @echo "--------------------------------------------------------------" + @echo ">>> Installing kernel ${INSTALLKERNEL} completed on $$(LC_ALL=C date)" + @echo "--------------------------------------------------------------" .endif .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" .for _kernel in ${BUILDKERNELS:[2..-1]} @echo "--------------------------------------------------------------" - @echo ">>> Installing kernel ${_kernel}" + @echo ">>> Installing kernel ${_kernel} $$(LC_ALL=C date)" @echo "--------------------------------------------------------------" ${_+_}cd ${KRNLOBJDIR}/${_kernel}; \ ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME}.${_kernel} ${.TARGET:S/kernel//} + @echo "--------------------------------------------------------------" + @echo ">>> Installing kernel ${_kernel} completed on $$(LC_ALL=C date)" + @echo "--------------------------------------------------------------" .endfor .endif @@ -2880,7 +2890,8 @@ CD2CFLAGS+= -isystem ${XDDESTDIR}/usr/include -L${XDDE # combined with --sysroot. CD2CFLAGS+= -B${XDDESTDIR}/usr/lib # Force using libc++ for external GCC. -.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 +.if defined(X_COMPILER_TYPE) && \ + ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 CD2CXXFLAGS+= -isystem ${XDDESTDIR}/usr/include/c++/v1 -std=c++11 \ -nostdinc++ .endif Modified: user/markj/netdump/Makefile.libcompat ============================================================================== --- user/markj/netdump/Makefile.libcompat Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/Makefile.libcompat Mon Jan 29 18:49:28 2018 (r328558) @@ -108,7 +108,8 @@ LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat # sysroot path which --sysroot does not actually do for headers. LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include # Force using libc++ for external GCC. -.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 && \ +.if defined(X_COMPILER_TYPE) && \ + ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 && \ (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no") LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \ -nostdinc++ Modified: user/markj/netdump/bin/date/date.c ============================================================================== --- user/markj/netdump/bin/date/date.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/bin/date/date.c Mon Jan 29 18:49:28 2018 (r328558) @@ -301,6 +301,7 @@ setthetime(const char *fmt, const char *p, int jflag, /* set the time */ if (nflag || netsettime(tval)) { utx.ut_type = OLD_TIME; + memset(utx.ut_id, 0, sizeof(utx.ut_id)); (void)gettimeofday(&utx.ut_tv, NULL); pututxline(&utx); tv.tv_sec = tval; Modified: user/markj/netdump/bin/dd/dd.c ============================================================================== --- user/markj/netdump/bin/dd/dd.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/bin/dd/dd.c Mon Jan 29 18:49:28 2018 (r328558) @@ -339,6 +339,21 @@ speed_limit(void) } static void +swapbytes(void *v, size_t len) +{ + unsigned char *p = v; + unsigned char t; + + while (len > 1) { + t = p[0]; + p[0] = p[1]; + p[1] = t; + p += 2; + len -= 2; + } +} + +static void dd_in(void) { ssize_t n; @@ -438,7 +453,7 @@ dd_in(void) ++st.swab; --n; } - swab(in.dbp, in.dbp, (size_t)n); + swapbytes(in.dbp, (size_t)n); } in.dbp += in.dbrcnt; Modified: user/markj/netdump/bin/pax/pax.c ============================================================================== --- user/markj/netdump/bin/pax/pax.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/bin/pax/pax.c Mon Jan 29 18:49:28 2018 (r328558) @@ -109,7 +109,7 @@ char *tempbase; /* basename of tempfile to use for mk /* * PAX - Portable Archive Interchange * - * A utility to read, write, and write lists of the members of archive + * A utility to read, write, and write lists of the members of archive * files and copy directory hierarchies. A variety of archive formats * are supported (some are described in POSIX 1003.1 10.1): * @@ -237,7 +237,7 @@ main(int argc, char *argv[]) /* * Keep a reference to cwd, so we can always come back home. */ - cwdfd = open(".", O_RDONLY); + cwdfd = open(".", O_RDONLY | O_CLOEXEC); if (cwdfd < 0) { syswarn(0, errno, "Can't open current working directory."); return(exit_val); @@ -249,7 +249,7 @@ main(int argc, char *argv[]) if ((tmpdir = getenv("TMPDIR")) == NULL || *tmpdir == '\0') tmpdir = _PATH_TMP; tdlen = strlen(tmpdir); - while(tdlen > 0 && tmpdir[tdlen - 1] == '/') + while (tdlen > 0 && tmpdir[tdlen - 1] == '/') tdlen--; tempfile = malloc(tdlen + 1 + sizeof(_TFILE_BASE)); if (tempfile == NULL) { @@ -271,7 +271,7 @@ main(int argc, char *argv[]) /* * select a primary operation mode */ - switch(act) { + switch (act) { case EXTRACT: extract(); break; @@ -325,6 +325,25 @@ sig_cleanup(int which_sig) } /* + * setup_sig() + * set a signal to be caught, but only if it isn't being ignored already + */ + +static int +setup_sig(int sig, const struct sigaction *n_hand) +{ + struct sigaction o_hand; + + if (sigaction(sig, NULL, &o_hand) < 0) + return (-1); + + if (o_hand.sa_handler == SIG_IGN) + return (0); + + return (sigaction(sig, n_hand, NULL)); +} + +/* * gen_init() * general setup routines. Not all are required, but they really help * when dealing with a medium to large sized archives. @@ -335,7 +354,6 @@ gen_init(void) { struct rlimit reslimit; struct sigaction n_hand; - struct sigaction o_hand; /* * Really needed to handle large archives. We can run out of memory for @@ -389,34 +407,16 @@ gen_init(void) n_hand.sa_flags = 0; n_hand.sa_handler = sig_cleanup; - if ((sigaction(SIGHUP, &n_hand, &o_hand) < 0) && - (o_hand.sa_handler == SIG_IGN) && - (sigaction(SIGHUP, &o_hand, &o_hand) < 0)) + if (setup_sig(SIGHUP, &n_hand) || + setup_sig(SIGTERM, &n_hand) || + setup_sig(SIGINT, &n_hand) || + setup_sig(SIGQUIT, &n_hand) || + setup_sig(SIGXCPU, &n_hand)) goto out; - if ((sigaction(SIGTERM, &n_hand, &o_hand) < 0) && - (o_hand.sa_handler == SIG_IGN) && - (sigaction(SIGTERM, &o_hand, &o_hand) < 0)) - goto out; - - if ((sigaction(SIGINT, &n_hand, &o_hand) < 0) && - (o_hand.sa_handler == SIG_IGN) && - (sigaction(SIGINT, &o_hand, &o_hand) < 0)) - goto out; - - if ((sigaction(SIGQUIT, &n_hand, &o_hand) < 0) && - (o_hand.sa_handler == SIG_IGN) && - (sigaction(SIGQUIT, &o_hand, &o_hand) < 0)) - goto out; - - if ((sigaction(SIGXCPU, &n_hand, &o_hand) < 0) && - (o_hand.sa_handler == SIG_IGN) && - (sigaction(SIGXCPU, &o_hand, &o_hand) < 0)) - goto out; - n_hand.sa_handler = SIG_IGN; - if ((sigaction(SIGPIPE, &n_hand, &o_hand) < 0) || - (sigaction(SIGXFSZ, &n_hand, &o_hand) < 0)) + if ((sigaction(SIGPIPE, &n_hand, NULL) < 0) || + (sigaction(SIGXFSZ, &n_hand, NULL) < 0)) goto out; return(0); Modified: user/markj/netdump/bin/ps/keyword.c ============================================================================== --- user/markj/netdump/bin/ps/keyword.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/bin/ps/keyword.c Mon Jan 29 18:49:28 2018 (r328558) @@ -122,7 +122,7 @@ static VAR var[] = { {"logname", "", "login", NULL, 0, NULL, 0, CHAR, NULL, 0}, {"lstart", "STARTED", NULL, "start-time", LJUST|USER, lstarted, 0, CHAR, NULL, 0}, - {"lwp", "LWP", NULL, "process-thread-id", 0, kvar, KOFF(ki_tid), UINT, + {"lwp", "LWP", NULL, "thread-id", 0, kvar, KOFF(ki_tid), UINT, LWPFMT, 0}, {"majflt", "MAJFLT", NULL, "major-faults", USER, rvar, ROFF(ru_majflt), LONG, "ld", 0}, @@ -204,6 +204,7 @@ static VAR var[] = { {"tdnam", "", "tdname", NULL, 0, NULL, 0, CHAR, NULL, 0}, {"tdname", "TDNAME", NULL, "thread-name", LJUST, tdnam, 0, CHAR, NULL, 0}, + {"tid", "", "lwp", NULL, 0, NULL, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, "cpu-time", USER, cputime, 0, CHAR, NULL, 0}, {"tpgid", "TPGID", NULL, "terminal-process-gid", 0, kvar, KOFF(ki_tpgid), UINT, PIDFMT, 0}, Modified: user/markj/netdump/bin/ps/ps.1 ============================================================================== --- user/markj/netdump/bin/ps/ps.1 Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/bin/ps/ps.1 Mon Jan 29 18:49:28 2018 (r328558) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd December 1, 2017 +.Dd January 23, 2018 .Dt PS 1 .Os .Sh NAME @@ -148,12 +148,7 @@ This option is honored only if the UID of the user is Display information about processes which are running with the specified real group IDs. .It Fl H -Show all of the -.Em kernel visible -threads associated with each process. -Depending on the threading package that -is in use, this may show only the process, only the kernel scheduled entities, -or all of the process threads. +Show all of the threads associated with each process. .It Fl h Repeat the information header as often as necessary to guarantee one header per page of information. @@ -588,7 +583,8 @@ login name of user who started the session .It Cm lstart time started .It Cm lwp -process thread-id +thread (light-weight process) ID (alias +.Cm tid ) .It Cm majflt total page faults .It Cm minflt @@ -605,7 +601,7 @@ nice value (alias .It Cm nivcsw total involuntary context switches .It Cm nlwp -number of threads tied to a process +number of threads (light-weight processes) tied to a process .It Cm nsigs total signals taken (alias .Cm nsignals ) Modified: user/markj/netdump/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- user/markj/netdump/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Jan 29 18:49:28 2018 (r328558) @@ -5636,8 +5636,6 @@ print_holds(boolean_t scripted, boolean_t literal, siz uint64_t val = 0; time_t time; struct tm t; - char sep = scripted ? '\t' : ' '; - size_t sepnum = scripted ? 1 : 2; (void) nvpair_value_uint64(nvp2, &val); if (literal) @@ -5649,8 +5647,13 @@ print_holds(boolean_t scripted, boolean_t literal, siz gettext(STRFTIME_FMT_STR), &t); } - (void) printf("%-*s%*c%-*s%*c%s\n", nwidth, zname, - sepnum, sep, tagwidth, tagname, sepnum, sep, tsbuf); + if (scripted) { + (void) printf("%s\t%s\t%s\n", zname, + tagname, tsbuf); + } else { + (void) printf("%-*s %-*s %s\n", nwidth, + zname, tagwidth, tagname, tsbuf); + } } } } Modified: user/markj/netdump/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- user/markj/netdump/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Mon Jan 29 18:49:28 2018 (r328558) @@ -441,7 +441,7 @@ add_prop_list(const char *propname, char *propval, nvl * feature@ properties and version should not be specified * at the same time. */ - if ((prop == ZPROP_INVAL && zpool_prop_feature(propname) && + if ((prop == ZPOOL_PROP_INVAL && zpool_prop_feature(propname) && nvlist_exists(proplist, vname)) || (prop == ZPOOL_PROP_VERSION && prop_list_contains_feature(proplist))) { Modified: user/markj/netdump/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c ============================================================================== --- user/markj/netdump/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Mon Jan 29 18:49:28 2018 (r328558) @@ -50,6 +50,7 @@ #include "zfeature_common.h" static int read_efi_label(nvlist_t *config, diskaddr_t *sb); +static boolean_t zpool_vdev_is_interior(const char *name); #define BACKUP_SLICE "s2" @@ -444,7 +445,7 @@ zpool_valid_proplist(libzfs_handle_t *hdl, const char const char *propname = nvpair_name(elem); prop = zpool_name_to_prop(propname); - if (prop == ZPROP_INVAL && zpool_prop_feature(propname)) { + if (prop == ZPOOL_PROP_INVAL && zpool_prop_feature(propname)) { int err; char *fname = strchr(propname, '@') + 1; @@ -483,7 +484,7 @@ zpool_valid_proplist(libzfs_handle_t *hdl, const char /* * Make sure this property is valid and applies to this type. */ - if (prop == ZPROP_INVAL) { + if (prop == ZPOOL_PROP_INVAL) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "invalid property '%s'"), propname); (void) zfs_error(hdl, EZFS_BADPROP, errbuf); @@ -2065,10 +2066,7 @@ vdev_to_nvlist_iter(nvlist_t *nv, nvlist_t *search, bo break; } - verify(strncmp(type, VDEV_TYPE_RAIDZ, - strlen(VDEV_TYPE_RAIDZ)) == 0 || - strncmp(type, VDEV_TYPE_MIRROR, - strlen(VDEV_TYPE_MIRROR)) == 0); + verify(zpool_vdev_is_interior(type)); verify(nvlist_lookup_uint64(nv, ZPOOL_CONFIG_ID, &id) == 0); @@ -2175,10 +2173,13 @@ zpool_find_vdev_by_physpath(zpool_handle_t *zhp, const /* * Determine if we have an "interior" top-level vdev (i.e mirror/raidz). */ -boolean_t +static boolean_t zpool_vdev_is_interior(const char *name) { if (strncmp(name, VDEV_TYPE_RAIDZ, strlen(VDEV_TYPE_RAIDZ)) == 0 || + strncmp(name, VDEV_TYPE_SPARE, strlen(VDEV_TYPE_SPARE)) == 0 || + strncmp(name, + VDEV_TYPE_REPLACING, strlen(VDEV_TYPE_REPLACING)) == 0 || strncmp(name, VDEV_TYPE_MIRROR, strlen(VDEV_TYPE_MIRROR)) == 0) return (B_TRUE); return (B_FALSE); Modified: user/markj/netdump/cddl/lib/libdtrace/tcp.d ============================================================================== --- user/markj/netdump/cddl/lib/libdtrace/tcp.d Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/cddl/lib/libdtrace/tcp.d Mon Jan 29 18:49:28 2018 (r328558) @@ -260,7 +260,7 @@ translator tcpinfoh_t < struct tcphdr *p > { tcp_ack = p == NULL ? -1 : p->th_ack; tcp_offset = p == NULL ? -1 : (p->th_off >> 2); tcp_flags = p == NULL ? 0 : p->th_flags; - tcp_window = p == NULL ? 0 : (p->th_win); + tcp_window = p == NULL ? 0 : p->th_win; tcp_checksum = p == NULL ? 0 : ntohs(p->th_sum); tcp_urgent = p == NULL ? 0 : p->th_urp; tcp_hdr = (struct tcphdr *)p; Modified: user/markj/netdump/contrib/compiler-rt/lib/builtins/clear_cache.c ============================================================================== --- user/markj/netdump/contrib/compiler-rt/lib/builtins/clear_cache.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/compiler-rt/lib/builtins/clear_cache.c Mon Jan 29 18:49:28 2018 (r328558) @@ -33,6 +33,11 @@ uintptr_t GetCurrentProcess(void); #include <machine/sysarch.h> #endif +#if defined(__OpenBSD__) && defined(__mips__) + #include <sys/types.h> + #include <machine/sysarch.h> +#endif + #if defined(__linux__) && defined(__mips__) #include <sys/cachectl.h> #include <sys/syscall.h> @@ -142,6 +147,8 @@ void __clear_cache(void *start, void *end) { #else syscall(__NR_cacheflush, start, (end_int - start_int), BCACHE); #endif +#elif defined(__mips__) && defined(__OpenBSD__) + cacheflush(start, (uintptr_t)end - (uintptr_t)start, BCACHE); #elif defined(__aarch64__) && !defined(__APPLE__) uint64_t xstart = (uint64_t)(uintptr_t) start; uint64_t xend = (uint64_t)(uintptr_t) end; @@ -156,12 +163,14 @@ void __clear_cache(void *start, void *end) { * uintptr_t in case this runs in an IPL32 environment. */ const size_t dcache_line_size = 4 << ((ctr_el0 >> 16) & 15); - for (addr = xstart; addr < xend; addr += dcache_line_size) + for (addr = xstart & ~(dcache_line_size - 1); addr < xend; + addr += dcache_line_size) __asm __volatile("dc cvau, %0" :: "r"(addr)); __asm __volatile("dsb ish"); const size_t icache_line_size = 4 << ((ctr_el0 >> 0) & 15); - for (addr = xstart; addr < xend; addr += icache_line_size) + for (addr = xstart & ~(icache_line_size - 1); addr < xend; + addr += icache_line_size) __asm __volatile("ic ivau, %0" :: "r"(addr)); __asm __volatile("isb sy"); #elif defined (__powerpc64__) Modified: user/markj/netdump/contrib/libarchive/cat/bsdcat.c ============================================================================== --- user/markj/netdump/contrib/libarchive/cat/bsdcat.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/libarchive/cat/bsdcat.c Mon Jan 29 18:49:28 2018 (r328558) @@ -70,6 +70,12 @@ version(void) void bsdcat_next(void) { + if (a != NULL) { + if (archive_read_close(a) != ARCHIVE_OK) + bsdcat_print_error(); + archive_read_free(a); + } + a = archive_read_new(); archive_read_support_filter_all(a); archive_read_support_format_empty(a); @@ -100,8 +106,10 @@ bsdcat_read_to_stdout(const char* filename) ; else if (archive_read_data_into_fd(a, 1) != ARCHIVE_OK) bsdcat_print_error(); - if (archive_read_free(a) != ARCHIVE_OK) + if (archive_read_close(a) != ARCHIVE_OK) bsdcat_print_error(); + archive_read_free(a); + a = NULL; } int @@ -135,15 +143,14 @@ main(int argc, char **argv) if (*bsdcat->argv == NULL) { bsdcat_current_path = "<stdin>"; bsdcat_read_to_stdout(NULL); - } else + } else { while (*bsdcat->argv) { bsdcat_current_path = *bsdcat->argv++; bsdcat_read_to_stdout(bsdcat_current_path); bsdcat_next(); } - - if (a != NULL) - archive_read_free(a); + archive_read_free(a); /* Help valgrind & friends */ + } exit(exit_status); } Copied: user/markj/netdump/contrib/libarchive/cat/test/test_stdin.c (from r328557, head/contrib/libarchive/cat/test/test_stdin.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/markj/netdump/contrib/libarchive/cat/test/test_stdin.c Mon Jan 29 18:49:28 2018 (r328558, copy of r328557, head/contrib/libarchive/cat/test/test_stdin.c) @@ -0,0 +1,42 @@ +/*- + * Copyright (c) 2017 Sean Purcell + * 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 AUTHOR(S) ``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 AUTHOR(S) 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 "test.h" + +#if !defined(_WIN32) || defined(__CYGWIN__) +#define DEV_NULL "/dev/null" +#else +#define DEV_NULL "NUL" +#endif + +DEFINE_TEST(test_stdin) +{ + int f; + + f = systemf("%s <%s >test.out 2>test.err", testprog, DEV_NULL); + assertEqualInt(0, f); + assertEmptyFile("test.out"); + assertEmptyFile("test.err"); +} + Modified: user/markj/netdump/contrib/libarchive/libarchive/archive_acl.c ============================================================================== --- user/markj/netdump/contrib/libarchive/libarchive/archive_acl.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/libarchive/libarchive/archive_acl.c Mon Jan 29 18:49:28 2018 (r328558) @@ -1159,6 +1159,7 @@ archive_acl_from_text_w(struct archive_acl *acl, const switch (want_type) { case ARCHIVE_ENTRY_ACL_TYPE_POSIX1E: want_type = ARCHIVE_ENTRY_ACL_TYPE_ACCESS; + __LA_FALLTHROUGH; case ARCHIVE_ENTRY_ACL_TYPE_ACCESS: case ARCHIVE_ENTRY_ACL_TYPE_DEFAULT: numfields = 5; @@ -1626,6 +1627,7 @@ archive_acl_from_text_l(struct archive_acl *acl, const switch (want_type) { case ARCHIVE_ENTRY_ACL_TYPE_POSIX1E: want_type = ARCHIVE_ENTRY_ACL_TYPE_ACCESS; + __LA_FALLTHROUGH; case ARCHIVE_ENTRY_ACL_TYPE_ACCESS: case ARCHIVE_ENTRY_ACL_TYPE_DEFAULT: numfields = 5; Modified: user/markj/netdump/contrib/libarchive/libarchive/archive_disk_acl_freebsd.c ============================================================================== --- user/markj/netdump/contrib/libarchive/libarchive/archive_disk_acl_freebsd.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/libarchive/libarchive/archive_disk_acl_freebsd.c Mon Jan 29 18:49:28 2018 (r328558) @@ -93,7 +93,9 @@ static const acl_perm_map_t acl_nfs4_flag_map[] = { {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY}, {ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS, ACL_ENTRY_SUCCESSFUL_ACCESS}, {ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS, ACL_ENTRY_FAILED_ACCESS}, +#ifdef ACL_ENTRY_INHERITED {ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, ACL_ENTRY_INHERITED} +#endif }; static const int acl_nfs4_flag_map_size = Modified: user/markj/netdump/contrib/libarchive/libarchive/archive_match.c ============================================================================== --- user/markj/netdump/contrib/libarchive/libarchive/archive_match.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/libarchive/libarchive/archive_match.c Mon Jan 29 18:49:28 2018 (r328558) @@ -1582,7 +1582,7 @@ time_excluded(struct archive_match *a, struct archive_ */ int -archive_match_include_uid(struct archive *_a, int64_t uid) +archive_match_include_uid(struct archive *_a, la_int64_t uid) { struct archive_match *a; @@ -1593,7 +1593,7 @@ archive_match_include_uid(struct archive *_a, int64_t } int -archive_match_include_gid(struct archive *_a, int64_t gid) +archive_match_include_gid(struct archive *_a, la_int64_t gid) { struct archive_match *a; Modified: user/markj/netdump/contrib/libarchive/libarchive/archive_platform.h ============================================================================== --- user/markj/netdump/contrib/libarchive/libarchive/archive_platform.h Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/libarchive/libarchive/archive_platform.h Mon Jan 29 18:49:28 2018 (r328558) @@ -191,4 +191,10 @@ #define ARCHIVE_ERRNO_MISC (-1) #endif +#if defined(__GNUC__) && (__GNUC__ >= 7) +#define __LA_FALLTHROUGH __attribute__((fallthrough)) +#else +#define __LA_FALLTHROUGH +#endif + #endif /* !ARCHIVE_PLATFORM_H_INCLUDED */ Modified: user/markj/netdump/contrib/libarchive/libarchive/archive_ppmd7.c ============================================================================== --- user/markj/netdump/contrib/libarchive/libarchive/archive_ppmd7.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/libarchive/libarchive/archive_ppmd7.c Mon Jan 29 18:49:28 2018 (r328558) @@ -115,14 +115,14 @@ static void Ppmd7_Construct(CPpmd7 *p) memset(p->HB2Flag + 0x40, 8, 0x100 - 0x40); } -static void Ppmd7_Free(CPpmd7 *p, ISzAlloc *alloc) +static void Ppmd7_Free(CPpmd7 *p) { - alloc->Free(alloc, p->Base); + free(p->Base); p->Size = 0; p->Base = 0; } -static Bool Ppmd7_Alloc(CPpmd7 *p, UInt32 size, ISzAlloc *alloc) +static Bool Ppmd7_Alloc(CPpmd7 *p, UInt32 size) { if (p->Base == 0 || p->Size != size) { @@ -131,14 +131,14 @@ static Bool Ppmd7_Alloc(CPpmd7 *p, UInt32 size, ISzAll if (size < UNIT_SIZE) { return False; } - Ppmd7_Free(p, alloc); + Ppmd7_Free(p); p->AlignOffset = #ifdef PPMD_32BIT (4 - size) & 3; #else 4 - (size & 3); #endif - if ((p->Base = (Byte *)alloc->Alloc(alloc, p->AlignOffset + size + if ((p->Base = (Byte *)malloc(p->AlignOffset + size #ifndef PPMD_32BIT + UNIT_SIZE #endif Modified: user/markj/netdump/contrib/libarchive/libarchive/archive_ppmd7_private.h ============================================================================== --- user/markj/netdump/contrib/libarchive/libarchive/archive_ppmd7_private.h Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/libarchive/libarchive/archive_ppmd7_private.h Mon Jan 29 18:49:28 2018 (r328558) @@ -95,8 +95,8 @@ typedef struct { /* Base Functions */ void (*Ppmd7_Construct)(CPpmd7 *p); - Bool (*Ppmd7_Alloc)(CPpmd7 *p, UInt32 size, ISzAlloc *alloc); - void (*Ppmd7_Free)(CPpmd7 *p, ISzAlloc *alloc); + Bool (*Ppmd7_Alloc)(CPpmd7 *p, UInt32 size); + void (*Ppmd7_Free)(CPpmd7 *p); void (*Ppmd7_Init)(CPpmd7 *p, unsigned maxOrder); #define Ppmd7_WasAllocated(p) ((p)->Base != NULL) Modified: user/markj/netdump/contrib/libarchive/libarchive/archive_ppmd_private.h ============================================================================== --- user/markj/netdump/contrib/libarchive/libarchive/archive_ppmd_private.h Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/libarchive/libarchive/archive_ppmd_private.h Mon Jan 29 18:49:28 2018 (r328558) @@ -69,13 +69,6 @@ typedef struct void (*Write)(void *p, Byte b); } IByteOut; - -typedef struct -{ - void *(*Alloc)(void *p, size_t size); - void (*Free)(void *p, void *address); /* address can be 0 */ -} ISzAlloc; - /*** End defined in Types.h ***/ /*** Begin defined in CpuArch.h ***/ Modified: user/markj/netdump/contrib/libarchive/libarchive/archive_read.c ============================================================================== --- user/markj/netdump/contrib/libarchive/libarchive/archive_read.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/libarchive/libarchive/archive_read.c Mon Jan 29 18:49:28 2018 (r328558) @@ -120,7 +120,8 @@ archive_read_new(void) * Record the do-not-extract-to file. This belongs in archive_read_extract.c. */ void -archive_read_extract_set_skip_file(struct archive *_a, int64_t d, int64_t i) +archive_read_extract_set_skip_file(struct archive *_a, la_int64_t d, + la_int64_t i) { struct archive_read *a = (struct archive_read *)_a; @@ -747,7 +748,7 @@ choose_format(struct archive_read *a) * Return the file offset (within the uncompressed data stream) where * the last header started. */ -int64_t +la_int64_t archive_read_header_position(struct archive *_a) { struct archive_read *a = (struct archive_read *)_a; @@ -943,7 +944,7 @@ archive_read_data_skip(struct archive *_a) return (r); } -int64_t +la_int64_t archive_seek_data(struct archive *_a, int64_t offset, int whence) { struct archive_read *a = (struct archive_read *)_a; @@ -1626,7 +1627,8 @@ __archive_read_filter_seek(struct archive_read_filter switch (whence) { case SEEK_CUR: /* Adjust the offset and use SEEK_SET instead */ - offset += filter->position; + offset += filter->position; + __LA_FALLTHROUGH; case SEEK_SET: cursor = 0; while (1) Modified: user/markj/netdump/contrib/libarchive/libarchive/archive_read_disk_posix.c ============================================================================== --- user/markj/netdump/contrib/libarchive/libarchive/archive_read_disk_posix.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/libarchive/libarchive/archive_read_disk_posix.c Mon Jan 29 18:49:28 2018 (r328558) @@ -387,7 +387,7 @@ archive_read_disk_vtable(void) } const char * -archive_read_disk_gname(struct archive *_a, int64_t gid) +archive_read_disk_gname(struct archive *_a, la_int64_t gid) { struct archive_read_disk *a = (struct archive_read_disk *)_a; if (ARCHIVE_OK != __archive_check_magic(_a, ARCHIVE_READ_DISK_MAGIC, @@ -399,7 +399,7 @@ archive_read_disk_gname(struct archive *_a, int64_t gi } const char * -archive_read_disk_uname(struct archive *_a, int64_t uid) +archive_read_disk_uname(struct archive *_a, la_int64_t uid) { struct archive_read_disk *a = (struct archive_read_disk *)_a; if (ARCHIVE_OK != __archive_check_magic(_a, ARCHIVE_READ_DISK_MAGIC, @@ -413,7 +413,7 @@ archive_read_disk_uname(struct archive *_a, int64_t ui int archive_read_disk_set_gname_lookup(struct archive *_a, void *private_data, - const char * (*lookup_gname)(void *private, int64_t gid), + const char * (*lookup_gname)(void *private, la_int64_t gid), void (*cleanup_gname)(void *private)) { struct archive_read_disk *a = (struct archive_read_disk *)_a; @@ -432,7 +432,7 @@ archive_read_disk_set_gname_lookup(struct archive *_a, int archive_read_disk_set_uname_lookup(struct archive *_a, void *private_data, - const char * (*lookup_uname)(void *private, int64_t uid), + const char * (*lookup_uname)(void *private, la_int64_t uid), void (*cleanup_uname)(void *private)) { struct archive_read_disk *a = (struct archive_read_disk *)_a; Modified: user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_7zip.c ============================================================================== --- user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_7zip.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_7zip.c Mon Jan 29 18:49:28 2018 (r328558) @@ -975,18 +975,6 @@ decode_codec_id(const unsigned char *codecId, size_t i return (id); } -static void * -ppmd_alloc(void *p, size_t size) -{ - (void)p; - return malloc(size); -} -static void -ppmd_free(void *p, void *address) -{ - (void)p; - free(address); -} static Byte ppmd_read(void *p) { @@ -1006,8 +994,6 @@ ppmd_read(void *p) return (b); } -static ISzAlloc g_szalloc = { ppmd_alloc, ppmd_free }; - static int init_decompression(struct archive_read *a, struct _7zip *zip, const struct _7z_coder *coder1, const struct _7z_coder *coder2) @@ -1237,7 +1223,7 @@ init_decompression(struct archive_read *a, struct _7zi if (zip->ppmd7_valid) { __archive_ppmd7_functions.Ppmd7_Free( - &zip->ppmd7_context, &g_szalloc); + &zip->ppmd7_context); zip->ppmd7_valid = 0; } @@ -1256,7 +1242,7 @@ init_decompression(struct archive_read *a, struct _7zi } __archive_ppmd7_functions.Ppmd7_Construct(&zip->ppmd7_context); r = __archive_ppmd7_functions.Ppmd7_Alloc( - &zip->ppmd7_context, msize, &g_szalloc); + &zip->ppmd7_context, msize); if (r == 0) { archive_set_error(&a->archive, ENOMEM, "Coludn't allocate memory for PPMd"); @@ -1636,7 +1622,7 @@ free_decompression(struct archive_read *a, struct _7zi #endif if (zip->ppmd7_valid) { __archive_ppmd7_functions.Ppmd7_Free( - &zip->ppmd7_context, &g_szalloc); + &zip->ppmd7_context); zip->ppmd7_valid = 0; } return (r); @@ -2569,6 +2555,7 @@ read_Header(struct archive_read *a, struct _7z_header_ case kDummy: if (ll == 0) break; + __LA_FALLTHROUGH; default: if (header_bytes(a, ll) == NULL) return (-1); Modified: user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_mtree.c ============================================================================== --- user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_mtree.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_mtree.c Mon Jan 29 18:49:28 2018 (r328558) @@ -1499,6 +1499,7 @@ parse_keyword(struct archive_read *a, struct mtree *mt } if (strcmp(key, "cksum") == 0) break; + __LA_FALLTHROUGH; case 'd': if (strcmp(key, "device") == 0) { /* stat(2) st_rdev field, e.g. the major/minor IDs @@ -1512,12 +1513,14 @@ parse_keyword(struct archive_read *a, struct mtree *mt archive_entry_set_rdev(entry, dev); return r; } + __LA_FALLTHROUGH; case 'f': if (strcmp(key, "flags") == 0) { *parsed_kws |= MTREE_HAS_FFLAGS; archive_entry_copy_fflags_text(entry, val); break; } + __LA_FALLTHROUGH; case 'g': if (strcmp(key, "gid") == 0) { *parsed_kws |= MTREE_HAS_GID; @@ -1529,16 +1532,19 @@ parse_keyword(struct archive_read *a, struct mtree *mt archive_entry_copy_gname(entry, val); break; } + __LA_FALLTHROUGH; case 'i': if (strcmp(key, "inode") == 0) { archive_entry_set_ino(entry, mtree_atol(&val, 10)); break; } + __LA_FALLTHROUGH; case 'l': if (strcmp(key, "link") == 0) { archive_entry_copy_symlink(entry, val); break; } + __LA_FALLTHROUGH; case 'm': if (strcmp(key, "md5") == 0 || strcmp(key, "md5digest") == 0) break; @@ -1555,6 +1561,7 @@ parse_keyword(struct archive_read *a, struct mtree *mt } break; } + __LA_FALLTHROUGH; case 'n': if (strcmp(key, "nlink") == 0) { *parsed_kws |= MTREE_HAS_NLINK; @@ -1562,6 +1569,7 @@ parse_keyword(struct archive_read *a, struct mtree *mt (unsigned int)mtree_atol(&val, 10)); break; } + __LA_FALLTHROUGH; case 'r': if (strcmp(key, "resdevice") == 0) { /* stat(2) st_dev field, e.g. the device ID where the @@ -1577,6 +1585,7 @@ parse_keyword(struct archive_read *a, struct mtree *mt if (strcmp(key, "rmd160") == 0 || strcmp(key, "rmd160digest") == 0) break; + __LA_FALLTHROUGH; case 's': if (strcmp(key, "sha1") == 0 || strcmp(key, "sha1digest") == 0) break; @@ -1593,6 +1602,7 @@ parse_keyword(struct archive_read *a, struct mtree *mt archive_entry_set_size(entry, mtree_atol(&val, 10)); break; } + __LA_FALLTHROUGH; case 't': if (strcmp(key, "tags") == 0) { /* @@ -1635,18 +1645,21 @@ parse_keyword(struct archive_read *a, struct mtree *mt archive_entry_set_filetype(entry, AE_IFBLK); break; } + __LA_FALLTHROUGH; case 'c': if (strcmp(val, "char") == 0) { archive_entry_set_filetype(entry, AE_IFCHR); break; } + __LA_FALLTHROUGH; case 'd': if (strcmp(val, "dir") == 0) { archive_entry_set_filetype(entry, AE_IFDIR); break; } + __LA_FALLTHROUGH; case 'f': if (strcmp(val, "fifo") == 0) { archive_entry_set_filetype(entry, @@ -1658,12 +1671,14 @@ parse_keyword(struct archive_read *a, struct mtree *mt AE_IFREG); break; } + __LA_FALLTHROUGH; case 'l': if (strcmp(val, "link") == 0) { archive_entry_set_filetype(entry, AE_IFLNK); break; } + __LA_FALLTHROUGH; default: archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, @@ -1675,6 +1690,7 @@ parse_keyword(struct archive_read *a, struct mtree *mt *parsed_kws |= MTREE_HAS_TYPE; break; } + __LA_FALLTHROUGH; case 'u': if (strcmp(key, "uid") == 0) { *parsed_kws |= MTREE_HAS_UID; @@ -1686,6 +1702,7 @@ parse_keyword(struct archive_read *a, struct mtree *mt archive_entry_copy_uname(entry, val); break; } + __LA_FALLTHROUGH; default: archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, "Unrecognized key %s=%s", key, val); Modified: user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_rar.c ============================================================================== --- user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_rar.c Mon Jan 29 18:21:50 2018 (r328557) +++ user/markj/netdump/contrib/libarchive/libarchive/archive_read_support_format_rar.c Mon Jan 29 18:49:28 2018 (r328558) @@ -604,20 +604,6 @@ lzss_emit_match(struct rar *rar, int offset, int lengt rar->lzss.position += length; } -static void * -ppmd_alloc(void *p, size_t size) -{ - (void)p; - return malloc(size); -} -static void -ppmd_free(void *p, void *address) -{ - (void)p; - free(address); -} -static ISzAlloc g_szalloc = { ppmd_alloc, ppmd_free }; - static Byte ppmd_read(void *p) { @@ -1038,7 +1024,7 @@ archive_read_format_rar_read_data(struct archive_read case COMPRESS_METHOD_BEST: ret = read_data_compressed(a, buff, size, offset); if (ret != ARCHIVE_OK && ret != ARCHIVE_WARN) - __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context, &g_szalloc); + __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context); break; default: @@ -1253,7 +1239,7 @@ archive_read_format_rar_cleanup(struct archive_read *a free(rar->dbo); free(rar->unp_buffer); free(rar->lzss.window); - __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context, &g_szalloc); + __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context); free(rar); (a->format->data) = NULL; return (ARCHIVE_OK); @@ -1658,7 +1644,7 @@ read_header(struct archive_read *a, struct archive_ent rar->unp_offset = 0; rar->unp_buffer_size = UNP_BUFFER_SIZE; memset(rar->lengthtable, 0, sizeof(rar->lengthtable)); - __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context, &g_szalloc); + __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context); rar->ppmd_valid = rar->ppmd_eod = 0; /* Don't set any archive entries for non-file header types */ @@ -2122,7 +2108,7 @@ parse_codes(struct archive_read *a) /* Make sure ppmd7_contest is freed before Ppmd7_Construct * because reading a broken file cause this abnormal sequence. */ - __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context, &g_szalloc); + __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context); rar->bytein.a = a; rar->bytein.Read = &ppmd_read; @@ -2137,7 +2123,7 @@ parse_codes(struct archive_read *a) } if (!__archive_ppmd7_functions.Ppmd7_Alloc(&rar->ppmd7_context, - rar->dictionary_size, &g_szalloc)) + rar->dictionary_size)) { archive_set_error(&a->archive, ENOMEM, "Out of memory"); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801291849.w0TInTmH012797>