Date: Tue, 11 Nov 2014 19:02:32 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274392 - in projects/sendfile: . bin/df bin/sh bin/sh/tests/expansion bin/sh/tests/parameters cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris... Message-ID: <201411111902.sABJ2W9I053001@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Tue Nov 11 19:02:30 2014 New Revision: 274392 URL: https://svnweb.freebsd.org/changeset/base/274392 Log: Merge head r258543 through r274390. Added: projects/sendfile/bin/sh/tests/expansion/redir1.0 - copied unchanged from r274390, head/bin/sh/tests/expansion/redir1.0 projects/sendfile/bin/sh/tests/parameters/positional6.0 - copied unchanged from r274390, head/bin/sh/tests/parameters/positional6.0 projects/sendfile/bin/sh/tests/parameters/positional7.0 - copied unchanged from r274390, head/bin/sh/tests/parameters/positional7.0 projects/sendfile/contrib/atf/atf-c++/atf-c++.3 - copied unchanged from r274390, head/contrib/atf/atf-c++/atf-c++.3 projects/sendfile/contrib/atf/atf-c/atf-c.3 - copied unchanged from r274390, head/contrib/atf/atf-c/atf-c.3 projects/sendfile/contrib/atf/atf-sh/atf-sh.3 - copied unchanged from r274390, head/contrib/atf/atf-sh/atf-sh.3 projects/sendfile/contrib/atf/config.h - copied unchanged from r274390, head/contrib/atf/config.h projects/sendfile/contrib/atf/doc/atf.7.in - copied unchanged from r274390, head/contrib/atf/doc/atf.7.in projects/sendfile/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff - copied unchanged from r274390, head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff projects/sendfile/contrib/ofed/libcxgb4/ - copied from r274390, head/contrib/ofed/libcxgb4/ projects/sendfile/contrib/ofed/librdmacm/examples/build/ - copied from r274390, head/contrib/ofed/librdmacm/examples/build/ projects/sendfile/contrib/ofed/usr.lib/libcxgb4/ - copied from r274390, head/contrib/ofed/usr.lib/libcxgb4/ projects/sendfile/contrib/telnet/telnet/baud.h - copied unchanged from r274390, head/contrib/telnet/telnet/baud.h projects/sendfile/etc/rc.d/growfs - copied unchanged from r274390, head/etc/rc.d/growfs projects/sendfile/lib/libarchive/libarchive.pc - copied unchanged from r274390, head/lib/libarchive/libarchive.pc projects/sendfile/lib/libc/Makefile.amd64 - copied unchanged from r274390, head/lib/libc/Makefile.amd64 projects/sendfile/lib/libc/Makefile.i386 - copied unchanged from r274390, head/lib/libc/Makefile.i386 projects/sendfile/lib/libc/tests/ - copied from r274390, head/lib/libc/tests/ projects/sendfile/lib/libdpv/ - copied from r274390, head/lib/libdpv/ projects/sendfile/lib/libfigpar/ - copied from r274390, head/lib/libfigpar/ projects/sendfile/lib/libnetbsd/sys/time.h - copied unchanged from r274390, head/lib/libnetbsd/sys/time.h projects/sendfile/lib/libpam/libpam/tests/ - copied from r274390, head/lib/libpam/libpam/tests/ projects/sendfile/share/doc/pjdfstest/ - copied from r274390, head/share/doc/pjdfstest/ projects/sendfile/share/man/man4/me.4 - copied unchanged from r274390, head/share/man/man4/me.4 projects/sendfile/share/man/man7/growfs.7 - copied unchanged from r274390, head/share/man/man7/growfs.7 projects/sendfile/share/man/man9/casuword.9 - copied unchanged from r274390, head/share/man/man9/casuword.9 projects/sendfile/share/mk/netbsd-tests.test.mk - copied unchanged from r274390, head/share/mk/netbsd-tests.test.mk projects/sendfile/sys/boot/fdt/fdt_platform.h - copied unchanged from r274390, head/sys/boot/fdt/fdt_platform.h projects/sendfile/sys/boot/uboot/fdt/ - copied from r274390, head/sys/boot/uboot/fdt/ projects/sendfile/sys/compat/svr4/README - copied unchanged from r274390, head/sys/compat/svr4/README projects/sendfile/sys/compat/svr4/TO-DO - copied unchanged from r274390, head/sys/compat/svr4/TO-DO projects/sendfile/sys/dev/ixl/ixlv_vc_mgr.h - copied unchanged from r274390, head/sys/dev/ixl/ixlv_vc_mgr.h projects/sendfile/sys/dev/random/build.sh - copied unchanged from r274390, head/sys/dev/random/build.sh projects/sendfile/sys/dev/random/fortuna.c - copied unchanged from r274390, head/sys/dev/random/fortuna.c projects/sendfile/sys/dev/random/fortuna.h - copied unchanged from r274390, head/sys/dev/random/fortuna.h projects/sendfile/sys/dev/random/uint128.h - copied unchanged from r274390, head/sys/dev/random/uint128.h projects/sendfile/sys/dev/random/unit_test.c - copied unchanged from r274390, head/sys/dev/random/unit_test.c projects/sendfile/sys/dev/random/unit_test.h - copied unchanged from r274390, head/sys/dev/random/unit_test.h projects/sendfile/sys/modules/if_me/ - copied from r274390, head/sys/modules/if_me/ projects/sendfile/sys/modules/padlock_rng/ - copied from r274390, head/sys/modules/padlock_rng/ projects/sendfile/sys/modules/rdrand_rng/ - copied from r274390, head/sys/modules/rdrand_rng/ projects/sendfile/sys/net/if_me.c - copied unchanged from r274390, head/sys/net/if_me.c projects/sendfile/sys/netinet6/ip6_gre.c - copied unchanged from r274390, head/sys/netinet6/ip6_gre.c projects/sendfile/sys/x86/include/vmware.h - copied unchanged from r274390, head/sys/x86/include/vmware.h projects/sendfile/tests/sys/pjdfstest/ - copied from r274390, head/tests/sys/pjdfstest/ projects/sendfile/tools/build/check-links.sh - copied unchanged from r274390, head/tools/build/check-links.sh projects/sendfile/usr.bin/dpv/ - copied from r274390, head/usr.bin/dpv/ Deleted: projects/sendfile/contrib/atf/atf-c++/config.cpp projects/sendfile/contrib/atf/atf-c++/config.hpp projects/sendfile/contrib/atf/atf-c++/config_test.cpp projects/sendfile/contrib/atf/atf-c++/detail/sanity_test.cpp projects/sendfile/contrib/atf/atf-c/config.c projects/sendfile/contrib/atf/atf-c/config.h projects/sendfile/contrib/atf/atf-c/config_test.c projects/sendfile/contrib/atf/bconfig.h projects/sendfile/etc/rc.d/faith projects/sendfile/etc/rc.d/initrandom projects/sendfile/etc/rc.d/postrandom projects/sendfile/share/man/man4/faith.4 projects/sendfile/sys/dev/random/harvest.c projects/sendfile/sys/dev/random/rwfile.c projects/sendfile/sys/dev/random/rwfile.h projects/sendfile/sys/modules/if_faith/ projects/sendfile/sys/modules/svr4/README projects/sendfile/sys/modules/svr4/TO-DO projects/sendfile/sys/net/if_faith.c projects/sendfile/sys/netinet/ip_gre.h projects/sendfile/tests/lib/ projects/sendfile/usr.sbin/faithd/ Modified: projects/sendfile/MAINTAINERS (contents, props changed) projects/sendfile/Makefile.inc1 projects/sendfile/ObsoleteFiles.inc projects/sendfile/UPDATING projects/sendfile/bin/df/Makefile projects/sendfile/bin/df/df.1 projects/sendfile/bin/df/df.c projects/sendfile/bin/sh/expand.c projects/sendfile/bin/sh/sh.1 projects/sendfile/bin/sh/tests/expansion/Makefile projects/sendfile/bin/sh/tests/parameters/Makefile projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/sendfile/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c projects/sendfile/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c projects/sendfile/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/sendfile/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h projects/sendfile/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c projects/sendfile/contrib/atf/FREEBSD-Xlist projects/sendfile/contrib/atf/NEWS projects/sendfile/contrib/atf/atf-c++.hpp projects/sendfile/contrib/atf/atf-c++/Kyuafile projects/sendfile/contrib/atf/atf-c++/atf_c++_test.cpp projects/sendfile/contrib/atf/atf-c++/build.cpp projects/sendfile/contrib/atf/atf-c++/build.hpp projects/sendfile/contrib/atf/atf-c++/build_test.cpp projects/sendfile/contrib/atf/atf-c++/check.cpp projects/sendfile/contrib/atf/atf-c++/check.hpp projects/sendfile/contrib/atf/atf-c++/check_test.cpp projects/sendfile/contrib/atf/atf-c++/detail/Kyuafile projects/sendfile/contrib/atf/atf-c++/detail/application.cpp projects/sendfile/contrib/atf/atf-c++/detail/application.hpp projects/sendfile/contrib/atf/atf-c++/detail/application_test.cpp projects/sendfile/contrib/atf/atf-c++/detail/auto_array.hpp projects/sendfile/contrib/atf/atf-c++/detail/auto_array_test.cpp projects/sendfile/contrib/atf/atf-c++/detail/env.cpp projects/sendfile/contrib/atf/atf-c++/detail/env.hpp projects/sendfile/contrib/atf/atf-c++/detail/env_test.cpp projects/sendfile/contrib/atf/atf-c++/detail/exceptions.cpp projects/sendfile/contrib/atf/atf-c++/detail/exceptions.hpp projects/sendfile/contrib/atf/atf-c++/detail/exceptions_test.cpp projects/sendfile/contrib/atf/atf-c++/detail/fs.cpp projects/sendfile/contrib/atf/atf-c++/detail/fs.hpp projects/sendfile/contrib/atf/atf-c++/detail/fs_test.cpp projects/sendfile/contrib/atf/atf-c++/detail/process.cpp projects/sendfile/contrib/atf/atf-c++/detail/process.hpp projects/sendfile/contrib/atf/atf-c++/detail/process_test.cpp projects/sendfile/contrib/atf/atf-c++/detail/sanity.hpp projects/sendfile/contrib/atf/atf-c++/detail/test_helpers.cpp projects/sendfile/contrib/atf/atf-c++/detail/test_helpers.hpp projects/sendfile/contrib/atf/atf-c++/detail/text.cpp projects/sendfile/contrib/atf/atf-c++/detail/text.hpp projects/sendfile/contrib/atf/atf-c++/detail/text_test.cpp projects/sendfile/contrib/atf/atf-c++/detail/version_helper.cpp projects/sendfile/contrib/atf/atf-c++/macros.hpp projects/sendfile/contrib/atf/atf-c++/macros_hpp_test.cpp projects/sendfile/contrib/atf/atf-c++/macros_test.cpp projects/sendfile/contrib/atf/atf-c++/pkg_config_test.sh projects/sendfile/contrib/atf/atf-c++/tests.cpp projects/sendfile/contrib/atf/atf-c++/tests.hpp projects/sendfile/contrib/atf/atf-c++/tests_test.cpp projects/sendfile/contrib/atf/atf-c++/unused_test.cpp projects/sendfile/contrib/atf/atf-c++/utils.cpp projects/sendfile/contrib/atf/atf-c++/utils.hpp projects/sendfile/contrib/atf/atf-c++/utils_test.cpp projects/sendfile/contrib/atf/atf-c.h projects/sendfile/contrib/atf/atf-c/Kyuafile projects/sendfile/contrib/atf/atf-c/atf_c_test.c projects/sendfile/contrib/atf/atf-c/build.c projects/sendfile/contrib/atf/atf-c/build.h projects/sendfile/contrib/atf/atf-c/build_test.c projects/sendfile/contrib/atf/atf-c/check.c projects/sendfile/contrib/atf/atf-c/check.h projects/sendfile/contrib/atf/atf-c/check_test.c projects/sendfile/contrib/atf/atf-c/defs.h.in projects/sendfile/contrib/atf/atf-c/detail/dynstr.c projects/sendfile/contrib/atf/atf-c/detail/dynstr.h projects/sendfile/contrib/atf/atf-c/detail/dynstr_test.c projects/sendfile/contrib/atf/atf-c/detail/env.c projects/sendfile/contrib/atf/atf-c/detail/env.h projects/sendfile/contrib/atf/atf-c/detail/env_test.c projects/sendfile/contrib/atf/atf-c/detail/fs.c projects/sendfile/contrib/atf/atf-c/detail/fs.h projects/sendfile/contrib/atf/atf-c/detail/fs_test.c projects/sendfile/contrib/atf/atf-c/detail/list.c projects/sendfile/contrib/atf/atf-c/detail/list.h projects/sendfile/contrib/atf/atf-c/detail/list_test.c projects/sendfile/contrib/atf/atf-c/detail/map.c projects/sendfile/contrib/atf/atf-c/detail/map.h projects/sendfile/contrib/atf/atf-c/detail/map_test.c projects/sendfile/contrib/atf/atf-c/detail/process.c projects/sendfile/contrib/atf/atf-c/detail/process.h projects/sendfile/contrib/atf/atf-c/detail/process_helpers.c projects/sendfile/contrib/atf/atf-c/detail/process_test.c projects/sendfile/contrib/atf/atf-c/detail/sanity.c projects/sendfile/contrib/atf/atf-c/detail/sanity.h projects/sendfile/contrib/atf/atf-c/detail/sanity_test.c projects/sendfile/contrib/atf/atf-c/detail/test_helpers.c projects/sendfile/contrib/atf/atf-c/detail/test_helpers.h projects/sendfile/contrib/atf/atf-c/detail/text.c projects/sendfile/contrib/atf/atf-c/detail/text.h projects/sendfile/contrib/atf/atf-c/detail/text_test.c projects/sendfile/contrib/atf/atf-c/detail/tp_main.c projects/sendfile/contrib/atf/atf-c/detail/user.c projects/sendfile/contrib/atf/atf-c/detail/user.h projects/sendfile/contrib/atf/atf-c/detail/user_test.c projects/sendfile/contrib/atf/atf-c/detail/version_helper.c projects/sendfile/contrib/atf/atf-c/error.c projects/sendfile/contrib/atf/atf-c/error.h projects/sendfile/contrib/atf/atf-c/error_fwd.h projects/sendfile/contrib/atf/atf-c/error_test.c projects/sendfile/contrib/atf/atf-c/h_build.h projects/sendfile/contrib/atf/atf-c/macros.h projects/sendfile/contrib/atf/atf-c/macros_h_test.c projects/sendfile/contrib/atf/atf-c/macros_test.c projects/sendfile/contrib/atf/atf-c/pkg_config_test.sh projects/sendfile/contrib/atf/atf-c/tc.c projects/sendfile/contrib/atf/atf-c/tc.h projects/sendfile/contrib/atf/atf-c/tc_test.c projects/sendfile/contrib/atf/atf-c/tp.c projects/sendfile/contrib/atf/atf-c/tp.h projects/sendfile/contrib/atf/atf-c/tp_test.c projects/sendfile/contrib/atf/atf-c/unused_test.c projects/sendfile/contrib/atf/atf-c/utils.c projects/sendfile/contrib/atf/atf-c/utils.h projects/sendfile/contrib/atf/atf-c/utils_test.c projects/sendfile/contrib/atf/atf-sh/atf-check.1 projects/sendfile/contrib/atf/atf-sh/atf-check.cpp projects/sendfile/contrib/atf/atf-sh/atf-check_test.sh projects/sendfile/contrib/atf/atf-sh/atf-sh.1 projects/sendfile/contrib/atf/atf-sh/atf-sh.cpp projects/sendfile/contrib/atf/atf-sh/atf_check_test.sh projects/sendfile/contrib/atf/atf-sh/config_test.sh projects/sendfile/contrib/atf/atf-sh/integration_test.sh projects/sendfile/contrib/atf/atf-sh/libatf-sh.subr projects/sendfile/contrib/atf/atf-sh/misc_helpers.sh projects/sendfile/contrib/atf/atf-sh/normalize_test.sh projects/sendfile/contrib/atf/atf-sh/tc_test.sh projects/sendfile/contrib/atf/atf-sh/tp_test.sh projects/sendfile/contrib/atf/doc/atf-test-case.4 projects/sendfile/contrib/atf/doc/atf-test-program.1 projects/sendfile/contrib/atf/test-programs/c_helpers.c projects/sendfile/contrib/atf/test-programs/common.sh projects/sendfile/contrib/atf/test-programs/config_test.sh projects/sendfile/contrib/atf/test-programs/cpp_helpers.cpp projects/sendfile/contrib/atf/test-programs/expect_test.sh projects/sendfile/contrib/atf/test-programs/meta_data_test.sh projects/sendfile/contrib/atf/test-programs/result_test.sh projects/sendfile/contrib/atf/test-programs/sh_helpers.sh projects/sendfile/contrib/atf/test-programs/srcdir_test.sh projects/sendfile/contrib/hyperv/tools/hv_kvp_daemon.c projects/sendfile/contrib/llvm/lib/MC/MCParser/AsmParser.cpp projects/sendfile/contrib/mtree/create.c projects/sendfile/contrib/mtree/extern.h projects/sendfile/contrib/mtree/getid.c projects/sendfile/contrib/mtree/mtree.c projects/sendfile/contrib/mtree/spec.c projects/sendfile/contrib/netbsd-tests/include/t_paths.c projects/sendfile/contrib/netbsd-tests/lib/libc/db/t_db.sh projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_floatunditf.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_isnan.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_sethostname.c projects/sendfile/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c projects/sendfile/contrib/netbsd-tests/lib/libc/hash/h_hash.c projects/sendfile/contrib/netbsd-tests/lib/libc/hash/t_sha2.c projects/sendfile/contrib/netbsd-tests/lib/libc/inet/t_inet_network.c projects/sendfile/contrib/netbsd-tests/lib/libc/locale/t_io.c projects/sendfile/contrib/netbsd-tests/lib/libc/net/h_dns_server.c projects/sendfile/contrib/netbsd-tests/lib/libc/net/t_ether_aton.c projects/sendfile/contrib/netbsd-tests/lib/libc/net/t_servent.sh projects/sendfile/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c projects/sendfile/contrib/netbsd-tests/lib/libc/ssp/h_memset.c projects/sendfile/contrib/netbsd-tests/lib/libc/ssp/h_read.c projects/sendfile/contrib/netbsd-tests/lib/libc/ssp/h_readlink.c projects/sendfile/contrib/netbsd-tests/lib/libc/ssp/h_snprintf.c projects/sendfile/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh projects/sendfile/contrib/netbsd-tests/lib/libc/stdio/t_fflush.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdio/t_fmemopen.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdio/t_printf.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdio/t_scanf.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/h_atexit.c projects/sendfile/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_dup.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getitimer.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_kevent.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_mincore.c projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_sigaction.c projects/sendfile/contrib/netbsd-tests/lib/libc/time/t_mktime.c projects/sendfile/contrib/netbsd-tests/lib/libexecinfo/t_backtrace.c projects/sendfile/contrib/netbsd-tests/lib/libm/t_ldexp.c projects/sendfile/contrib/netbsd-tests/lib/libm/t_log.c projects/sendfile/contrib/netbsd-tests/lib/libm/t_precision.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_mutex.c projects/sendfile/contrib/netbsd-tests/lib/libpthread/t_sem.c projects/sendfile/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh projects/sendfile/contrib/ofed/librdmacm/examples/rping.c projects/sendfile/contrib/ofed/usr.lib/Makefile projects/sendfile/contrib/ofed/usr.lib/Makefile.inc projects/sendfile/contrib/openpam/t/t_openpam_ctype.c projects/sendfile/contrib/openpam/t/t_openpam_readlinev.c projects/sendfile/contrib/openpam/t/t_openpam_readword.c projects/sendfile/contrib/telnet/arpa/telnet.h projects/sendfile/contrib/telnet/telnet/commands.c projects/sendfile/contrib/telnet/telnet/externs.h projects/sendfile/contrib/telnet/telnet/main.c projects/sendfile/contrib/telnet/telnet/sys_bsd.c projects/sendfile/contrib/telnet/telnet/telnet.1 projects/sendfile/contrib/telnet/telnet/telnet.c projects/sendfile/contrib/telnet/telnet/types.h projects/sendfile/contrib/telnet/telnetd/sys_term.c projects/sendfile/contrib/tnftp/src/fetch.c projects/sendfile/etc/defaults/rc.conf projects/sendfile/etc/motd projects/sendfile/etc/mtree/BSD.debug.dist projects/sendfile/etc/mtree/BSD.tests.dist projects/sendfile/etc/network.subr projects/sendfile/etc/periodic/security/Makefile projects/sendfile/etc/rc.d/Makefile projects/sendfile/etc/rc.d/NETWORKING projects/sendfile/etc/rc.d/adjkerntz projects/sendfile/etc/rc.d/bridge projects/sendfile/etc/rc.d/defaultroute projects/sendfile/etc/rc.d/geli projects/sendfile/etc/rc.d/random projects/sendfile/etc/rc.d/routing projects/sendfile/etc/rc.d/syscons projects/sendfile/etc/rc.d/syslogd projects/sendfile/gnu/lib/libdialog/Makefile projects/sendfile/lib/Makefile projects/sendfile/lib/atf/Makefile.inc projects/sendfile/lib/atf/common.mk projects/sendfile/lib/atf/libatf-c++/Makefile projects/sendfile/lib/atf/libatf-c++/tests/Makefile projects/sendfile/lib/atf/libatf-c++/tests/detail/Makefile projects/sendfile/lib/atf/libatf-c/Makefile projects/sendfile/lib/atf/libatf-c/tests/Makefile projects/sendfile/lib/atf/libatf-c/tests/detail/Makefile projects/sendfile/lib/libarchive/Makefile projects/sendfile/lib/libc/Makefile projects/sendfile/lib/libc/net/getaddrinfo.c projects/sendfile/lib/libc/net/getnameinfo.c projects/sendfile/lib/libc/posix1e/acl.3 projects/sendfile/lib/libc/posix1e/acl_add_flag_np.3 projects/sendfile/lib/libc/posix1e/acl_clear_flags_np.3 projects/sendfile/lib/libc/posix1e/acl_delete_flag_np.3 projects/sendfile/lib/libc/posix1e/acl_get_flag_np.3 projects/sendfile/lib/libc/posix1e/acl_get_flagset_np.3 projects/sendfile/lib/libc/posix1e/acl_set_entry_type_np.3 projects/sendfile/lib/libc/posix1e/acl_set_flagset_np.3 projects/sendfile/lib/libc/sys/utrace.2 projects/sendfile/lib/libpam/libpam/Makefile projects/sendfile/lib/libutil/gr_util.c projects/sendfile/lib/libutil/login_class.c projects/sendfile/libexec/atf/atf-check/Makefile projects/sendfile/libexec/atf/atf-sh/Makefile projects/sendfile/libexec/atf/atf-sh/tests/Makefile projects/sendfile/libexec/save-entropy/save-entropy.sh projects/sendfile/libexec/telnetd/Makefile projects/sendfile/release/Makefile projects/sendfile/release/doc/en_US.ISO8859-1/hardware/article.xml projects/sendfile/release/picobsd/bridge/PICOBSD projects/sendfile/release/picobsd/qemu/PICOBSD projects/sendfile/rescue/rescue/Makefile projects/sendfile/sbin/camcontrol/camcontrol.c projects/sendfile/sbin/fsck_msdosfs/boot.c projects/sendfile/sbin/fsck_msdosfs/dosfs.h projects/sendfile/sbin/fsirand/Makefile projects/sendfile/sbin/gbde/gbde.8 projects/sendfile/sbin/gbde/gbde.c projects/sendfile/sbin/ifconfig/ifgre.c projects/sendfile/sbin/mount_nfs/Makefile projects/sendfile/sbin/mount_nfs/mount_nfs.8 projects/sendfile/sbin/mount_nfs/mount_nfs.c projects/sendfile/sbin/route/keywords projects/sendfile/sbin/route/route.8 projects/sendfile/sbin/route/route.c projects/sendfile/share/doc/Makefile projects/sendfile/share/examples/kld/random_adaptor/random_adaptor_example.c (contents, props changed) projects/sendfile/share/man/man4/Makefile projects/sendfile/share/man/man4/gre.4 projects/sendfile/share/man/man4/inet.4 projects/sendfile/share/man/man4/inet6.4 projects/sendfile/share/man/man4/ip6.4 projects/sendfile/share/man/man4/tap.4 projects/sendfile/share/man/man4/vt.4 projects/sendfile/share/man/man5/rc.conf.5 projects/sendfile/share/man/man7/Makefile projects/sendfile/share/man/man7/hier.7 projects/sendfile/share/man/man7/security.7 projects/sendfile/share/man/man9/Makefile projects/sendfile/share/man/man9/domain.9 projects/sendfile/share/man/man9/fetch.9 projects/sendfile/share/man/man9/lock.9 projects/sendfile/share/man/man9/store.9 projects/sendfile/share/mk/atf.test.mk projects/sendfile/share/mk/bsd.libnames.mk projects/sendfile/share/mk/bsd.obj.mk projects/sendfile/share/mk/bsd.progs.mk projects/sendfile/share/mk/bsd.test.mk projects/sendfile/share/mk/plain.test.mk projects/sendfile/share/mk/tap.test.mk projects/sendfile/sys/amd64/amd64/genassym.c projects/sendfile/sys/amd64/amd64/support.S projects/sendfile/sys/amd64/amd64/sys_machdep.c projects/sendfile/sys/amd64/amd64/vm_machdep.c projects/sendfile/sys/amd64/conf/GENERIC projects/sendfile/sys/amd64/conf/NOTES projects/sendfile/sys/amd64/ia32/ia32_syscall.c projects/sendfile/sys/amd64/include/md_var.h projects/sendfile/sys/amd64/include/vmparam.h projects/sendfile/sys/arm/allwinner/a10_gpio.c projects/sendfile/sys/arm/arm/busdma_machdep-v6.c projects/sendfile/sys/arm/arm/machdep.c projects/sendfile/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/sendfile/sys/arm/conf/ATMEL projects/sendfile/sys/arm/conf/DOCKSTAR projects/sendfile/sys/arm/conf/DREAMPLUG-1001 projects/sendfile/sys/arm/conf/EFIKA_MX projects/sendfile/sys/arm/conf/ETHERNUT5 projects/sendfile/sys/arm/conf/IMX53 projects/sendfile/sys/arm/conf/IMX6 projects/sendfile/sys/arm/conf/SAM9260EK projects/sendfile/sys/arm/freescale/imx/imx_gpio.c projects/sendfile/sys/arm/freescale/vybrid/vf_gpio.c projects/sendfile/sys/arm/include/param.h projects/sendfile/sys/arm/lpc/lpc_gpio.c projects/sendfile/sys/arm/rockchip/rk30xx_gpio.c projects/sendfile/sys/arm/samsung/exynos/exynos5_pad.c projects/sendfile/sys/arm/ti/ti_gpio.c projects/sendfile/sys/arm/xilinx/zy7_gpio.c projects/sendfile/sys/arm/xscale/ixp425/avila_gpio.c projects/sendfile/sys/arm/xscale/ixp425/cambria_gpio.c projects/sendfile/sys/boot/amd64/boot1.efi/boot1.c projects/sendfile/sys/boot/arm/uboot/Makefile projects/sendfile/sys/boot/common/install.c projects/sendfile/sys/boot/common/misc.c projects/sendfile/sys/boot/fdt/Makefile projects/sendfile/sys/boot/fdt/fdt_loader_cmd.c projects/sendfile/sys/boot/forth/loader.conf projects/sendfile/sys/boot/powerpc/uboot/Makefile projects/sendfile/sys/boot/uboot/Makefile projects/sendfile/sys/boot/uboot/common/metadata.c projects/sendfile/sys/boot/uboot/lib/Makefile projects/sendfile/sys/boot/uboot/lib/libuboot.h projects/sendfile/sys/boot/uboot/lib/module.c projects/sendfile/sys/boot/zfs/zfsimpl.c projects/sendfile/sys/cam/ctl/ctl.c projects/sendfile/sys/cam/ctl/ctl.h projects/sendfile/sys/cam/ctl/ctl_backend.h projects/sendfile/sys/cam/ctl/ctl_backend_block.c projects/sendfile/sys/cam/ctl/ctl_cmd_table.c projects/sendfile/sys/cam/ctl/ctl_error.c projects/sendfile/sys/cam/ctl/ctl_error.h projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c projects/sendfile/sys/cam/ctl/ctl_private.h projects/sendfile/sys/cam/ctl/scsi_ctl.c projects/sendfile/sys/cam/scsi/scsi_all.c projects/sendfile/sys/cam/scsi/scsi_all.h projects/sendfile/sys/cddl/boot/zfs/zfsimpl.h projects/sendfile/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/sendfile/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/sendfile/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/sendfile/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/sendfile/sys/compat/freebsd32/freebsd32_misc.c projects/sendfile/sys/conf/NOTES projects/sendfile/sys/conf/files projects/sendfile/sys/conf/files.amd64 projects/sendfile/sys/conf/files.i386 projects/sendfile/sys/conf/kmod.mk projects/sendfile/sys/conf/options projects/sendfile/sys/crypto/rijndael/rijndael-api-fst.c projects/sendfile/sys/crypto/rijndael/rijndael-api-fst.h projects/sendfile/sys/dev/acpica/acpi.c projects/sendfile/sys/dev/agp/agp.c projects/sendfile/sys/dev/agp/agp_amd.c projects/sendfile/sys/dev/agp/agp_amd64.c projects/sendfile/sys/dev/agp/agp_apple.c projects/sendfile/sys/dev/agp/agp_ati.c projects/sendfile/sys/dev/agp/agp_i810.c projects/sendfile/sys/dev/agp/agppriv.h projects/sendfile/sys/dev/agp/agpvar.h projects/sendfile/sys/dev/ahci/ahci.c projects/sendfile/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/sendfile/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/sendfile/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/sendfile/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt projects/sendfile/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt projects/sendfile/sys/dev/cxgbe/tom/t4_cpl_io.c projects/sendfile/sys/dev/drm2/drm_agpsupport.c projects/sendfile/sys/dev/drm2/drm_edid.c projects/sendfile/sys/dev/drm2/drm_fb_helper.c projects/sendfile/sys/dev/drm2/drm_fb_helper.h projects/sendfile/sys/dev/drm2/radeon/radeon.h projects/sendfile/sys/dev/drm2/radeon/radeon_connectors.c projects/sendfile/sys/dev/drm2/radeon/radeon_device.c projects/sendfile/sys/dev/drm2/radeon/radeon_ttm.c projects/sendfile/sys/dev/drm2/ttm/ttm_agp_backend.c projects/sendfile/sys/dev/drm2/ttm/ttm_bo_driver.h projects/sendfile/sys/dev/drm2/ttm/ttm_bo_util.c projects/sendfile/sys/dev/drm2/ttm/ttm_page_alloc.c projects/sendfile/sys/dev/glxsb/glxsb.c projects/sendfile/sys/dev/gpio/gpiobus.c projects/sendfile/sys/dev/gpio/gpiobus_if.m projects/sendfile/sys/dev/gpio/gpiobusvar.h projects/sendfile/sys/dev/gpio/gpioiic.c projects/sendfile/sys/dev/gpio/gpioled.c projects/sendfile/sys/dev/hwpmc/hwpmc_mod.c projects/sendfile/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/sendfile/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/sendfile/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/sendfile/sys/dev/ida/ida_eisa.c projects/sendfile/sys/dev/iscsi/icl.c projects/sendfile/sys/dev/iscsi/icl.h projects/sendfile/sys/dev/iscsi/iscsi.c projects/sendfile/sys/dev/ixl/i40e_osdep.c projects/sendfile/sys/dev/ixl/i40e_osdep.h projects/sendfile/sys/dev/ixl/if_ixl.c projects/sendfile/sys/dev/ixl/if_ixlv.c projects/sendfile/sys/dev/ixl/ixl.h projects/sendfile/sys/dev/ixl/ixl_txrx.c projects/sendfile/sys/dev/ixl/ixlv.h projects/sendfile/sys/dev/ixl/ixlvc.c projects/sendfile/sys/dev/netmap/netmap_freebsd.c projects/sendfile/sys/dev/netmap/netmap_generic.c projects/sendfile/sys/dev/netmap/netmap_kern.h projects/sendfile/sys/dev/netmap/netmap_pipe.c projects/sendfile/sys/dev/null/null.c projects/sendfile/sys/dev/ofw/ofwbus.c projects/sendfile/sys/dev/pci/pci.c projects/sendfile/sys/dev/random/dummy_rng.c projects/sendfile/sys/dev/random/hash.c projects/sendfile/sys/dev/random/hash.h projects/sendfile/sys/dev/random/ivy.c projects/sendfile/sys/dev/random/live_entropy_sources.c projects/sendfile/sys/dev/random/live_entropy_sources.h projects/sendfile/sys/dev/random/nehemiah.c projects/sendfile/sys/dev/random/random_adaptors.c projects/sendfile/sys/dev/random/random_adaptors.h projects/sendfile/sys/dev/random/random_harvestq.c projects/sendfile/sys/dev/random/random_harvestq.h projects/sendfile/sys/dev/random/randomdev.c projects/sendfile/sys/dev/random/randomdev.h projects/sendfile/sys/dev/random/randomdev_soft.c projects/sendfile/sys/dev/random/randomdev_soft.h projects/sendfile/sys/dev/random/yarrow.c projects/sendfile/sys/dev/random/yarrow.h projects/sendfile/sys/dev/rp/rp.c projects/sendfile/sys/dev/rp/rp_pci.c projects/sendfile/sys/dev/rp/rpreg.h projects/sendfile/sys/dev/rp/rpvar.h projects/sendfile/sys/dev/safe/safe.c projects/sendfile/sys/dev/sound/isa/gusc.c projects/sendfile/sys/dev/sound/isa/sb16.c projects/sendfile/sys/dev/sound/isa/sbc.c projects/sendfile/sys/dev/sound/midi/sequencer.c projects/sendfile/sys/dev/sound/pci/als4000.c projects/sendfile/sys/dev/sound/pci/cs4281.c projects/sendfile/sys/dev/sound/pci/csa.c projects/sendfile/sys/dev/sound/pci/emu10kx.c projects/sendfile/sys/dev/sound/pci/envy24.c projects/sendfile/sys/dev/sound/pci/envy24ht.c projects/sendfile/sys/dev/sound/pci/maestro.c projects/sendfile/sys/dev/sound/pci/spicds.c projects/sendfile/sys/dev/sound/pci/vibes.c projects/sendfile/sys/dev/sound/pcm/dsp.c projects/sendfile/sys/dev/sound/pcm/mixer.c projects/sendfile/sys/dev/sound/pcm/sound.c projects/sendfile/sys/dev/sound/pcm/sound.h projects/sendfile/sys/dev/usb/serial/u3g.c projects/sendfile/sys/dev/usb/usb_hub.c projects/sendfile/sys/dev/usb/usbdevs projects/sendfile/sys/dev/virtio/console/virtio_console.c projects/sendfile/sys/dev/virtio/network/if_vtnet.c projects/sendfile/sys/dev/vt/vt.h projects/sendfile/sys/dev/vt/vt_buf.c projects/sendfile/sys/dev/vt/vt_core.c projects/sendfile/sys/fs/devfs/devfs_vnops.c projects/sendfile/sys/fs/nfsclient/nfs_clvfsops.c projects/sendfile/sys/geom/bde/g_bde.c projects/sendfile/sys/geom/bde/g_bde.h projects/sendfile/sys/geom/geom_dev.c projects/sendfile/sys/i386/conf/GENERIC projects/sendfile/sys/i386/conf/NOTES projects/sendfile/sys/i386/conf/XBOX projects/sendfile/sys/i386/conf/XEN projects/sendfile/sys/i386/i386/genassym.c projects/sendfile/sys/i386/i386/initcpu.c projects/sendfile/sys/i386/i386/locore.s projects/sendfile/sys/i386/i386/machdep.c projects/sendfile/sys/i386/i386/mp_machdep.c projects/sendfile/sys/i386/i386/ptrace_machdep.c projects/sendfile/sys/i386/i386/support.s projects/sendfile/sys/i386/i386/sys_machdep.c projects/sendfile/sys/i386/i386/trap.c projects/sendfile/sys/i386/i386/vm86bios.s projects/sendfile/sys/i386/i386/vm_machdep.c projects/sendfile/sys/i386/include/cpufunc.h projects/sendfile/sys/i386/include/md_var.h projects/sendfile/sys/i386/include/npx.h projects/sendfile/sys/i386/include/pcb.h projects/sendfile/sys/i386/isa/npx.c projects/sendfile/sys/i386/linux/linux_ptrace.c projects/sendfile/sys/i386/linux/linux_sysvec.c projects/sendfile/sys/i386/svr4/svr4_machdep.c projects/sendfile/sys/i386/xen/mp_machdep.c projects/sendfile/sys/kern/init_main.c projects/sendfile/sys/kern/kern_clock.c projects/sendfile/sys/kern/kern_cons.c projects/sendfile/sys/kern/kern_descrip.c projects/sendfile/sys/kern/kern_exec.c projects/sendfile/sys/kern/kern_intr.c projects/sendfile/sys/kern/kern_lock.c projects/sendfile/sys/kern/kern_mutex.c projects/sendfile/sys/kern/kern_prot.c projects/sendfile/sys/kern/kern_rwlock.c projects/sendfile/sys/kern/kern_shutdown.c projects/sendfile/sys/kern/kern_sx.c projects/sendfile/sys/kern/kern_syscalls.c projects/sendfile/sys/kern/kern_thr.c projects/sendfile/sys/kern/kern_umtx.c projects/sendfile/sys/kern/subr_bus.c projects/sendfile/sys/kern/subr_param.c projects/sendfile/sys/kern/subr_prof.c projects/sendfile/sys/kern/subr_terminal.c projects/sendfile/sys/kern/subr_uio.c projects/sendfile/sys/kern/sys_generic.c projects/sendfile/sys/kern/sys_pipe.c projects/sendfile/sys/kern/uipc_debug.c projects/sendfile/sys/kern/vfs_acl.c projects/sendfile/sys/kern/vfs_export.c projects/sendfile/sys/kern/vfs_lookup.c projects/sendfile/sys/mips/atheros/ar71xx_gpio.c projects/sendfile/sys/mips/cavium/octeon_gpio.c projects/sendfile/sys/mips/conf/GXEMUL projects/sendfile/sys/mips/conf/GXEMUL32 projects/sendfile/sys/mips/conf/OCTEON1 projects/sendfile/sys/mips/conf/PICOSTATION_M2HP.hints projects/sendfile/sys/mips/include/param.h projects/sendfile/sys/mips/rmi/rootfs_list.txt projects/sendfile/sys/mips/rt305x/rt305x_gpio.c projects/sendfile/sys/modules/Makefile projects/sendfile/sys/modules/drm2/drm2/Makefile projects/sendfile/sys/modules/if_gre/Makefile projects/sendfile/sys/modules/ixlv/Makefile projects/sendfile/sys/modules/linux/Makefile projects/sendfile/sys/modules/mrsas/Makefile projects/sendfile/sys/modules/random/Makefile projects/sendfile/sys/modules/sound/sound/Makefile projects/sendfile/sys/modules/svr4/Makefile projects/sendfile/sys/modules/vmm/Makefile projects/sendfile/sys/net/bpf.c projects/sendfile/sys/net/ethernet.h projects/sendfile/sys/net/flowtable.c projects/sendfile/sys/net/if.c projects/sendfile/sys/net/if_arp.h projects/sendfile/sys/net/if_bridge.c projects/sendfile/sys/net/if_clone.c projects/sendfile/sys/net/if_clone.h projects/sendfile/sys/net/if_disc.c projects/sendfile/sys/net/if_ethersubr.c projects/sendfile/sys/net/if_fddisubr.c projects/sendfile/sys/net/if_gif.c projects/sendfile/sys/net/if_gre.c projects/sendfile/sys/net/if_gre.h projects/sendfile/sys/net/if_iso88025subr.c projects/sendfile/sys/net/if_loop.c projects/sendfile/sys/net/if_mib.c projects/sendfile/sys/net/if_spppsubr.c projects/sendfile/sys/net/if_stf.c projects/sendfile/sys/net/if_tun.c projects/sendfile/sys/net/if_types.h projects/sendfile/sys/net/if_var.h projects/sendfile/sys/net/if_vlan_var.h projects/sendfile/sys/net/netmap_user.h projects/sendfile/sys/net/route.c projects/sendfile/sys/net/vnet.h projects/sendfile/sys/netgraph/ng_bridge.c projects/sendfile/sys/netgraph/ng_ether.c projects/sendfile/sys/netgraph/ng_frame_relay.c projects/sendfile/sys/netgraph/ng_iface.c projects/sendfile/sys/netinet/cc/cc.c projects/sendfile/sys/netinet/cc/cc_cdg.c projects/sendfile/sys/netinet/cc/cc_chd.c projects/sendfile/sys/netinet/cc/cc_hd.c projects/sendfile/sys/netinet/cc/cc_htcp.c projects/sendfile/sys/netinet/cc/cc_vegas.c projects/sendfile/sys/netinet/if_ether.c projects/sendfile/sys/netinet/igmp.c projects/sendfile/sys/netinet/in.c projects/sendfile/sys/netinet/in.h projects/sendfile/sys/netinet/in_gif.c projects/sendfile/sys/netinet/in_pcb.c projects/sendfile/sys/netinet/in_pcb.h projects/sendfile/sys/netinet/in_proto.c projects/sendfile/sys/netinet/in_rmx.c projects/sendfile/sys/netinet/in_var.h projects/sendfile/sys/netinet/ip_carp.c projects/sendfile/sys/netinet/ip_fastfwd.c projects/sendfile/sys/netinet/ip_gre.c projects/sendfile/sys/netinet/ip_icmp.c projects/sendfile/sys/netinet/ip_input.c projects/sendfile/sys/netinet/ip_ipsec.c projects/sendfile/sys/netinet/ip_mroute.c projects/sendfile/sys/netinet/ip_output.c projects/sendfile/sys/netinet/raw_ip.c projects/sendfile/sys/netinet/sctp_sysctl.c projects/sendfile/sys/netinet/tcp_hostcache.c projects/sendfile/sys/netinet/tcp_input.c projects/sendfile/sys/netinet/tcp_output.c projects/sendfile/sys/netinet/tcp_sack.c projects/sendfile/sys/netinet/tcp_subr.c projects/sendfile/sys/netinet/tcp_syncache.c projects/sendfile/sys/netinet/tcp_timer.c projects/sendfile/sys/netinet/tcp_timer.h projects/sendfile/sys/netinet/tcp_timewait.c projects/sendfile/sys/netinet/tcp_usrreq.c projects/sendfile/sys/netinet/tcp_var.h projects/sendfile/sys/netinet/udp_usrreq.c projects/sendfile/sys/netinet6/frag6.c projects/sendfile/sys/netinet6/icmp6.c projects/sendfile/sys/netinet6/in6.c projects/sendfile/sys/netinet6/in6.h projects/sendfile/sys/netinet6/in6_gif.c projects/sendfile/sys/netinet6/in6_ifattach.c projects/sendfile/sys/netinet6/in6_mcast.c projects/sendfile/sys/netinet6/in6_pcb.c projects/sendfile/sys/netinet6/in6_proto.c projects/sendfile/sys/netinet6/in6_rmx.c projects/sendfile/sys/netinet6/in6_src.c projects/sendfile/sys/netinet6/in6_var.h projects/sendfile/sys/netinet6/ip6_input.c projects/sendfile/sys/netinet6/ip6_ipsec.c projects/sendfile/sys/netinet6/ip6_output.c projects/sendfile/sys/netinet6/ip6_var.h projects/sendfile/sys/netinet6/mld6.c projects/sendfile/sys/netinet6/nd6.c projects/sendfile/sys/netinet6/nd6.h projects/sendfile/sys/netinet6/nd6_nbr.c projects/sendfile/sys/netinet6/raw_ip6.c projects/sendfile/sys/netinet6/scope6.c projects/sendfile/sys/netinet6/scope6_var.h projects/sendfile/sys/netinet6/sctp6_usrreq.c projects/sendfile/sys/netinet6/udp6_usrreq.c projects/sendfile/sys/netipsec/ipsec.c projects/sendfile/sys/netipsec/ipsec_input.c projects/sendfile/sys/netipsec/key.c projects/sendfile/sys/netipsec/xform_ah.c projects/sendfile/sys/netipsec/xform_esp.c projects/sendfile/sys/netipsec/xform_ipcomp.c projects/sendfile/sys/netipsec/xform_ipip.c projects/sendfile/sys/netpfil/ipfw/ip_fw2.c projects/sendfile/sys/netpfil/ipfw/ip_fw_dynamic.c projects/sendfile/sys/netpfil/ipfw/ip_fw_pfil.c projects/sendfile/sys/netpfil/ipfw/ip_fw_private.h projects/sendfile/sys/netpfil/ipfw/ip_fw_table.c projects/sendfile/sys/netpfil/pf/if_pfsync.c projects/sendfile/sys/netpfil/pf/pf.c projects/sendfile/sys/ofed/drivers/net/mlx4/mcg.c projects/sendfile/sys/pc98/conf/GENERIC projects/sendfile/sys/powerpc/conf/GENERIC projects/sendfile/sys/powerpc/conf/GENERIC64 projects/sendfile/sys/powerpc/conf/WII projects/sendfile/sys/powerpc/powerpc/copyinout.c projects/sendfile/sys/powerpc/wii/wii_gpio.c projects/sendfile/sys/sparc64/conf/GENERIC projects/sendfile/sys/sparc64/include/param.h projects/sendfile/sys/sys/buf_ring.h projects/sendfile/sys/sys/conf.h projects/sendfile/sys/sys/disk.h projects/sendfile/sys/sys/domain.h projects/sendfile/sys/sys/filedesc.h projects/sendfile/sys/sys/lockmgr.h projects/sendfile/sys/sys/param.h projects/sendfile/sys/sys/protosw.h projects/sendfile/sys/sys/random.h projects/sendfile/sys/sys/seq.h projects/sendfile/sys/sys/sysctl.h projects/sendfile/sys/sys/sysent.h projects/sendfile/sys/sys/systm.h projects/sendfile/sys/sys/terminal.h projects/sendfile/sys/sys/ucred.h projects/sendfile/sys/sys/user.h projects/sendfile/sys/ufs/ffs/ffs_softdep.c projects/sendfile/sys/vm/default_pager.c projects/sendfile/sys/vm/swap_pager.c projects/sendfile/sys/vm/uma_core.c projects/sendfile/sys/vm/vm_page.c projects/sendfile/sys/x86/acpica/acpi_wakeup.c projects/sendfile/sys/x86/x86/identcpu.c projects/sendfile/sys/x86/x86/tsc.c projects/sendfile/tests/sys/Makefile projects/sendfile/tests/sys/netinet/Makefile projects/sendfile/tools/build/mk/OptionalObsoleteFiles.inc projects/sendfile/tools/sched/schedgraph.py projects/sendfile/tools/tools/nanobsd/pcengines/ALIX_DSK projects/sendfile/tools/tools/nanobsd/pcengines/ALIX_NFS projects/sendfile/tools/tools/sysbuild/sysbuild.sh projects/sendfile/tools/tools/sysdoc/tunables.mdoc projects/sendfile/tools/tools/tinybsd/conf/default/TINYBSD projects/sendfile/tools/tools/tinybsd/conf/vpn/TINYBSD projects/sendfile/tools/tools/tinybsd/conf/wrap/TINYBSD projects/sendfile/usr.bin/Makefile projects/sendfile/usr.bin/ftp/Makefile projects/sendfile/usr.bin/hexdump/hexdump.1 projects/sendfile/usr.bin/iconv/Makefile projects/sendfile/usr.bin/id/Makefile projects/sendfile/usr.bin/iscsictl/token.l projects/sendfile/usr.bin/top/machine.c projects/sendfile/usr.bin/w/Makefile projects/sendfile/usr.bin/w/pr_time.c projects/sendfile/usr.bin/w/w.1 projects/sendfile/usr.bin/w/w.c projects/sendfile/usr.bin/wc/Makefile projects/sendfile/usr.bin/wc/wc.1 projects/sendfile/usr.bin/wc/wc.c projects/sendfile/usr.sbin/Makefile projects/sendfile/usr.sbin/bhyve/block_if.c projects/sendfile/usr.sbin/bhyve/pci_ahci.c projects/sendfile/usr.sbin/bsdconfig/Makefile projects/sendfile/usr.sbin/bsdconfig/console/Makefile projects/sendfile/usr.sbin/bsdconfig/console/include/Makefile projects/sendfile/usr.sbin/bsdconfig/diskmgmt/Makefile projects/sendfile/usr.sbin/bsdconfig/diskmgmt/include/Makefile projects/sendfile/usr.sbin/bsdconfig/docsinstall/Makefile projects/sendfile/usr.sbin/bsdconfig/docsinstall/include/Makefile projects/sendfile/usr.sbin/bsdconfig/dot/Makefile projects/sendfile/usr.sbin/bsdconfig/dot/include/Makefile projects/sendfile/usr.sbin/bsdconfig/examples/Makefile projects/sendfile/usr.sbin/bsdconfig/include/Makefile projects/sendfile/usr.sbin/bsdconfig/includes/Makefile projects/sendfile/usr.sbin/bsdconfig/includes/include/Makefile projects/sendfile/usr.sbin/bsdconfig/mouse/Makefile projects/sendfile/usr.sbin/bsdconfig/mouse/include/Makefile projects/sendfile/usr.sbin/bsdconfig/networking/Makefile projects/sendfile/usr.sbin/bsdconfig/networking/include/Makefile projects/sendfile/usr.sbin/bsdconfig/networking/share/Makefile projects/sendfile/usr.sbin/bsdconfig/networking/share/device.subr projects/sendfile/usr.sbin/bsdconfig/packages/Makefile projects/sendfile/usr.sbin/bsdconfig/packages/include/Makefile projects/sendfile/usr.sbin/bsdconfig/password/Makefile projects/sendfile/usr.sbin/bsdconfig/password/include/Makefile projects/sendfile/usr.sbin/bsdconfig/password/share/Makefile projects/sendfile/usr.sbin/bsdconfig/security/Makefile projects/sendfile/usr.sbin/bsdconfig/security/include/Makefile projects/sendfile/usr.sbin/bsdconfig/share/Makefile projects/sendfile/usr.sbin/bsdconfig/share/media/Makefile projects/sendfile/usr.sbin/bsdconfig/share/packages/Makefile projects/sendfile/usr.sbin/bsdconfig/startup/Makefile projects/sendfile/usr.sbin/bsdconfig/startup/include/Makefile projects/sendfile/usr.sbin/bsdconfig/startup/share/Makefile projects/sendfile/usr.sbin/bsdconfig/timezone/Makefile projects/sendfile/usr.sbin/bsdconfig/timezone/include/Makefile projects/sendfile/usr.sbin/bsdconfig/timezone/share/Makefile projects/sendfile/usr.sbin/bsdconfig/ttys/Makefile projects/sendfile/usr.sbin/bsdconfig/ttys/include/Makefile projects/sendfile/usr.sbin/bsdconfig/usermgmt/Makefile projects/sendfile/usr.sbin/bsdconfig/usermgmt/include/Makefile projects/sendfile/usr.sbin/bsdconfig/usermgmt/share/Makefile projects/sendfile/usr.sbin/bsdinstall/bsdinstall.8 projects/sendfile/usr.sbin/ctladm/ctladm.8 projects/sendfile/usr.sbin/ctld/Makefile projects/sendfile/usr.sbin/ctld/chap.c projects/sendfile/usr.sbin/ctld/ctl.conf.5 projects/sendfile/usr.sbin/ctld/ctld.8 projects/sendfile/usr.sbin/ctld/ctld.c projects/sendfile/usr.sbin/ctld/ctld.h projects/sendfile/usr.sbin/ctld/discovery.c projects/sendfile/usr.sbin/ctld/login.c projects/sendfile/usr.sbin/ctld/parse.y projects/sendfile/usr.sbin/ctld/token.l projects/sendfile/usr.sbin/etcupdate/etcupdate.8 projects/sendfile/usr.sbin/fifolog/fifolog_reader/Makefile projects/sendfile/usr.sbin/fifolog/fifolog_writer/Makefile projects/sendfile/usr.sbin/inetd/inetd.c projects/sendfile/usr.sbin/iscsid/Makefile projects/sendfile/usr.sbin/iscsid/chap.c projects/sendfile/usr.sbin/pkg/Makefile projects/sendfile/usr.sbin/pw/pw_group.c projects/sendfile/usr.sbin/pw/pw_user.c projects/sendfile/usr.sbin/pw/tests/Makefile projects/sendfile/usr.sbin/pw/tests/pw_delete.sh projects/sendfile/usr.sbin/pw/tests/pw_modify.sh projects/sendfile/usr.sbin/rpcbind/Makefile projects/sendfile/usr.sbin/sysrc/sysrc projects/sendfile/usr.sbin/sysrc/sysrc.8 Directory Properties: projects/sendfile/ (props changed) projects/sendfile/cddl/ (props changed) projects/sendfile/cddl/contrib/opensolaris/ (props changed) projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/sendfile/contrib/atf/ (props changed) projects/sendfile/contrib/llvm/ (props changed) projects/sendfile/contrib/mtree/ (props changed) projects/sendfile/contrib/openpam/ (props changed) projects/sendfile/contrib/tnftp/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/gnu/lib/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/lib/libutil/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/share/man/man4/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/boot/ (props changed) projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed) projects/sendfile/sys/conf/ (props changed) projects/sendfile/sys/dev/hyperv/ (props changed) projects/sendfile/sys/modules/vmm/ (props changed) projects/sendfile/usr.sbin/bhyve/ (props changed) Modified: projects/sendfile/MAINTAINERS ============================================================================== --- projects/sendfile/MAINTAINERS Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/MAINTAINERS Tue Nov 11 19:02:30 2014 (r274392) @@ -48,7 +48,6 @@ cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. em(4) jfv Pre-commit review requested. -bxe(4) davidch Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. @@ -78,7 +77,6 @@ inetd dwmalone Recommends pre-commit re contrib/smbfs bp Open for in-tree committs. In case of functional changes pre-commit review requested. contrib/pf glebius Pre-commit review recommended. -binutils obrien Insists on BU blocked from unapproved commits file obrien Insists to keep file blocked from other's unapproved commits contrib/bzip2 obrien Pre-commit review required. Modified: projects/sendfile/Makefile.inc1 ============================================================================== --- projects/sendfile/Makefile.inc1 Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/Makefile.inc1 Tue Nov 11 19:02:30 2014 (r274392) @@ -1537,6 +1537,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libwind} \ lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libelf lib/libexpat \ + lib/libfigpar \ ${_lib_libgssapi} \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \ ${_lib_libcapsicum} \ @@ -1551,7 +1552,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_cddl_lib_libctf} \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_lib_libldns} \ - ${_secure_lib_libssh} ${_secure_lib_libssl} + ${_secure_lib_libssh} ${_secure_lib_libssl} \ + gnu/lib/libdialog .if ${MK_GNUCXX} != "no" _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++ gnu/lib/libstdc++__L: lib/msun__L @@ -1669,6 +1671,8 @@ _lib_libypclnt= lib/libypclnt lib/libradius__L: lib/libmd__L .endif +gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L + .for _lib in ${_prereq_libs} ${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) Modified: projects/sendfile/ObsoleteFiles.inc ============================================================================== --- projects/sendfile/ObsoleteFiles.inc Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/ObsoleteFiles.inc Tue Nov 11 19:02:30 2014 (r274392) @@ -38,6 +38,21 @@ # xargs -n1 | sort | uniq -d; # done +# 20141109: faith/faithd removal +OLD_FILES+=etc/rc.d/faith +OLD_FILES+=usr/share/man/man4/faith.4.gz +OLD_FILES+=usr/share/man/man4/if_faith.4.gz +OLD_FILES+=usr/sbin/faithd +OLD_FILES+=usr/share/man/man8/faithd.8.gz +# 20141102: postrandom obsoleted by new /dev/random code +OLD_FILES+=etc/rc.d/postrandom +# 20141031: initrandom obsoleted by new /dev/random code +OLD_FILES+=etc/rc.d/initrandom +# 20141028: debug files accidentally installed as directory name +OLD_FILES+=usr/lib/debug/usr/lib/i18n +OLD_FILES+=usr/lib/debug/usr/lib/private +OLD_FILES+=usr/lib/debug/usr/lib32/i18n +OLD_FILES+=usr/lib/debug/usr/lib32/private # 20141015: OpenSSL 1.0.1j import OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed @@ -46,7 +61,6 @@ OLD_FILES+=usr/share/man/man9/sleepq_cat # 20140917: hv_kvpd rc.d script removed in favor of devd configuration OLD_FILES+=etc/rc.d/hv_kvpd # 20140917: libnv was accidentally being installed to /usr/lib instead of /lib -OLD_LIBS+=usr/lib/libnv.a OLD_LIBS+=usr/lib/libnv.so.0 # 20140829: rc.d/kerberos removed OLD_FILES+=etc/rc.d/kerberos @@ -368,7 +382,6 @@ OLD_FILES+=usr/share/man/man1/atf-report OLD_FILES+=usr/share/man/man1/atf-run.1.gz OLD_FILES+=usr/share/man/man1/atf-version.1.gz OLD_FILES+=usr/share/man/man5/atf-formats.5.gz -OLD_FILES+=usr/share/man/man7/atf.7.gz OLD_FILES+=usr/share/xml/atf/tests-results.dtd OLD_FILES+=usr/share/xsl/atf/tests-results.xsl # 20131009: freebsd-version moved from /libexec to /bin Modified: projects/sendfile/UPDATING ============================================================================== --- projects/sendfile/UPDATING Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/UPDATING Tue Nov 11 19:02:30 2014 (r274392) @@ -31,6 +31,33 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20141109: + faith(4) and faithd(8) has been removed from base system. It + has been obsolete for a very long time. + +20141104: + vt(4), the new console driver, is enabled by default. It brings + support for Unicode and double-width characters, as well as + support for UEFI and integration with the KMS kernel video + drivers. + + You may need to update your console settings in /etc/rc.conf, + most probably the keymap. During boot, /etc/rc.d/syscons will + indicate what you need to do. + + vt(4) still has issues and lacks some features compared to + syscons(4). See the wiki for up-to-date information: + https://wiki.freebsd.org/Newcons + + If you want to keep using syscons(4), you can do so by adding + the following line to /boot/loader.conf: + kern.vty=sc + +20141102: + pjdfstest has been integrated into kyua as an opt-in test suite. + Please see share/doc/pjdfstest/README for a more details on how to + execute it. + 20141009: gperf has been removed from the base system for architectures that use clang. Ports that require gperf will obtain it from the @@ -810,8 +837,8 @@ COMMON ITEMS: 2.) update the ZFS boot block on your boot drive The following example updates the ZFS boot block on the first - partition (freebsd-boot) of a GPT partitioned drive ad0: - "gpart bootcode -p /boot/gptzfsboot -i 1 ad0" + partition (freebsd-boot) of a GPT partitioned drive ada0: + "gpart bootcode -p /boot/gptzfsboot -i 1 ada0" Non-boot pools do not need these updates. Modified: projects/sendfile/bin/df/Makefile ============================================================================== --- projects/sendfile/bin/df/Makefile Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/bin/df/Makefile Tue Nov 11 19:02:30 2014 (r274392) @@ -9,7 +9,7 @@ SRCS= df.c vfslist.c CFLAGS+= -I${MOUNT} -DPADD= ${LIBUTIL} -LDADD= -lutil +DPADD= ${LIBUTIL} ${LIBXO} +LDADD= -lutil -lxo .include <bsd.prog.mk> Modified: projects/sendfile/bin/df/df.1 ============================================================================== --- projects/sendfile/bin/df/df.1 Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/bin/df/df.1 Tue Nov 11 19:02:30 2014 (r274392) @@ -29,7 +29,7 @@ .\" @(#)df.1 8.3 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd January 16, 2014 +.Dd November 6, 2014 .Dt DF 1 .Os .Sh NAME @@ -37,6 +37,7 @@ .Nd display free disk space .Sh SYNOPSIS .Nm +.Op Fl -libxo .Op Fl b | g | H | h | k | m | P .Op Fl acilnT .Op Fl \&, @@ -193,7 +194,9 @@ If the value is outside, it will be set .Xr statfs 2 , .Xr getbsize 3 , .Xr getmntinfo 3 , +.Xr libxo 3 , .Xr localeconv 3 , +.Xr xo_parse_args 3 , .Xr fstab 5 , .Xr mount 8 , .Xr pstat 8 , Modified: projects/sendfile/bin/df/df.c ============================================================================== --- projects/sendfile/bin/df/df.c Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/bin/df/df.c Tue Nov 11 19:02:30 2014 (r274392) @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <sysexits.h> #include <unistd.h> +#include <libxo/xo.h> #include "extern.h" @@ -82,7 +83,7 @@ static char *getmntpt(const char *); static int int64width(int64_t); static char *makenetvfslist(void); static void prthuman(const struct statfs *, int64_t); -static void prthumanval(int64_t); +static void prthumanval(const char *, int64_t); static intmax_t fsbtoblk(int64_t, uint64_t, u_long); static void prtstat(struct statfs *, struct maxwidths *); static size_t regetmntinfo(struct statfs **, long, const char **); @@ -119,6 +120,11 @@ main(int argc, char *argv[]) totalbuf.f_bsize = DEV_BSIZE; strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN); vfslist = NULL; + + argc = xo_parse_args(argc, argv); + if (argc < 0) + exit(1); + while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T,")) != -1) switch (ch) { case 'a': @@ -161,7 +167,7 @@ main(int argc, char *argv[]) break; case 'l': if (vfslist != NULL) - errx(1, "-l and -t are mutually exclusive."); + xo_errx(1, "-l and -t are mutually exclusive."); vfslist = makevfslist(makenetvfslist()); lflag = 1; break; @@ -174,9 +180,9 @@ main(int argc, char *argv[]) break; case 't': if (lflag) - errx(1, "-l and -t are mutually exclusive."); + xo_errx(1, "-l and -t are mutually exclusive."); if (vfslist != NULL) - errx(1, "only one -t option may be specified"); + xo_errx(1, "only one -t option may be specified"); fstype = optarg; vfslist = makevfslist(optarg); break; @@ -202,16 +208,19 @@ main(int argc, char *argv[]) /* just the filesystems specified on the command line */ mntbuf = malloc(argc * sizeof(*mntbuf)); if (mntbuf == NULL) - err(1, "malloc()"); + xo_err(1, "malloc()"); mntsize = 0; /* continued in for loop below */ } + xo_open_container("storage-system-information"); + xo_open_list("filesystem"); + /* iterate through specified filesystems */ for (; *argv; argv++) { if (stat(*argv, &stbuf) < 0) { if ((mntpt = getmntpt(*argv)) == NULL) { - warn("%s", *argv); + xo_warn("%s", *argv); rv = 1; continue; } @@ -220,20 +229,20 @@ main(int argc, char *argv[]) mdev.fspec = *argv; mntpath = strdup("/tmp/df.XXXXXX"); if (mntpath == NULL) { - warn("strdup failed"); + xo_warn("strdup failed"); rv = 1; continue; } mntpt = mkdtemp(mntpath); if (mntpt == NULL) { - warn("mkdtemp(\"%s\") failed", mntpath); + xo_warn("mkdtemp(\"%s\") failed", mntpath); rv = 1; free(mntpath); continue; } if (mount(fstype, mntpt, MNT_RDONLY, &mdev) != 0) { - warn("%s", *argv); + xo_warn("%s", *argv); rv = 1; (void)rmdir(mntpt); free(mntpath); @@ -244,7 +253,7 @@ main(int argc, char *argv[]) if (cflag) addstat(&totalbuf, &statfsbuf); } else { - warn("%s", *argv); + xo_warn("%s", *argv); rv = 1; } (void)unmount(mntpt, 0); @@ -260,7 +269,7 @@ main(int argc, char *argv[]) * implement nflag here. */ if (statfs(mntpt, &statfsbuf) < 0) { - warn("%s", mntpt); + xo_warn("%s", mntpt); rv = 1; continue; } @@ -294,8 +303,14 @@ main(int argc, char *argv[]) for (i = 0; i < mntsize; i++) if (aflag || (mntbuf[i].f_flags & MNT_IGNORE) == 0) prtstat(&mntbuf[i], &maxwidths); + + xo_close_list("filesystem"); + if (cflag) prtstat(&totalbuf, &maxwidths); + + xo_close_container("storage-system-information"); + xo_finish(); return (rv); } @@ -341,7 +356,7 @@ regetmntinfo(struct statfs **mntbufp, lo if (nflag || error < 0) if (i != j) { if (error < 0) - warnx("%s stats possibly stale", + xo_warnx("%s stats possibly stale", mntbuf[i].f_mntonname); mntbuf[j] = mntbuf[i]; } @@ -354,13 +369,13 @@ static void prthuman(const struct statfs *sfsp, int64_t used) { - prthumanval(sfsp->f_blocks * sfsp->f_bsize); - prthumanval(used * sfsp->f_bsize); - prthumanval(sfsp->f_bavail * sfsp->f_bsize); + prthumanval(" {:blocks/%6s}", sfsp->f_blocks * sfsp->f_bsize); + prthumanval(" {:used/%6s}", used * sfsp->f_bsize); + prthumanval(" {:available/%6s}", sfsp->f_bavail * sfsp->f_bsize); } static void -prthumanval(int64_t bytes) +prthumanval(const char *fmt, int64_t bytes) { char buf[6]; int flags; @@ -372,14 +387,15 @@ prthumanval(int64_t bytes) humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1), bytes, "", HN_AUTOSCALE, flags); - (void)printf(" %6s", buf); + xo_attr("value", "%lld", (long long) bytes); + xo_emit(fmt, buf); } /* * Print an inode count in "human-readable" format. */ static void -prthumanvalinode(int64_t bytes) +prthumanvalinode(const char *fmt, int64_t bytes) { char buf[6]; int flags; @@ -389,7 +405,8 @@ prthumanvalinode(int64_t bytes) humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1), bytes, "", HN_AUTOSCALE, flags); - (void)printf(" %5s", buf); + xo_attr("value", "%lld", (long long) bytes); + xo_emit(fmt, buf); } /* @@ -434,70 +451,77 @@ prtstat(struct statfs *sfsp, struct maxw mwp->used = imax(mwp->used, (int)strlen("Used")); mwp->avail = imax(mwp->avail, (int)strlen("Avail")); - (void)printf("%-*s", mwp->mntfrom, "Filesystem"); + xo_emit("{T:/%-*s}", mwp->mntfrom, "Filesystem"); if (Tflag) - (void)printf(" %-*s", mwp->fstype, "Type"); - (void)printf(" %*s %*s %*s Capacity", mwp->total, header, - mwp->used, "Used", mwp->avail, "Avail"); + xo_emit(" {T:/%-*s}", mwp->fstype, "Type"); + xo_emit(" {T:/%*s} {T:/%*s} {T:/%*s} Capacity", + mwp->total, header, + mwp->used, "Used", mwp->avail, "Avail"); if (iflag) { mwp->iused = imax(hflag ? 0 : mwp->iused, (int)strlen(" iused")); mwp->ifree = imax(hflag ? 0 : mwp->ifree, (int)strlen("ifree")); - (void)printf(" %*s %*s %%iused", + xo_emit(" {T:/%*s} {T:/%*s} {T:\%iused}", mwp->iused - 2, "iused", mwp->ifree, "ifree"); } - (void)printf(" Mounted on\n"); + xo_emit(" {T:Mounted on}\n"); } + + xo_open_instance("filesystem"); /* Check for 0 block size. Can this happen? */ if (sfsp->f_bsize == 0) { - warnx ("File system %s does not have a block size, assuming 512.", + xo_warnx ("File system %s does not have a block size, assuming 512.", sfsp->f_mntonname); sfsp->f_bsize = 512; } - (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); + xo_emit("{tk:name/%-*s}", mwp->mntfrom, sfsp->f_mntfromname); if (Tflag) - (void)printf(" %-*s", mwp->fstype, sfsp->f_fstypename); + xo_emit(" {:type/%-*s}", mwp->fstype, sfsp->f_fstypename); used = sfsp->f_blocks - sfsp->f_bfree; availblks = sfsp->f_bavail + used; if (hflag) { prthuman(sfsp, used); } else { if (thousands) - format = " %*j'd %*j'd %*j'd"; + format = " {t:total-blocks/%*j'd} {t:used-blocks/%*j'd} " + "{t:available-blocks/%*j'd}"; else - format = " %*jd %*jd %*jd"; - (void)printf(format, + format = " {t:total-blocks/%*jd} {t:used-blocks/%*jd} " + "{t:available-blocks/%*jd}"; + xo_emit(format, mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } - (void)printf(" %5.0f%%", + xo_emit(" {:used-percent/%5.0f}{U:%%}", availblks == 0 ? 100.0 : (double)used / (double)availblks * 100.0); if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; if (hflag) { - (void)printf(" "); - prthumanvalinode(used); - prthumanvalinode(sfsp->f_ffree); + xo_emit(" "); + prthumanvalinode(" {:inodes-used/%5s}", used); + prthumanvalinode(" {:inodes-free/%5s}", sfsp->f_ffree); } else { if (thousands) - format = " %*j'd %*j'd"; + format = " {:inodes-used/%*j'd} {:inodes-free/%*j'd}"; else - format = " %*jd %*jd"; - (void)printf(format, mwp->iused, (intmax_t)used, + format = " {:inodes-used/%*jd} {:inodes-free/%*jd}"; + xo_emit(format, mwp->iused, (intmax_t)used, mwp->ifree, (intmax_t)sfsp->f_ffree); } - (void)printf(" %4.0f%% ", inodes == 0 ? 100.0 : - (double)used / (double)inodes * 100.0); + xo_emit(" {:inodes-used-percent/%4.0f}{U:%%} ", + inodes == 0 ? 100.0 : + (double)used / (double)inodes * 100.0); } else - (void)printf(" "); + xo_emit(" "); if (strncmp(sfsp->f_mntfromname, "total", MNAMELEN) != 0) - (void)printf(" %s", sfsp->f_mntonname); - (void)printf("\n"); + xo_emit(" {:mounted-on}", sfsp->f_mntonname); + xo_emit("\n"); + xo_close_instance("filesystem"); } static void @@ -564,7 +588,7 @@ static void usage(void) { - (void)fprintf(stderr, + xo_error( "usage: df [-b | -g | -H | -h | -k | -m | -P] [-acilnT] [-t type] [-,]\n" " [file | filesystem ...]\n"); exit(EX_USAGE); @@ -579,24 +603,24 @@ makenetvfslist(void) int cnt, i, maxvfsconf; if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) { - warn("sysctl(vfs.conflist)"); + xo_warn("sysctl(vfs.conflist)"); return (NULL); } xvfsp = malloc(buflen); if (xvfsp == NULL) { - warnx("malloc failed"); + xo_warnx("malloc failed"); return (NULL); } keep_xvfsp = xvfsp; if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { - warn("sysctl(vfs.conflist)"); + xo_warn("sysctl(vfs.conflist)"); free(keep_xvfsp); return (NULL); } maxvfsconf = buflen / sizeof(struct xvfsconf); if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) { - warnx("malloc failed"); + xo_warnx("malloc failed"); free(keep_xvfsp); return (NULL); } @@ -605,7 +629,7 @@ makenetvfslist(void) if (xvfsp->vfc_flags & VFCF_NETWORK) { listptr[cnt++] = strdup(xvfsp->vfc_name); if (listptr[cnt-1] == NULL) { - warnx("malloc failed"); + xo_warnx("malloc failed"); free(listptr); free(keep_xvfsp); return (NULL); @@ -617,7 +641,7 @@ makenetvfslist(void) if (cnt == 0 || (str = malloc(sizeof(char) * (32 * cnt + cnt + 2))) == NULL) { if (cnt > 0) - warnx("malloc failed"); + xo_warnx("malloc failed"); free(listptr); free(keep_xvfsp); return (NULL); Modified: projects/sendfile/bin/sh/expand.c ============================================================================== --- projects/sendfile/bin/sh/expand.c Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/bin/sh/expand.c Tue Nov 11 19:02:30 2014 (r274392) @@ -862,7 +862,7 @@ varisset(const char *name, int nulok) static void strtodest(const char *p, int flag, int subtype, int quoted) { - if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH) + if (flag & (EXP_FULL | EXP_CASE | EXP_REDIR) && subtype != VSLENGTH) STPUTS_QUOTES(p, quoted ? DQSYNTAX : BASESYNTAX, expdest); else STPUTS(p, expdest); @@ -878,7 +878,7 @@ varvalue(const char *name, int quoted, i int num; char *p; int i; - char sep; + char sep[2]; char **ap; switch (*name) { @@ -912,15 +912,18 @@ varvalue(const char *name, int quoted, i /* FALLTHROUGH */ case '*': if (ifsset()) - sep = ifsval()[0]; + sep[0] = ifsval()[0]; else - sep = ' '; + sep[0] = ' '; + sep[1] = '\0'; for (ap = shellparam.p ; (p = *ap++) != NULL ; ) { strtodest(p, flag, subtype, quoted); if (!*ap) break; - if (sep || (flag & EXP_FULL && !quoted && **ap != '\0')) - STPUTC(sep, expdest); + if (sep[0]) + strtodest(sep, flag, subtype, quoted); + else if (flag & EXP_FULL && !quoted && **ap != '\0') + STPUTC('\0', expdest); } return; default: Modified: projects/sendfile/bin/sh/sh.1 ============================================================================== --- projects/sendfile/bin/sh/sh.1 Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/bin/sh/sh.1 Tue Nov 11 19:02:30 2014 (r274392) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd September 21, 2014 +.Dd November 7, 2014 .Dt SH 1 .Os .Sh NAME @@ -2522,7 +2522,8 @@ and so on, decreasing the value of .Li $# by one. -If there are zero positional parameters, shifting does not do anything. +For portability, shifting if there are zero positional parameters +should be avoided, since the shell may abort. .It Ic test A built-in equivalent of .Xr test 1 . Modified: projects/sendfile/bin/sh/tests/expansion/Makefile ============================================================================== --- projects/sendfile/bin/sh/tests/expansion/Makefile Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/bin/sh/tests/expansion/Makefile Tue Nov 11 19:02:30 2014 (r274392) @@ -72,6 +72,7 @@ FILES+= plus-minus7.0 FILES+= plus-minus8.0 FILES+= question1.0 FILES+= readonly1.0 +FILES+= redir1.0 FILES+= set-u1.0 FILES+= set-u2.0 FILES+= set-u3.0 Copied: projects/sendfile/bin/sh/tests/expansion/redir1.0 (from r274390, head/bin/sh/tests/expansion/redir1.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/bin/sh/tests/expansion/redir1.0 Tue Nov 11 19:02:30 2014 (r274392, copy of r274390, head/bin/sh/tests/expansion/redir1.0) @@ -0,0 +1,26 @@ +# $FreeBSD$ + +bad=0 +for i in 0 1 2 3; do + for j in 0 1 2 3 4 5 6 7; do + for k in 0 1 2 3 4 5 6 7; do + case $i$j$k in + 000) continue ;; + esac + set -- "$(printf \\$i$j$k@)" + set -- "${1%@}" + ff= + for f in /dev/null /dev/zero /; do + if [ -e "$f" ] && [ ! -e "$f$1" ]; then + ff=$f + fi + done + [ -n "$ff" ] || continue + if { true <$ff$1; } 2>/dev/null; then + echo "Bad: $i$j$k ($ff)" >&2 + : $((bad += 1)) + fi + done + done +done +exit $((bad ? 2 : 0)) Modified: projects/sendfile/bin/sh/tests/parameters/Makefile ============================================================================== --- projects/sendfile/bin/sh/tests/parameters/Makefile Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/bin/sh/tests/parameters/Makefile Tue Nov 11 19:02:30 2014 (r274392) @@ -18,6 +18,8 @@ FILES+= positional2.0 FILES+= positional3.0 FILES+= positional4.0 FILES+= positional5.0 +FILES+= positional6.0 +FILES+= positional7.0 FILES+= pwd1.0 FILES+= pwd2.0 Copied: projects/sendfile/bin/sh/tests/parameters/positional6.0 (from r274390, head/bin/sh/tests/parameters/positional6.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/bin/sh/tests/parameters/positional6.0 Tue Nov 11 19:02:30 2014 (r274392, copy of r274390, head/bin/sh/tests/parameters/positional6.0) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +IFS=? +set p r +v=pqrs +r=${v#"$*"} +[ "$r" = pqrs ] Copied: projects/sendfile/bin/sh/tests/parameters/positional7.0 (from r274390, head/bin/sh/tests/parameters/positional7.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/bin/sh/tests/parameters/positional7.0 Tue Nov 11 19:02:30 2014 (r274392, copy of r274390, head/bin/sh/tests/parameters/positional7.0) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +set -- / '' +IFS=* +set -- "$*" +IFS=: +args="$*" +[ "$#:$args" = "1:/*" ] Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Nov 11 19:02:30 2014 (r274392) @@ -77,9 +77,11 @@ #ifndef lint extern boolean_t zfs_recover; extern uint64_t zfs_arc_max, zfs_arc_meta_limit; +extern int zfs_vdev_async_read_max_active; #else boolean_t zfs_recover; uint64_t zfs_arc_max, zfs_arc_meta_limit; +int zfs_vdev_async_read_max_active; #endif const char cmdname[] = "zdb"; @@ -2145,6 +2147,8 @@ dump_label(const char *dev) (void) close(fd); } +static uint64_t num_large_blocks; + /*ARGSUSED*/ static int dump_one_dir(const char *dsname, void *arg) @@ -2157,6 +2161,8 @@ dump_one_dir(const char *dsname, void *a (void) printf("Could not open %s, error %d\n", dsname, error); return (0); } + if (dmu_objset_ds(os)->ds_large_blocks) + num_large_blocks++; dump_dir(os); dmu_objset_disown(os, FTAG); fuid_table_destroy(); @@ -2167,7 +2173,7 @@ dump_one_dir(const char *dsname, void *a /* * Block statistics. */ -#define PSIZE_HISTO_SIZE (SPA_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 1) +#define PSIZE_HISTO_SIZE (SPA_OLD_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 2) typedef struct zdb_blkstats { uint64_t zb_asize; uint64_t zb_lsize; @@ -2232,7 +2238,15 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t * zb->zb_lsize += BP_GET_LSIZE(bp); zb->zb_psize += BP_GET_PSIZE(bp); zb->zb_count++; - zb->zb_psize_histogram[BP_GET_PSIZE(bp) >> SPA_MINBLOCKSHIFT]++; + + /* + * The histogram is only big enough to record blocks up to + * SPA_OLD_MAXBLOCKSIZE; larger blocks go into the last, + * "other", bucket. + */ + int idx = BP_GET_PSIZE(bp) >> SPA_MINBLOCKSHIFT; + idx = MIN(idx, SPA_OLD_MAXBLOCKSIZE / SPA_MINBLOCKSIZE + 1); + zb->zb_psize_histogram[idx]++; zb->zb_gangs += BP_COUNT_GANG(bp); @@ -2384,8 +2398,14 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog zcb->zcb_readfails = 0; - if (dump_opt['b'] < 5 && - gethrtime() > zcb->zcb_lastprint + NANOSEC) { + /* only call gethrtime() every 100 blocks */ + static int iters; + if (++iters > 100) + iters = 0; + else + return (0); + + if (dump_opt['b'] < 5 && gethrtime() > zcb->zcb_lastprint + NANOSEC) { uint64_t now = gethrtime(); char buf[10]; uint64_t bytes = zcb->zcb_type[ZB_TOTAL][ZDB_OT_TOTAL].zb_asize; @@ -2494,6 +2514,14 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb) (longlong_t)vd->vdev_ms_count); msp->ms_ops = &zdb_metaslab_ops; + + /* + * We don't want to spend the CPU + * manipulating the size-ordered + * tree, so clear the range_tree + * ops. + */ + msp->ms_tree->rt_ops = NULL; VERIFY0(space_map_load(msp->ms_sm, msp->ms_tree, SM_ALLOC)); msp->ms_loaded = B_TRUE; @@ -2930,6 +2958,7 @@ dump_zpool(spa_t *spa) dump_metaslab_groups(spa); if (dump_opt['d'] || dump_opt['i']) { + uint64_t refcount; dump_dir(dp->dp_meta_objset); if (dump_opt['d'] >= 3) { dump_bpobj(&spa->spa_deferred_bpobj, @@ -2949,8 +2978,21 @@ dump_zpool(spa_t *spa) } (void) dmu_objset_find(spa_name(spa), dump_one_dir, NULL, DS_FIND_SNAPSHOTS | DS_FIND_CHILDREN); + + (void) feature_get_refcount(spa, + &spa_feature_table[SPA_FEATURE_LARGE_BLOCKS], &refcount); + if (num_large_blocks != refcount) { + (void) printf("large_blocks feature refcount mismatch: " + "expected %lld != actual %lld\n", + (longlong_t)num_large_blocks, + (longlong_t)refcount); + rc = 2; + } else { + (void) printf("Verified large_blocks feature refcount " + "is correct (%llu)\n", (longlong_t)refcount); + } } - if (dump_opt['b'] || dump_opt['c']) + if (rc == 0 && (dump_opt['b'] || dump_opt['c'])) rc = dump_block_stats(spa); if (rc == 0) @@ -3508,6 +3550,13 @@ main(int argc, char **argv) */ zfs_arc_max = zfs_arc_meta_limit = 256 * 1024 * 1024; + /* + * "zdb -c" uses checksum-verifying scrub i/os which are async reads. + * "zdb -b" uses traversal prefetch which uses async reads. + * For good performance, let several of them be active at once. + */ + zfs_vdev_async_read_max_active = 10; + kernel_init(FREAD); g_zfs = libzfs_init(); ASSERT(g_zfs != NULL); Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Nov 11 19:02:30 2014 (r274392) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 30, 2014 +.Dd November 10, 2014 .Dt ZFS 8 .Os .Sh NAME @@ -179,12 +179,12 @@ .Ar bookmark .Nm .Cm send -.Op Fl DnPpRve +.Op Fl DnPpRveL .Op Fl i Ar snapshot | Fl I Ar snapshot .Ar snapshot .Nm .Cm send -.Op Fl e +.Op Fl eL .Op Fl i Ar snapshot Ns | Ns bookmark .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Nm @@ -1187,6 +1187,12 @@ systems is strongly discouraged, and may .Pp The size specified must be a power of two greater than or equal to 512 and less than or equal to 128 Kbytes. +If the +.Sy large_blocks +feature is enabled on the pool, the size may be up to 1 Mbyte. +See +.Xr zpool-features 7 +for details on ZFS feature flags. .Pp Changing the file system's .Sy recordsize @@ -2477,7 +2483,7 @@ feature. .It Xo .Nm .Cm send -.Op Fl DnPpRve +.Op Fl DnPpRveL .Op Fl i Ar snapshot | Fl I Ar snapshot .Ar snapshot .Xc @@ -2549,6 +2555,22 @@ be used regardless of the dataset's property, but performance will be much better if the filesystem uses a dedup-capable checksum (eg. .Sy sha256 ) . +.It Fl L +Generate a stream which may contain blocks larger than 128KB. +This flag +has no effect if the +.Sy large_blocks +pool feature is disabled, or if the +.Sy recordsize +property of this filesystem has never been set above 128KB. +The receiving system must have the +.Sy large_blocks +pool feature enabled as well. +See +.Xr zpool-features 7 +for details on ZFS feature flags and the +.Sy large_blocks +feature. .It Fl e Generate a more compact stream by using WRITE_EMBEDDED records for blocks which are stored more compactly on disk by the @@ -2596,7 +2618,7 @@ on future versions of .It Xo .Nm .Cm send -.Op Fl e +.Op Fl eL .Op Fl i Ar snapshot Ns | Ns Ar bookmark .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Xc @@ -2622,6 +2644,22 @@ specified as the last component of the n If the incremental target is a clone, the incremental source can be the origin snapshot, or an earlier snapshot in the origin's filesystem, or the origin's origin, etc. +.It Fl L +Generate a stream which may contain blocks larger than 128KB. +This flag +has no effect if the +.Sy large_blocks +pool feature is disabled, or if the +.Sy recordsize +property of this filesystem has never been set above 128KB. +The receiving system must have the +.Sy large_blocks +pool feature enabled as well. +See +.Xr zpool-features 7 +for details on ZFS feature flags and the +.Sy large_blocks +feature. .It Fl e Generate a more compact stream by using WRITE_EMBEDDED records for blocks which are stored more compactly on disk by the Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Nov 11 19:02:30 2014 (r274392) @@ -274,9 +274,9 @@ get_usage(zfs_help_t idx) case HELP_ROLLBACK: return (gettext("\trollback [-rRf] <snapshot>\n")); case HELP_SEND: - return (gettext("\tsend [-DnPpRve] [-[iI] snapshot] " + return (gettext("\tsend [-DnPpRvLe] [-[iI] snapshot] " "<snapshot>\n" - "\tsend [-e] [-i snapshot|bookmark] " + "\tsend [-Le] [-i snapshot|bookmark] " "<filesystem|volume|snapshot>\n")); case HELP_SET: return (gettext("\tset <property=value> " @@ -3709,7 +3709,7 @@ zfs_do_send(int argc, char **argv) boolean_t extraverbose = B_FALSE; /* check options */ - while ((c = getopt(argc, argv, ":i:I:RDpvnPe")) != -1) { + while ((c = getopt(argc, argv, ":i:I:RDpvnPLe")) != -1) { switch (c) { case 'i': if (fromname) @@ -3744,6 +3744,9 @@ zfs_do_send(int argc, char **argv) case 'n': flags.dryrun = B_TRUE; break; + case 'L': + flags.largeblock = B_TRUE; + break; case 'e': flags.embed_data = B_TRUE; break; @@ -3800,6 +3803,8 @@ zfs_do_send(int argc, char **argv) if (zhp == NULL) return (1); + if (flags.largeblock) + lzc_flags |= LZC_SEND_FLAG_LARGE_BLOCK; if (flags.embed_data) lzc_flags |= LZC_SEND_FLAG_EMBED_DATA; Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Tue Nov 11 19:02:30 2014 (r274392) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 1, 2014 +.Dd November 10, 2014 .Dt ZPOOL-FEATURES 7 .Os .Sh NAME @@ -427,6 +427,33 @@ This feature becomes as soon as it is enabled and will never return to being .Sy enabled . +.It Sy large_blocks +.Bl -column "READ\-ONLY COMPATIBLE" "org.open-zfs:large_block" +.It GUID Ta org.open-zfs:large_block +.It READ\-ONLY COMPATIBLE Ta no +.It DEPENDENCIES Ta extensible_dataset +.El +.Pp +The +.Sy large_block +feature allows the record size on a dataset to be +set larger than 128KB. +.Pp +This feature becomes +.Sy active +once a +.Sy recordsize +property has been set larger than 128KB, and will return to being +.Sy enabled +once all filesystems that have ever had their recordsize larger than 128KB +are destroyed. +.Pp +Please note that booting from datasets that have recordsize greater than +128KB is +.Em NOT +supported by the +.Fx +boot loader. .El .Sh SEE ALSO .Xr zpool 8 Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c Tue Nov 11 18:54:57 2014 (r274391) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c Tue Nov 11 19:02:30 2014 (r274392) @@ -54,7 +54,6 @@ uint64_t total_stream_len = 0; FILE *send_stream = 0; boolean_t do_byteswap = B_FALSE; boolean_t do_cksum = B_TRUE; -#define INITIAL_BUFLEN (1<<20) static void usage(void) @@ -67,6 +66,18 @@ usage(void) exit(1); } +static void * +safe_malloc(size_t size) +{ + void *rv = malloc(size); + if (rv == NULL) { + (void) fprintf(stderr, "ERROR; failed to allocate %zu bytes\n", + size); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411111902.sABJ2W9I053001>