Date: Mon, 8 May 2017 19:27:44 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r317971 - in projects/clang500-import: . bin/sh bin/sh/tests/builtins bin/stty contrib/ipfilter/tools contrib/less contrib/netbsd-tests/usr.bin/grep contrib/openpam contrib/openpam/bin ... Message-ID: <201705081927.v48JRi1A099157@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Mon May 8 19:27:44 2017 New Revision: 317971 URL: https://svnweb.freebsd.org/changeset/base/317971 Log: Merge ^/head r317808 through r317970. Added: projects/clang500-import/bin/sh/tests/builtins/locale2.0 - copied unchanged from r317970, head/bin/sh/tests/builtins/locale2.0 projects/clang500-import/contrib/zstd/contrib/cleanTabs - copied unchanged from r317970, head/contrib/zstd/contrib/cleanTabs projects/clang500-import/contrib/zstd/programs/zstd.1.md - copied unchanged from r317970, head/contrib/zstd/programs/zstd.1.md projects/clang500-import/share/man/man4/adm6996fc.4 - copied unchanged from r317970, head/share/man/man4/adm6996fc.4 projects/clang500-import/share/man/man4/e6060sw.4 - copied unchanged from r317970, head/share/man/man4/e6060sw.4 projects/clang500-import/share/man/man4/ksz8995ma.4 - copied unchanged from r317970, head/share/man/man4/ksz8995ma.4 projects/clang500-import/sys/arm/conf/RT1310 - copied unchanged from r317970, head/sys/arm/conf/RT1310 projects/clang500-import/sys/arm/ralink/ - copied from r317970, head/sys/arm/ralink/ projects/clang500-import/sys/boot/fdt/dts/arm/rt1310a.dtsi - copied unchanged from r317970, head/sys/boot/fdt/dts/arm/rt1310a.dtsi projects/clang500-import/sys/boot/fdt/dts/arm/wzr2-g300n.dts - copied unchanged from r317970, head/sys/boot/fdt/dts/arm/wzr2-g300n.dts projects/clang500-import/sys/gnu/dts/mips/MZK-W04N-XX.dts - copied unchanged from r317970, head/sys/gnu/dts/mips/MZK-W04N-XX.dts projects/clang500-import/sys/mips/conf/RT2880_FDT - copied unchanged from r317970, head/sys/mips/conf/RT2880_FDT projects/clang500-import/sys/mips/mediatek/std.rt2880 - copied unchanged from r317970, head/sys/mips/mediatek/std.rt2880 projects/clang500-import/usr.bin/csplit/tests/ - copied from r317970, head/usr.bin/csplit/tests/ Deleted: projects/clang500-import/contrib/zstd/.gitignore projects/clang500-import/contrib/zstd/.travis.yml Modified: projects/clang500-import/Makefile.inc1 projects/clang500-import/bin/sh/TOUR projects/clang500-import/bin/sh/eval.c projects/clang500-import/bin/sh/exec.c projects/clang500-import/bin/sh/expand.c projects/clang500-import/bin/sh/options.c projects/clang500-import/bin/sh/tests/builtins/Makefile projects/clang500-import/bin/sh/var.c projects/clang500-import/bin/stty/stty.1 projects/clang500-import/contrib/ipfilter/tools/ippool.c projects/clang500-import/contrib/less/LICENSE projects/clang500-import/contrib/less/NEWS projects/clang500-import/contrib/less/README projects/clang500-import/contrib/less/brac.c projects/clang500-import/contrib/less/ch.c projects/clang500-import/contrib/less/charset.c projects/clang500-import/contrib/less/charset.h projects/clang500-import/contrib/less/cmd.h projects/clang500-import/contrib/less/cmdbuf.c projects/clang500-import/contrib/less/command.c projects/clang500-import/contrib/less/compose.uni projects/clang500-import/contrib/less/cvt.c projects/clang500-import/contrib/less/decode.c projects/clang500-import/contrib/less/edit.c projects/clang500-import/contrib/less/filename.c projects/clang500-import/contrib/less/forwback.c projects/clang500-import/contrib/less/funcs.h projects/clang500-import/contrib/less/help.c projects/clang500-import/contrib/less/ifile.c projects/clang500-import/contrib/less/input.c projects/clang500-import/contrib/less/jump.c projects/clang500-import/contrib/less/less.h projects/clang500-import/contrib/less/less.hlp projects/clang500-import/contrib/less/less.nro projects/clang500-import/contrib/less/lessecho.c projects/clang500-import/contrib/less/lessecho.nro projects/clang500-import/contrib/less/lesskey.c projects/clang500-import/contrib/less/lesskey.h projects/clang500-import/contrib/less/lesskey.nro projects/clang500-import/contrib/less/lglob.h projects/clang500-import/contrib/less/line.c projects/clang500-import/contrib/less/linenum.c projects/clang500-import/contrib/less/lsystem.c projects/clang500-import/contrib/less/main.c projects/clang500-import/contrib/less/mark.c projects/clang500-import/contrib/less/mkhelp.c projects/clang500-import/contrib/less/mkutable projects/clang500-import/contrib/less/optfunc.c projects/clang500-import/contrib/less/option.c projects/clang500-import/contrib/less/option.h projects/clang500-import/contrib/less/opttbl.c projects/clang500-import/contrib/less/os.c projects/clang500-import/contrib/less/output.c projects/clang500-import/contrib/less/pattern.c projects/clang500-import/contrib/less/pattern.h projects/clang500-import/contrib/less/pckeys.h projects/clang500-import/contrib/less/position.c projects/clang500-import/contrib/less/position.h projects/clang500-import/contrib/less/prompt.c projects/clang500-import/contrib/less/regexp.c projects/clang500-import/contrib/less/screen.c projects/clang500-import/contrib/less/scrsize.c projects/clang500-import/contrib/less/search.c projects/clang500-import/contrib/less/signal.c projects/clang500-import/contrib/less/tags.c projects/clang500-import/contrib/less/ttyin.c projects/clang500-import/contrib/less/ubin.uni projects/clang500-import/contrib/less/version.c projects/clang500-import/contrib/less/wide.uni projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh projects/clang500-import/contrib/openpam/HISTORY projects/clang500-import/contrib/openpam/Makefile.am projects/clang500-import/contrib/openpam/Makefile.in projects/clang500-import/contrib/openpam/RELNOTES projects/clang500-import/contrib/openpam/autogen.sh projects/clang500-import/contrib/openpam/bin/Makefile.am projects/clang500-import/contrib/openpam/bin/Makefile.in projects/clang500-import/contrib/openpam/bin/openpam_dump_policy/Makefile.am projects/clang500-import/contrib/openpam/bin/openpam_dump_policy/Makefile.in projects/clang500-import/contrib/openpam/bin/openpam_dump_policy/openpam_dump_policy.c projects/clang500-import/contrib/openpam/bin/pamtest/Makefile.am projects/clang500-import/contrib/openpam/bin/pamtest/Makefile.in projects/clang500-import/contrib/openpam/bin/pamtest/pamtest.1 projects/clang500-import/contrib/openpam/bin/pamtest/pamtest.c projects/clang500-import/contrib/openpam/bin/su/Makefile.am projects/clang500-import/contrib/openpam/bin/su/Makefile.in projects/clang500-import/contrib/openpam/bin/su/su.1 projects/clang500-import/contrib/openpam/bin/su/su.c projects/clang500-import/contrib/openpam/configure projects/clang500-import/contrib/openpam/configure.ac projects/clang500-import/contrib/openpam/doc/Makefile.am projects/clang500-import/contrib/openpam/doc/Makefile.in projects/clang500-import/contrib/openpam/doc/man/Makefile.am projects/clang500-import/contrib/openpam/doc/man/Makefile.in projects/clang500-import/contrib/openpam/doc/man/openpam.3 projects/clang500-import/contrib/openpam/doc/man/openpam.man projects/clang500-import/contrib/openpam/doc/man/openpam_borrow_cred.3 projects/clang500-import/contrib/openpam/doc/man/openpam_free_data.3 projects/clang500-import/contrib/openpam/doc/man/openpam_free_envlist.3 projects/clang500-import/contrib/openpam/doc/man/openpam_get_feature.3 projects/clang500-import/contrib/openpam/doc/man/openpam_get_option.3 projects/clang500-import/contrib/openpam/doc/man/openpam_log.3 projects/clang500-import/contrib/openpam/doc/man/openpam_nullconv.3 projects/clang500-import/contrib/openpam/doc/man/openpam_readline.3 projects/clang500-import/contrib/openpam/doc/man/openpam_readlinev.3 projects/clang500-import/contrib/openpam/doc/man/openpam_readword.3 projects/clang500-import/contrib/openpam/doc/man/openpam_restore_cred.3 projects/clang500-import/contrib/openpam/doc/man/openpam_set_feature.3 projects/clang500-import/contrib/openpam/doc/man/openpam_set_option.3 projects/clang500-import/contrib/openpam/doc/man/openpam_straddch.3 projects/clang500-import/contrib/openpam/doc/man/openpam_subst.3 projects/clang500-import/contrib/openpam/doc/man/openpam_ttyconv.3 projects/clang500-import/contrib/openpam/doc/man/pam.3 projects/clang500-import/contrib/openpam/doc/man/pam.conf.5 projects/clang500-import/contrib/openpam/doc/man/pam.man projects/clang500-import/contrib/openpam/doc/man/pam_acct_mgmt.3 projects/clang500-import/contrib/openpam/doc/man/pam_authenticate.3 projects/clang500-import/contrib/openpam/doc/man/pam_chauthtok.3 projects/clang500-import/contrib/openpam/doc/man/pam_close_session.3 projects/clang500-import/contrib/openpam/doc/man/pam_conv.3 projects/clang500-import/contrib/openpam/doc/man/pam_end.3 projects/clang500-import/contrib/openpam/doc/man/pam_error.3 projects/clang500-import/contrib/openpam/doc/man/pam_get_authtok.3 projects/clang500-import/contrib/openpam/doc/man/pam_get_data.3 projects/clang500-import/contrib/openpam/doc/man/pam_get_item.3 projects/clang500-import/contrib/openpam/doc/man/pam_get_user.3 projects/clang500-import/contrib/openpam/doc/man/pam_getenv.3 projects/clang500-import/contrib/openpam/doc/man/pam_getenvlist.3 projects/clang500-import/contrib/openpam/doc/man/pam_info.3 projects/clang500-import/contrib/openpam/doc/man/pam_open_session.3 projects/clang500-import/contrib/openpam/doc/man/pam_prompt.3 projects/clang500-import/contrib/openpam/doc/man/pam_putenv.3 projects/clang500-import/contrib/openpam/doc/man/pam_set_data.3 projects/clang500-import/contrib/openpam/doc/man/pam_set_item.3 projects/clang500-import/contrib/openpam/doc/man/pam_setcred.3 projects/clang500-import/contrib/openpam/doc/man/pam_setenv.3 projects/clang500-import/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 projects/clang500-import/contrib/openpam/doc/man/pam_sm_authenticate.3 projects/clang500-import/contrib/openpam/doc/man/pam_sm_chauthtok.3 projects/clang500-import/contrib/openpam/doc/man/pam_sm_close_session.3 projects/clang500-import/contrib/openpam/doc/man/pam_sm_open_session.3 projects/clang500-import/contrib/openpam/doc/man/pam_sm_setcred.3 projects/clang500-import/contrib/openpam/doc/man/pam_start.3 projects/clang500-import/contrib/openpam/doc/man/pam_strerror.3 projects/clang500-import/contrib/openpam/doc/man/pam_verror.3 projects/clang500-import/contrib/openpam/doc/man/pam_vinfo.3 projects/clang500-import/contrib/openpam/doc/man/pam_vprompt.3 projects/clang500-import/contrib/openpam/include/Makefile.am projects/clang500-import/contrib/openpam/include/Makefile.in projects/clang500-import/contrib/openpam/include/security/Makefile.am projects/clang500-import/contrib/openpam/include/security/Makefile.in projects/clang500-import/contrib/openpam/include/security/openpam.h projects/clang500-import/contrib/openpam/include/security/openpam_attr.h projects/clang500-import/contrib/openpam/include/security/openpam_version.h projects/clang500-import/contrib/openpam/include/security/pam_appl.h projects/clang500-import/contrib/openpam/include/security/pam_constants.h projects/clang500-import/contrib/openpam/include/security/pam_modules.h projects/clang500-import/contrib/openpam/include/security/pam_types.h projects/clang500-import/contrib/openpam/lib/Makefile.am projects/clang500-import/contrib/openpam/lib/Makefile.in projects/clang500-import/contrib/openpam/lib/libpam/Makefile.am projects/clang500-import/contrib/openpam/lib/libpam/Makefile.in projects/clang500-import/contrib/openpam/lib/libpam/openpam_asprintf.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_asprintf.h projects/clang500-import/contrib/openpam/lib/libpam/openpam_borrow_cred.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_check_owner_perms.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_configure.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_constants.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_constants.h projects/clang500-import/contrib/openpam/lib/libpam/openpam_cred.h projects/clang500-import/contrib/openpam/lib/libpam/openpam_ctype.h projects/clang500-import/contrib/openpam/lib/libpam/openpam_debug.h projects/clang500-import/contrib/openpam/lib/libpam/openpam_dispatch.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_dlfunc.h projects/clang500-import/contrib/openpam/lib/libpam/openpam_dynamic.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_features.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_features.h projects/clang500-import/contrib/openpam/lib/libpam/openpam_findenv.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_free_data.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_free_envlist.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_get_feature.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_get_option.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_impl.h projects/clang500-import/contrib/openpam/lib/libpam/openpam_load.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_log.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_nullconv.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_readline.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_readlinev.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_readword.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_restore_cred.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_set_feature.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_set_option.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_static.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_straddch.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_strlcat.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_strlcat.h projects/clang500-import/contrib/openpam/lib/libpam/openpam_strlcmp.h projects/clang500-import/contrib/openpam/lib/libpam/openpam_strlcpy.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_strlcpy.h projects/clang500-import/contrib/openpam/lib/libpam/openpam_strlset.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_strlset.h projects/clang500-import/contrib/openpam/lib/libpam/openpam_subst.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_ttyconv.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_vasprintf.c projects/clang500-import/contrib/openpam/lib/libpam/openpam_vasprintf.h projects/clang500-import/contrib/openpam/lib/libpam/pam_acct_mgmt.c projects/clang500-import/contrib/openpam/lib/libpam/pam_authenticate.c projects/clang500-import/contrib/openpam/lib/libpam/pam_authenticate_secondary.c projects/clang500-import/contrib/openpam/lib/libpam/pam_chauthtok.c projects/clang500-import/contrib/openpam/lib/libpam/pam_close_session.c projects/clang500-import/contrib/openpam/lib/libpam/pam_end.c projects/clang500-import/contrib/openpam/lib/libpam/pam_error.c projects/clang500-import/contrib/openpam/lib/libpam/pam_get_authtok.c projects/clang500-import/contrib/openpam/lib/libpam/pam_get_data.c projects/clang500-import/contrib/openpam/lib/libpam/pam_get_item.c projects/clang500-import/contrib/openpam/lib/libpam/pam_get_mapped_authtok.c projects/clang500-import/contrib/openpam/lib/libpam/pam_get_mapped_username.c projects/clang500-import/contrib/openpam/lib/libpam/pam_get_user.c projects/clang500-import/contrib/openpam/lib/libpam/pam_getenv.c projects/clang500-import/contrib/openpam/lib/libpam/pam_getenvlist.c projects/clang500-import/contrib/openpam/lib/libpam/pam_info.c projects/clang500-import/contrib/openpam/lib/libpam/pam_open_session.c projects/clang500-import/contrib/openpam/lib/libpam/pam_prompt.c projects/clang500-import/contrib/openpam/lib/libpam/pam_putenv.c projects/clang500-import/contrib/openpam/lib/libpam/pam_set_data.c projects/clang500-import/contrib/openpam/lib/libpam/pam_set_item.c projects/clang500-import/contrib/openpam/lib/libpam/pam_set_mapped_authtok.c projects/clang500-import/contrib/openpam/lib/libpam/pam_set_mapped_username.c projects/clang500-import/contrib/openpam/lib/libpam/pam_setcred.c projects/clang500-import/contrib/openpam/lib/libpam/pam_setenv.c projects/clang500-import/contrib/openpam/lib/libpam/pam_sm_acct_mgmt.c projects/clang500-import/contrib/openpam/lib/libpam/pam_sm_authenticate.c projects/clang500-import/contrib/openpam/lib/libpam/pam_sm_authenticate_secondary.c projects/clang500-import/contrib/openpam/lib/libpam/pam_sm_chauthtok.c projects/clang500-import/contrib/openpam/lib/libpam/pam_sm_close_session.c projects/clang500-import/contrib/openpam/lib/libpam/pam_sm_get_mapped_authtok.c projects/clang500-import/contrib/openpam/lib/libpam/pam_sm_get_mapped_username.c projects/clang500-import/contrib/openpam/lib/libpam/pam_sm_open_session.c projects/clang500-import/contrib/openpam/lib/libpam/pam_sm_set_mapped_authtok.c projects/clang500-import/contrib/openpam/lib/libpam/pam_sm_set_mapped_username.c projects/clang500-import/contrib/openpam/lib/libpam/pam_sm_setcred.c projects/clang500-import/contrib/openpam/lib/libpam/pam_start.c projects/clang500-import/contrib/openpam/lib/libpam/pam_strerror.c projects/clang500-import/contrib/openpam/lib/libpam/pam_verror.c projects/clang500-import/contrib/openpam/lib/libpam/pam_vinfo.c projects/clang500-import/contrib/openpam/lib/libpam/pam_vprompt.c projects/clang500-import/contrib/openpam/misc/gendoc.pl projects/clang500-import/contrib/openpam/mkpkgng.in projects/clang500-import/contrib/openpam/modules/Makefile.am projects/clang500-import/contrib/openpam/modules/Makefile.in projects/clang500-import/contrib/openpam/modules/pam_deny/Makefile.am projects/clang500-import/contrib/openpam/modules/pam_deny/Makefile.in projects/clang500-import/contrib/openpam/modules/pam_deny/pam_deny.c projects/clang500-import/contrib/openpam/modules/pam_permit/Makefile.am projects/clang500-import/contrib/openpam/modules/pam_permit/Makefile.in projects/clang500-import/contrib/openpam/modules/pam_permit/pam_permit.c projects/clang500-import/contrib/openpam/modules/pam_return/Makefile.am projects/clang500-import/contrib/openpam/modules/pam_return/Makefile.in projects/clang500-import/contrib/openpam/modules/pam_return/pam_return.c projects/clang500-import/contrib/openpam/modules/pam_unix/Makefile.am projects/clang500-import/contrib/openpam/modules/pam_unix/Makefile.in projects/clang500-import/contrib/openpam/modules/pam_unix/pam_unix.c projects/clang500-import/contrib/openpam/t/Makefile.am projects/clang500-import/contrib/openpam/t/Makefile.in projects/clang500-import/contrib/openpam/t/t_openpam_ctype.c projects/clang500-import/contrib/openpam/t/t_openpam_dispatch.c projects/clang500-import/contrib/openpam/t/t_openpam_readlinev.c projects/clang500-import/contrib/openpam/t/t_openpam_readword.c projects/clang500-import/contrib/openpam/t/t_pam_conv.c projects/clang500-import/contrib/openpam/t/t_pam_conv.h projects/clang500-import/contrib/zstd/Makefile projects/clang500-import/contrib/zstd/NEWS projects/clang500-import/contrib/zstd/README.md projects/clang500-import/contrib/zstd/appveyor.yml projects/clang500-import/contrib/zstd/circle.yml projects/clang500-import/contrib/zstd/contrib/pzstd/Options.cpp projects/clang500-import/contrib/zstd/contrib/pzstd/utils/test/ThreadPoolTest.cpp projects/clang500-import/contrib/zstd/contrib/pzstd/utils/test/WorkQueueTest.cpp projects/clang500-import/contrib/zstd/doc/educational_decoder/zstd_decompress.c projects/clang500-import/contrib/zstd/doc/images/Cspeed4.png projects/clang500-import/contrib/zstd/doc/images/Dspeed4.png projects/clang500-import/contrib/zstd/doc/images/dict-cr.png projects/clang500-import/contrib/zstd/doc/images/dict-cs.png projects/clang500-import/contrib/zstd/doc/images/dict-ds.png projects/clang500-import/contrib/zstd/doc/zstd_compression_format.md projects/clang500-import/contrib/zstd/doc/zstd_manual.html projects/clang500-import/contrib/zstd/examples/simple_compression.c projects/clang500-import/contrib/zstd/examples/streaming_compression.c projects/clang500-import/contrib/zstd/examples/streaming_decompression.c projects/clang500-import/contrib/zstd/lib/Makefile projects/clang500-import/contrib/zstd/lib/README.md projects/clang500-import/contrib/zstd/lib/common/bitstream.h projects/clang500-import/contrib/zstd/lib/common/error_private.c projects/clang500-import/contrib/zstd/lib/common/fse.h projects/clang500-import/contrib/zstd/lib/common/huf.h projects/clang500-import/contrib/zstd/lib/common/mem.h projects/clang500-import/contrib/zstd/lib/common/zstd_errors.h projects/clang500-import/contrib/zstd/lib/common/zstd_internal.h projects/clang500-import/contrib/zstd/lib/compress/fse_compress.c projects/clang500-import/contrib/zstd/lib/compress/zstd_compress.c projects/clang500-import/contrib/zstd/lib/compress/zstd_opt.h projects/clang500-import/contrib/zstd/lib/compress/zstdmt_compress.c projects/clang500-import/contrib/zstd/lib/decompress/zstd_decompress.c projects/clang500-import/contrib/zstd/lib/dictBuilder/cover.c projects/clang500-import/contrib/zstd/lib/dictBuilder/zdict.c projects/clang500-import/contrib/zstd/lib/dictBuilder/zdict.h projects/clang500-import/contrib/zstd/lib/legacy/zstd_v01.c projects/clang500-import/contrib/zstd/lib/legacy/zstd_v02.c projects/clang500-import/contrib/zstd/lib/legacy/zstd_v03.c projects/clang500-import/contrib/zstd/lib/legacy/zstd_v04.c projects/clang500-import/contrib/zstd/lib/legacy/zstd_v05.c projects/clang500-import/contrib/zstd/lib/legacy/zstd_v06.c projects/clang500-import/contrib/zstd/lib/zstd.h projects/clang500-import/contrib/zstd/programs/Makefile projects/clang500-import/contrib/zstd/programs/README.md projects/clang500-import/contrib/zstd/programs/bench.c projects/clang500-import/contrib/zstd/programs/dibio.c projects/clang500-import/contrib/zstd/programs/fileio.c projects/clang500-import/contrib/zstd/programs/fileio.h projects/clang500-import/contrib/zstd/programs/platform.h projects/clang500-import/contrib/zstd/programs/util.h projects/clang500-import/contrib/zstd/programs/zstd.1 projects/clang500-import/contrib/zstd/programs/zstdcli.c projects/clang500-import/contrib/zstd/tests/Makefile projects/clang500-import/contrib/zstd/tests/decodecorpus.c projects/clang500-import/contrib/zstd/tests/fullbench.c projects/clang500-import/contrib/zstd/tests/fuzzer.c projects/clang500-import/contrib/zstd/tests/paramgrill.c projects/clang500-import/contrib/zstd/tests/playTests.sh projects/clang500-import/contrib/zstd/tests/test-zstd-speed.py projects/clang500-import/contrib/zstd/tests/zbufftest.c projects/clang500-import/contrib/zstd/tests/zstreamtest.c projects/clang500-import/contrib/zstd/zlibWrapper/examples/zwrapbench.c projects/clang500-import/etc/mtree/BSD.tests.dist projects/clang500-import/lib/libc/gen/glob.c projects/clang500-import/lib/libc/sys/sigqueue.2 projects/clang500-import/lib/libstand/arp.c projects/clang500-import/lib/libstand/bootp.c projects/clang500-import/lib/libstand/bootp.h projects/clang500-import/lib/libstand/bootparam.c projects/clang500-import/lib/libstand/ether.c projects/clang500-import/lib/libstand/globals.c projects/clang500-import/lib/libstand/net.c projects/clang500-import/lib/libstand/net.h projects/clang500-import/lib/libstand/netif.c projects/clang500-import/lib/libstand/netif.h projects/clang500-import/lib/libstand/nfs.c projects/clang500-import/lib/libstand/rarp.c projects/clang500-import/lib/libstand/rpc.c projects/clang500-import/lib/libstand/rpc.h projects/clang500-import/lib/libstand/tftp.c projects/clang500-import/lib/libstand/udp.c projects/clang500-import/lib/libzstd/Makefile projects/clang500-import/libexec/ftpd/blacklist.c projects/clang500-import/libexec/ftpd/blacklist_client.h projects/clang500-import/rescue/rescue/Makefile projects/clang500-import/sbin/camcontrol/modeedit.c projects/clang500-import/sbin/dhclient/dhclient.c projects/clang500-import/sbin/dhclient/options.c projects/clang500-import/sbin/mount_nfs/mount_nfs.c projects/clang500-import/share/man/man4/Makefile projects/clang500-import/share/man/man4/etherswitch.4 projects/clang500-import/share/man/man4/sa.4 projects/clang500-import/share/man/man7/arch.7 projects/clang500-import/share/man/man9/VOP_GETPAGES.9 projects/clang500-import/share/misc/committers-ports.dot projects/clang500-import/share/mk/bsd.init.mk projects/clang500-import/share/mk/src.libnames.mk projects/clang500-import/sys/arm64/arm64/pmap.c projects/clang500-import/sys/boot/common/dev_net.c projects/clang500-import/sys/boot/efi/libefi/efinet.c projects/clang500-import/sys/boot/efi/libefi/time.c projects/clang500-import/sys/boot/efi/loader/Makefile projects/clang500-import/sys/boot/i386/libi386/pxe.c projects/clang500-import/sys/boot/i386/libi386/pxe.h projects/clang500-import/sys/boot/i386/loader/Makefile projects/clang500-import/sys/boot/ofw/libofw/ofw_net.c projects/clang500-import/sys/boot/uboot/lib/net.c projects/clang500-import/sys/cam/scsi/scsi_sa.c projects/clang500-import/sys/compat/freebsd32/freebsd32_misc.c projects/clang500-import/sys/compat/freebsd32/freebsd32_proto.h projects/clang500-import/sys/compat/freebsd32/freebsd32_syscall.h projects/clang500-import/sys/compat/freebsd32/freebsd32_syscalls.c projects/clang500-import/sys/compat/freebsd32/freebsd32_sysent.c projects/clang500-import/sys/compat/freebsd32/freebsd32_systrace_args.c projects/clang500-import/sys/compat/freebsd32/syscalls.master projects/clang500-import/sys/compat/linprocfs/linprocfs.c projects/clang500-import/sys/compat/linuxkpi/common/src/linux_compat.c projects/clang500-import/sys/conf/options.mips projects/clang500-import/sys/contrib/octeon-sdk/cvmx-app-init.h projects/clang500-import/sys/contrib/octeon-sdk/cvmx-helper-board.c projects/clang500-import/sys/dev/atkbdc/psm.c projects/clang500-import/sys/dev/cfi/cfi_core.c projects/clang500-import/sys/dev/cfi/cfi_reg.h projects/clang500-import/sys/dev/cxgbe/t4_iov.c projects/clang500-import/sys/dev/cxgbe/t4_main.c projects/clang500-import/sys/dev/cxgbe/t4_sched.c projects/clang500-import/sys/dev/cxgbe/t4_vf.c projects/clang500-import/sys/dev/cxgbe/tom/t4_cpl_io.c projects/clang500-import/sys/dev/cxgbe/tom/t4_tom.c projects/clang500-import/sys/dev/cxgbe/tom/t4_tom.h projects/clang500-import/sys/dev/etherswitch/e6000sw/e6060sw.c projects/clang500-import/sys/dev/etherswitch/infineon/adm6996fc.c projects/clang500-import/sys/dev/etherswitch/ip17x/ip17x.c projects/clang500-import/sys/dev/etherswitch/ip17x/ip17x_var.h projects/clang500-import/sys/dev/flash/mx25l.c projects/clang500-import/sys/dev/hyperv/input/hv_kbd.c projects/clang500-import/sys/dev/rt/if_rt.c projects/clang500-import/sys/dev/rt/if_rtreg.h projects/clang500-import/sys/gnu/dts/mips/rt2880.dtsi projects/clang500-import/sys/kern/kern_sig.c projects/clang500-import/sys/mips/atheros/ar531x/if_are.c projects/clang500-import/sys/mips/atheros/ar531x/if_arereg.h projects/clang500-import/sys/mips/atheros/ar934x_chip.c projects/clang500-import/sys/mips/mediatek/mtk_gpio_v1.c projects/clang500-import/sys/mips/mediatek/mtk_machdep.c projects/clang500-import/sys/mips/mediatek/mtk_soc.c projects/clang500-import/sys/mips/mediatek/mtk_soc.h projects/clang500-import/sys/modules/cxgbe/tom/Makefile projects/clang500-import/sys/net/if_lagg.c projects/clang500-import/sys/netpfil/pf/pf_ioctl.c projects/clang500-import/sys/rpc/clnt_vc.c projects/clang500-import/sys/sys/syscallsubr.h projects/clang500-import/sys/ufs/ffs/ffs_rawread.c projects/clang500-import/sys/ufs/ffs/fs.h projects/clang500-import/usr.bin/calendar/calendars/calendar.freebsd projects/clang500-import/usr.bin/csplit/Makefile projects/clang500-import/usr.bin/csplit/csplit.c projects/clang500-import/usr.bin/grep/util.c projects/clang500-import/usr.bin/less/defines.h projects/clang500-import/usr.bin/mt/mt.1 projects/clang500-import/usr.bin/resizewin/resizewin.1 projects/clang500-import/usr.bin/resizewin/resizewin.c projects/clang500-import/usr.bin/zstd/Makefile projects/clang500-import/usr.sbin/makefs/cd9660/cd9660_eltorito.c projects/clang500-import/usr.sbin/makefs/ffs.c projects/clang500-import/usr.sbin/makefs/ffs/buf.c projects/clang500-import/usr.sbin/makefs/walk.c projects/clang500-import/usr.sbin/mpsutil/mps_show.c Directory Properties: projects/clang500-import/ (props changed) projects/clang500-import/contrib/ipfilter/ (props changed) projects/clang500-import/contrib/less/ (props changed) projects/clang500-import/contrib/netbsd-tests/ (props changed) projects/clang500-import/contrib/openpam/ (props changed) projects/clang500-import/contrib/zstd/ (props changed) projects/clang500-import/sys/contrib/octeon-sdk/ (props changed) Modified: projects/clang500-import/Makefile.inc1 ============================================================================== --- projects/clang500-import/Makefile.inc1 Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/Makefile.inc1 Mon May 8 19:27:44 2017 (r317971) @@ -628,7 +628,7 @@ XCFLAGS+= ${BFLAGS} .endif .if ${MK_LIB32} != "no" && (${TARGET_ARCH} == "amd64" || \ - ${TARGET_ARCH} == "powerpc64") || ${TARGET_ARCH:Mmips64*} != "" + ${TARGET_ARCH} == "powerpc64" || ${TARGET_ARCH:Mmips64*} != "") LIBCOMPAT= 32 .include "Makefile.libcompat" .elif ${MK_LIBSOFT} != "no" && ${TARGET_ARCH} == "armv6" Modified: projects/clang500-import/bin/sh/TOUR ============================================================================== --- projects/clang500-import/bin/sh/TOUR Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/bin/sh/TOUR Mon May 8 19:27:44 2017 (r317971) @@ -24,7 +24,7 @@ programs is: program input files generates ------- ----------- --------- - mkbuiltins builtins builtins.h builtins.c + mkbuiltins builtins.def builtins.h builtins.c mknodes nodetypes nodes.h nodes.c mksyntax - syntax.h syntax.c mktokens - token.h @@ -108,10 +108,12 @@ The text field of a NARG structure point word. The text consists of ordinary characters and a number of special codes defined in parser.h. The special codes are: - CTLVAR Variable substitution - CTLENDVAR End of variable substitution + CTLVAR Parameter expansion + CTLENDVAR End of parameter expansion CTLBACKQ Command substitution CTLBACKQ|CTLQUOTE Command substitution inside double quotes + CTLARI Arithmetic expansion + CTLENDARI End of arithmetic expansion CTLESC Escape next character A variable substitution contains the following elements: @@ -130,18 +132,31 @@ stitution. The possible types are: VSQUESTION|VSNUL ${var:?text} VSASSIGN ${var=text} VSASSIGN|VSNUL ${var:=text} + VSTRIMLEFT ${var#text} + VSTRIMLEFTMAX ${var##text} + VSTRIMRIGHT ${var%text} + VSTRIMRIGHTMAX ${var%%text} + VSLENGTH ${#var} + VSERROR delayed error In addition, the type field will have the VSQUOTE flag set if the -variable is enclosed in double quotes. The name of the variable -comes next, terminated by an equals sign. If the type is not -VSNORMAL, then the text field in the substitution follows, ter- -minated by a CTLENDVAR byte. +variable is enclosed in double quotes and the VSLINENO flag if +LINENO is being expanded (the parameter name is the decimal line +number). The parameter's name comes next, terminated by an equals +sign. If the type is not VSNORMAL (including when it is VSLENGTH), +then the text field in the substitution follows, terminated by a +CTLENDVAR byte. + +The type VSERROR is used to allow parsing bad substitutions like +${var[7]} and generate an error when they are expanded. Commands in back quotes are parsed and stored in a linked list. The locations of these commands in the string are indicated by CTLBACKQ and CTLBACKQ+CTLQUOTE characters, depending upon whether the back quotes were enclosed in double quotes. +Arithmetic expansion starts with CTLARI and ends with CTLENDARI. + The character CTLESC escapes the next character, so that in case any of the CTL characters mentioned above appear in the input, they can be passed through transparently. CTLESC is also used to @@ -153,11 +168,11 @@ right. In the case of here documents wh variable and command substitution, the parser doesn't insert any CTLESC characters to begin with (so the contents of the text field can be written without any processing). Other here docu- -ments, and words which are not subject to splitting and file name -generation, have the CTLESC characters removed during the vari- -able and command substitution phase. Words which are subject to -splitting and file name generation have the CTLESC characters re- -moved as part of the file name phase. +ments, and words which are not subject to file name generation, +have the CTLESC characters removed during the variable and command +substitution phase. Words which are subject to file name +generation have the CTLESC characters removed as part of the file +name phase. EXECUTION: Command execution is handled by the following files: eval.c The top level routines. @@ -199,10 +214,10 @@ later.) The routine shellexec is the interface to the exec system call. -EXPAND.C: Arguments are processed in three passes. The first -(performed by the routine argstr) performs variable and command -substitution. The second (ifsbreakup) performs word splitting -and the third (expandmeta) performs file name generation. +EXPAND.C: As the routine argstr generates words by parameter +expansion, command substitution and arithmetic expansion, it +performs word splitting on the result. As each word is output, +the routine expandmeta performs file name generation (if enabled). VAR.C: Variables are stored in a hash table. Probably we should switch to extensible hashing. The variable name is stored in the @@ -221,8 +236,8 @@ BUILTIN COMMANDS: The procedures for ha tered throughout the code, depending on which location appears most appropriate. They can be recognized because their names al- ways end in "cmd". The mapping from names to procedures is -specified in the file builtins, which is processed by the mkbuilt- -ins command. +specified in the file builtins.def, which is processed by the +mkbuiltins command. A builtin command is invoked with argc and argv set up like a normal program. A builtin command is allowed to overwrite its @@ -230,22 +245,20 @@ arguments. Builtin routines can call ne ing. This is kind of like getopt, but you don't pass argc and argv to it. Builtin routines can also call error. This routine normally terminates the shell (or returns to the main command -loop if the shell is interactive), but when called from a builtin -command it causes the builtin command to terminate with an exit -status of 2. +loop if the shell is interactive), but when called from a non- +special builtin command it causes the builtin command to +terminate with an exit status of 2. The directory bltins contains commands which can be compiled in- dependently but can also be built into the shell for efficiency -reasons. The makefile in this directory compiles these programs -in the normal fashion (so that they can be run regardless of -whether the invoker is ash), but also creates a library named -bltinlib.a which can be linked with ash. The header file bltin.h -takes care of most of the differences between the ash and the -stand-alone environment. The user should call the main routine -"main", and #define main to be the name of the routine to use -when the program is linked into ash. This #define should appear -before bltin.h is included; bltin.h will #undef main if the pro- -gram is to be compiled stand-alone. +reasons. The header file bltin.h takes care of most of the +differences between the ash and the stand-alone environment. +The user should call the main routine "main", and #define main to +be the name of the routine to use when the program is linked into +ash. This #define should appear before bltin.h is included; +bltin.h will #undef main if the program is to be compiled +stand-alone. A similar approach is used for a few utilities from +bin and usr.bin. CD.C: This file defines the cd and pwd builtins. @@ -258,7 +271,7 @@ is called at appropriate points to actua When an interrupt is caught and no trap has been set for that signal, the routine "onint" in error.c is called. -OUTPUT: Ash uses it's own output routines. There are three out- +OUTPUT: Ash uses its own output routines. There are three out- put structures allocated. "Output" represents the standard out- put, "errout" the standard error, and "memout" contains output which is to be stored in memory. This last is used when a buil- Modified: projects/clang500-import/bin/sh/eval.c ============================================================================== --- projects/clang500-import/bin/sh/eval.c Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/bin/sh/eval.c Mon May 8 19:27:44 2017 (r317971) @@ -1222,7 +1222,7 @@ bltincmd(int argc, char **argv) return 127; } /* - * Preserve exitstatus of a previous possible redirection + * Preserve exitstatus of a previous possible command substitution * as POSIX mandates */ return exitstatus; Modified: projects/clang500-import/bin/sh/exec.c ============================================================================== --- projects/clang500-import/bin/sh/exec.c Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/bin/sh/exec.c Mon May 8 19:27:44 2017 (r317971) @@ -338,7 +338,7 @@ find_command(const char *name, struct cm cd = 0; - /* If name is in the table, and not invalidated by cd, we're done */ + /* If name is in the table, we're done */ if ((cmdp = cmdlookup(name, 0)) != NULL) { if (cmdp->cmdtype == CMDFUNCTION && act & DO_NOFUNC) cmdp = NULL; @@ -485,8 +485,7 @@ changepath(const char *newval __unused) /* - * Clear out command entries. The argument specifies the first entry in - * PATH which has changed. + * Clear out cached utility locations. */ void Modified: projects/clang500-import/bin/sh/expand.c ============================================================================== --- projects/clang500-import/bin/sh/expand.c Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/bin/sh/expand.c Mon May 8 19:27:44 2017 (r317971) @@ -222,9 +222,9 @@ stputs_split(const char *data, const cha * The result is left in the stack string. * When arglist is NULL, perform here document expansion. * - * Caution: this function uses global state and is not reentrant. - * However, a new invocation after an interrupted invocation is safe - * and will reset the global state for the new call. + * When doing something that may cause this to be re-entered, make sure + * the stack string is empty via grabstackstr() and do not assume expdest + * remains valid. */ void expandarg(union node *arg, struct arglist *arglist, int flag) @@ -476,7 +476,7 @@ expbackq(union node *cmd, int quoted, in ifs = ifsset() ? ifsval() : " \t\n"; else ifs = ""; - /* Don't copy trailing newlines */ + /* Remove trailing newlines */ for (;;) { if (--in.nleft < 0) { if (in.fd < 0) @@ -821,7 +821,7 @@ evalvar(const char *p, struct nodelist * /* - * Test whether a specialized variable is set. + * Test whether a special or positional parameter is set. */ static int @@ -918,7 +918,7 @@ reprocess(int startloc, int flag, int su } /* - * Add the value of a specialized variable to the stack string. + * Add the value of a special or positional parameter to the stack string. */ static void Modified: projects/clang500-import/bin/sh/options.c ============================================================================== --- projects/clang500-import/bin/sh/options.c Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/bin/sh/options.c Mon May 8 19:27:44 2017 (r317971) @@ -141,6 +141,8 @@ optschanged(void) /* * Process shell options. The global variable argptr contains a pointer * to the argument list; we advance it past the options. + * If cmdline is true, process the shell's argv; otherwise, process arguments + * to the set special builtin. */ static void @@ -392,7 +394,7 @@ shiftcmd(int argc, char **argv) /* - * The set command builtin. + * The set builtin command. */ int @@ -558,7 +560,7 @@ out: /* * Standard option processing (a la getopt) for builtin routines. The * only argument that is passed to nextopt is the option string; the - * other arguments are unnecessary. It return the character, or '\0' on + * other arguments are unnecessary. It returns the option, or '\0' on * end of input. */ Modified: projects/clang500-import/bin/sh/tests/builtins/Makefile ============================================================================== --- projects/clang500-import/bin/sh/tests/builtins/Makefile Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/bin/sh/tests/builtins/Makefile Mon May 8 19:27:44 2017 (r317971) @@ -120,6 +120,7 @@ ${PACKAGE}FILES+= local7.0 .if ${MK_NLS} != "no" ${PACKAGE}FILES+= locale1.0 .endif +${PACKAGE}FILES+= locale2.0 ${PACKAGE}FILES+= printf1.0 ${PACKAGE}FILES+= printf2.0 ${PACKAGE}FILES+= printf3.0 Copied: projects/clang500-import/bin/sh/tests/builtins/locale2.0 (from r317970, head/bin/sh/tests/builtins/locale2.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang500-import/bin/sh/tests/builtins/locale2.0 Mon May 8 19:27:44 2017 (r317971, copy of r317970, head/bin/sh/tests/builtins/locale2.0) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +$SH -c 'LC_ALL=C true; kill -INT $$; echo continued' +r=$? +[ "$r" -gt 128 ] && [ "$(kill -l "$r")" = INT ] Modified: projects/clang500-import/bin/sh/var.c ============================================================================== --- projects/clang500-import/bin/sh/var.c Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/bin/sh/var.c Mon May 8 19:27:44 2017 (r317971) @@ -513,7 +513,7 @@ bltinunsetlocale(void) if (localevar(cmdenviron->args[i])) { setlocale(LC_ALL, ""); updatecharset(); - return; + break; } } INTON; Modified: projects/clang500-import/bin/stty/stty.1 ============================================================================== --- projects/clang500-import/bin/stty/stty.1 Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/bin/stty/stty.1 Mon May 8 19:27:44 2017 (r317971) @@ -588,6 +588,7 @@ Same as the control character .Sh EXIT STATUS .Ex -std .Sh SEE ALSO +.Xr resizewin 1 , .Xr termios 4 .Sh STANDARDS The Modified: projects/clang500-import/contrib/ipfilter/tools/ippool.c ============================================================================== --- projects/clang500-import/contrib/ipfilter/tools/ippool.c Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/contrib/ipfilter/tools/ippool.c Mon May 8 19:27:44 2017 (r317971) @@ -1047,7 +1047,9 @@ setnodeaddr(int type, int role, void *pt if (type == IPLT_POOL) { ip_pool_node_t *node = ptr; +#ifdef USE_INET6 if (node->ipn_addr.adf_family == AF_INET) +#endif node->ipn_addr.adf_len = offsetof(addrfamily_t, adf_addr) + sizeof(struct in_addr); Modified: projects/clang500-import/contrib/less/LICENSE ============================================================================== --- projects/clang500-import/contrib/less/LICENSE Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/contrib/less/LICENSE Mon May 8 19:27:44 2017 (r317971) @@ -2,7 +2,7 @@ ------------ Less -Copyright (C) 1984-2015 Mark Nudelman +Copyright (C) 1984-2016 Mark Nudelman Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Modified: projects/clang500-import/contrib/less/NEWS ============================================================================== --- projects/clang500-import/contrib/less/NEWS Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/contrib/less/NEWS Mon May 8 19:27:44 2017 (r317971) @@ -11,6 +11,40 @@ ====================================================================== + Major changes between "less" versions 487 and 491 + +* Don't output terminal init sequence if using -F and file fits on one screen. + +* Use ANSI prototypes in funcs.h declarations. + +* Fix some const mismatches. + +* Remove "register" in variable declarations. + +* Fix some memory leaks. + +====================================================================== + + Major changes between "less" versions 481 and 487 + +* New commands ESC-{ and ESC-} to shift to start/end of displayed lines. + +* Make search highlights work correctly when changing caselessness with -i. + +* New option -Da in Windows version to enable SGR mode. + +* Fix "nothing to search" error when top or bottom line on screen is empty. + +* Fix bug when terminal has no "cm" termcap entry. + +* Fix incorrect display when entering double-width chars in search string. + +* Fix bug in Unicode handling that missed some double width characters. + +* Update Unicode database to 9.0.0. + +====================================================================== + Major changes between "less" versions 458 and 481 * Don't overwrite history file; just append to it. Modified: projects/clang500-import/contrib/less/README ============================================================================== --- projects/clang500-import/contrib/less/README Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/contrib/less/README Mon May 8 19:27:44 2017 (r317971) @@ -7,9 +7,9 @@ ************************************************************************** ************************************************************************** - Less, version 481 + Less, version 491 - This is the distribution of less, version 481, released 31 Aug 2015. + This is the distribution of less, version 491, released 07 Apr 2017. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or Modified: projects/clang500-import/contrib/less/brac.c ============================================================================== --- projects/clang500-import/contrib/less/brac.c Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/contrib/less/brac.c Mon May 8 19:27:44 2017 (r317971) @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2015 Mark Nudelman + * Copyright (C) 1984-2017 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -24,14 +24,18 @@ * "close bracket" are given. */ public void -match_brac(int obrac, int cbrac, int forwdir, int n) +match_brac(obrac, cbrac, forwdir, n) + int obrac; + int cbrac; + int forwdir; + int n; { int c; int nest; POSITION pos; - int (*chget)(void); + int (*chget)(); - extern int ch_forw_get(void), ch_back_get(void); + extern int ch_forw_get(), ch_back_get(); /* * Seek to the line containing the open bracket. Modified: projects/clang500-import/contrib/less/ch.c ============================================================================== --- projects/clang500-import/contrib/less/ch.c Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/contrib/less/ch.c Mon May 8 19:27:44 2017 (r317971) @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2015 Mark Nudelman + * Copyright (C) 1984-2017 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -144,7 +144,7 @@ static int ch_addbuf(); * Get the character pointed to by the read pointer. */ int -ch_get(void) +ch_get() { struct buf *bp; struct bufnode *bn; @@ -378,7 +378,8 @@ ch_get(void) * a single char onto an input file descriptor. */ public void -ch_ungetchar(int c) +ch_ungetchar(c) + int c; { if (c != -1 && ch_ungotchar != -1) error("ch_ungetchar overrun", NULL_PARG); @@ -391,7 +392,7 @@ ch_ungetchar(int c) * If we haven't read all of standard input into it, do that now. */ public void -end_logfile(void) +end_logfile() { static int tried = FALSE; @@ -416,7 +417,7 @@ end_logfile(void) * Write all the existing buffered data to the log file. */ public void -sync_logfile(void) +sync_logfile() { struct buf *bp; struct bufnode *bn; @@ -453,7 +454,8 @@ sync_logfile(void) * Determine if a specific block is currently in one of the buffers. */ static int -buffered(BLOCKNUM block) +buffered(block) + BLOCKNUM block; { struct buf *bp; struct bufnode *bn; @@ -474,7 +476,8 @@ buffered(BLOCKNUM block) * Return 0 if successful, non-zero if can't seek there. */ public int -ch_seek(POSITION pos) +ch_seek(pos) + POSITION pos; { BLOCKNUM new_block; POSITION len; @@ -512,7 +515,7 @@ ch_seek(POSITION pos) * Seek to the end of the file. */ public int -ch_end_seek(void) +ch_end_seek() { POSITION len; @@ -539,7 +542,7 @@ ch_end_seek(void) * Seek to the last position in the file that is currently buffered. */ public int -ch_end_buffer_seek(void) +ch_end_buffer_seek() { struct buf *bp; struct bufnode *bn; @@ -567,7 +570,7 @@ ch_end_buffer_seek(void) * beginning of the pipe is no longer buffered. */ public int -ch_beg_seek(void) +ch_beg_seek() { struct bufnode *bn; struct bufnode *firstbn; @@ -599,7 +602,7 @@ ch_beg_seek(void) * Return the length of the file, if known. */ public POSITION -ch_length(void) +ch_length() { if (thisfile == NULL) return (NULL_POSITION); @@ -616,7 +619,7 @@ ch_length(void) * Return the current position in the file. */ public POSITION -ch_tell(void) +ch_tell() { if (thisfile == NULL) return (NULL_POSITION); @@ -627,7 +630,7 @@ ch_tell(void) * Get the current char and post-increment the read pointer. */ public int -ch_forw_get(void) +ch_forw_get() { int c; @@ -650,7 +653,7 @@ ch_forw_get(void) * Pre-decrement the read pointer and get the new current char. */ public int -ch_back_get(void) +ch_back_get() { if (thisfile == NULL) return (EOI); @@ -673,7 +676,8 @@ ch_back_get(void) * bufspace is in units of 1024 bytes. -1 mean no limit. */ public void -ch_setbufspace(int bufspace) +ch_setbufspace(bufspace) + int bufspace; { if (bufspace < 0) maxbufs = -1; @@ -689,7 +693,7 @@ ch_setbufspace(int bufspace) * Flush (discard) any saved file state, including buffer contents. */ public void -ch_flush(void) +ch_flush() { struct bufnode *bn; @@ -756,7 +760,7 @@ ch_flush(void) * The buffer is added to the tail of the buffer chain. */ static int -ch_addbuf(void) +ch_addbuf() { struct buf *bp; struct bufnode *bn; @@ -781,7 +785,7 @@ ch_addbuf(void) * */ static void -init_hashtbl(void) +init_hashtbl() { int h; @@ -796,7 +800,7 @@ init_hashtbl(void) * Delete all buffers for this file. */ static void -ch_delbufs(void) +ch_delbufs() { struct bufnode *bn; @@ -814,7 +818,8 @@ ch_delbufs(void) * Is it possible to seek on a file descriptor? */ public int -seekable(int f) +seekable(f) + int f; { #if MSDOS_COMPILER extern int fd0; @@ -835,7 +840,7 @@ seekable(int f) * This is used after an ignore_eof read, during which the EOF may change. */ public void -ch_set_eof(void) +ch_set_eof() { ch_fsize = ch_fpos; } @@ -845,7 +850,9 @@ ch_set_eof(void) * Initialize file state for a new file. */ public void -ch_init(int f, int flags) +ch_init(f, flags) + int f; + int flags; { /* * See if we already have a filestate for this file. @@ -884,7 +891,7 @@ ch_init(int f, int flags) * Close a filestate. */ public void -ch_close(void) +ch_close() { int keepstate = FALSE; @@ -927,7 +934,7 @@ ch_close(void) * Return ch_flags for the current file. */ public int -ch_getflags(void) +ch_getflags() { if (thisfile == NULL) return (0); Modified: projects/clang500-import/contrib/less/charset.c ============================================================================== --- projects/clang500-import/contrib/less/charset.c Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/contrib/less/charset.c Mon May 8 19:27:44 2017 (r317971) @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2015 Mark Nudelman + * Copyright (C) 1984-2017 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -64,6 +64,8 @@ struct cs_alias { char *oname; } cs_aliases[] = { { "UTF-8", "utf-8" }, + { "utf8", "utf-8" }, + { "UTF8", "utf-8" }, { "ANSI_X3.4-1968", "ascii" }, { "US-ASCII", "ascii" }, { "latin1", "iso8859" }, @@ -130,7 +132,8 @@ public int binattr = AT_STANDOUT; * c control character */ static void -ichardef(char *s) +ichardef(s) + char *s; { char *cp; int n; @@ -186,7 +189,9 @@ ichardef(char *s) * The valid charset names are listed in the "charsets" array. */ static int -icharset(char *name, int no_error) +icharset(name, no_error) + char *name; + int no_error; { struct charset *p; struct cs_alias *a; @@ -227,7 +232,7 @@ icharset(char *name, int no_error) * Define a charset, given a locale name. */ static void -ilocale(void) +ilocale() { int c; @@ -247,7 +252,10 @@ ilocale(void) * Define the printing format for control (or binary utf) chars. */ static void -setbinfmt(char *s, char **fmtvarptr, char *default_fmt) +setbinfmt(s, fmtvarptr, default_fmt) + char *s; + char **fmtvarptr; + char *default_fmt; { if (s && utf_mode) { @@ -293,7 +301,7 @@ setbinfmt(char *s, char **fmtvarptr, cha * */ static void -set_charset(void) +set_charset() { char *s; @@ -364,7 +372,7 @@ set_charset(void) * Initialize charset data structures. */ public void -init_charset(void) +init_charset() { char *s; @@ -385,7 +393,8 @@ init_charset(void) * Is a given character a "binary" character? */ public int -binary_char(LWCHAR c) +binary_char(c) + LWCHAR c; { if (utf_mode) return (is_ubin_char(c)); @@ -397,7 +406,8 @@ binary_char(LWCHAR c) * Is a given character a "control" character? */ public int -control_char(LWCHAR c) +control_char(c) + LWCHAR c; { c &= 0377; return (chardef[c] & IS_CONTROL_CHAR); @@ -408,7 +418,8 @@ control_char(LWCHAR c) * For example, in the "ascii" charset '\3' is printed as "^C". */ public char * -prchar(LWCHAR c) +prchar(c) + LWCHAR c; { /* {{ This buffer can be overrun if LESSBINFMT is a long string. }} */ static char buf[32]; @@ -443,7 +454,8 @@ prchar(LWCHAR c) * Return the printable form of a UTF-8 character. */ public char * -prutfchar(LWCHAR ch) +prutfchar(ch) + LWCHAR ch; { static char buf[32]; @@ -473,7 +485,8 @@ prutfchar(LWCHAR ch) * Get the length of a UTF-8 character in bytes. */ public int -utf_len(char ch) +utf_len(ch) + unsigned char ch; { if ((ch & 0x80) == 0) return 1; @@ -495,15 +508,18 @@ utf_len(char ch) * Does the parameter point to the lead byte of a well-formed UTF-8 character? */ public int -is_utf8_well_formed(unsigned char *s, int slen) +is_utf8_well_formed(ss, slen) + char *ss; + int slen; { int i; int len; + unsigned char *s = (unsigned char *) ss; if (IS_UTF8_INVALID(s[0])) return (0); - len = utf_len((char) s[0]); + len = utf_len(s[0]); if (len > slen) return (0); if (len == 1) @@ -530,14 +546,16 @@ is_utf8_well_formed(unsigned char *s, in * Return number of invalid UTF-8 sequences found in a buffer. */ public int -utf_bin_count(unsigned char *data, int len) +utf_bin_count(data, len) + char *data; + int len; { int bin_count = 0; while (len > 0) { if (is_utf8_well_formed(data, len)) { - int clen = utf_len(*data); + int clen = utf_len(*data & 0377); data += clen; len -= clen; } else @@ -547,7 +565,7 @@ utf_bin_count(unsigned char *data, int l do { ++data; --len; - } while (len > 0 && !IS_UTF8_LEAD(*data)); + } while (len > 0 && !IS_UTF8_LEAD(*data & 0377)); } } return (bin_count); @@ -557,7 +575,8 @@ utf_bin_count(unsigned char *data, int l * Get the value of a UTF-8 character. */ public LWCHAR -get_wchar(constant char *p) +get_wchar(p) + constant char *p; { switch (utf_len(p[0])) { @@ -608,7 +627,9 @@ get_wchar(constant char *p) * Store a character into a UTF-8 string. */ public void -put_wchar(char **pp, LWCHAR ch) +put_wchar(pp, ch) + char **pp; + LWCHAR ch; { if (!utf_mode || ch < 0x80) { @@ -656,11 +677,14 @@ put_wchar(char **pp, LWCHAR ch) * Step forward or backward one character in a string. */ public LWCHAR -step_char(constant char **pp, signed int dir, constant char *limit) +step_char(pp, dir, limit) + char **pp; + signed int dir; + constant char *limit; { LWCHAR ch; int len; - constant char *p = *pp; + char *p = *pp; if (!utf_mode) { @@ -675,7 +699,7 @@ step_char(constant char **pp, signed int if (p + len > limit) { ch = 0; - p = limit; + p = (char *) limit; } else { ch = get_wchar(p); @@ -723,7 +747,9 @@ static struct wchar_range comb_table[] = static int -is_in_table(LWCHAR ch, struct wchar_range_table *table) +is_in_table(ch, table) + LWCHAR ch; + struct wchar_range_table *table; { int hi; int lo; @@ -751,7 +777,8 @@ is_in_table(LWCHAR ch, struct wchar_rang * If a composing character follows any char, the two combine into one glyph. */ public int -is_composing_char(LWCHAR ch) +is_composing_char(ch) + LWCHAR ch; { return is_in_table(ch, &compose_table); } @@ -760,7 +787,8 @@ is_composing_char(LWCHAR ch) * Should this UTF-8 character be treated as binary? */ public int -is_ubin_char(LWCHAR ch) +is_ubin_char(ch) + LWCHAR ch; { return is_in_table(ch, &ubin_table); } @@ -769,7 +797,8 @@ is_ubin_char(LWCHAR ch) * Is this a double width UTF-8 character? */ public int -is_wide_char(LWCHAR ch) +is_wide_char(ch) + LWCHAR ch; { return is_in_table(ch, &wide_table); } @@ -780,7 +809,9 @@ is_wide_char(LWCHAR ch) * a specific char (not any char), the two combine into one glyph. */ public int -is_combining_char(LWCHAR ch1, LWCHAR ch2) +is_combining_char(ch1, ch2) + LWCHAR ch1; + LWCHAR ch2; { /* The table is small; use linear search. */ int i; Modified: projects/clang500-import/contrib/less/charset.h ============================================================================== --- projects/clang500-import/contrib/less/charset.h Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/contrib/less/charset.h Mon May 8 19:27:44 2017 (r317971) @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2015 Mark Nudelman + * Copyright (C) 1984-2017 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. Modified: projects/clang500-import/contrib/less/cmd.h ============================================================================== --- projects/clang500-import/contrib/less/cmd.h Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/contrib/less/cmd.h Mon May 8 19:27:44 2017 (r317971) @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2015 Mark Nudelman + * Copyright (C) 1984-2017 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -67,6 +67,8 @@ #define A_FILTER 55 #define A_F_UNTIL_HILITE 56 #define A_GOEND_BUF 57 +#define A_LLSHIFT 58 +#define A_RRSHIFT 59 #define A_INVALID 100 #define A_NOACTION 101 Modified: projects/clang500-import/contrib/less/cmdbuf.c ============================================================================== --- projects/clang500-import/contrib/less/cmdbuf.c Mon May 8 19:22:59 2017 (r317970) +++ projects/clang500-import/contrib/less/cmdbuf.c Mon May 8 19:27:44 2017 (r317971) @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2015 Mark Nudelman + * Copyright (C) 1984-2017 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -32,7 +32,7 @@ static int literal; /* Next input char static int updown_match = -1; /* Prefix length in up/down movement */ #if TAB_COMPLETE_FILENAME -static int cmd_complete(int action); +static int cmd_complete(); /* * These variables are statics used by cmd_complete. */ @@ -76,25 +76,25 @@ struct mlist */ struct mlist mlist_search = { &mlist_search, &mlist_search, &mlist_search, NULL, 0 }; -public void * constant ml_search = (void *) &mlist_search; +public void *ml_search = (void *) &mlist_search; struct mlist mlist_examine = { &mlist_examine, &mlist_examine, &mlist_examine, NULL, 0 }; -public void * constant ml_examine = (void *) &mlist_examine; +public void *ml_examine = (void *) &mlist_examine; #if SHELL_ESCAPE || PIPEC struct mlist mlist_shell = { &mlist_shell, &mlist_shell, &mlist_shell, NULL, 0 }; -public void * constant ml_shell = (void *) &mlist_shell; +public void *ml_shell = (void *) &mlist_shell; #endif #else /* CMD_HISTORY */ /* If CMD_HISTORY is off, these are just flags. */ -public void * constant ml_search = (void *)1; -public void * constant ml_examine = (void *)2; +public void *ml_search = (void *)1; +public void *ml_examine = (void *)2; #if SHELL_ESCAPE || PIPEC -public void * constant ml_shell = (void *)3; +public void *ml_shell = (void *)3; #endif #endif /* CMD_HISTORY */ @@ -114,7 +114,7 @@ static int cmd_mbc_buf_index; * Reset command buffer (to empty). */ public void -cmd_reset(void) +cmd_reset() { cp = cmdbuf; *cp = '\0'; @@ -129,7 +129,7 @@ cmd_reset(void) * Clear command line. */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705081927.v48JRi1A099157>