Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Apr 2015 20:08:38 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r281539 - in projects/sendfile: . contrib/nvi contrib/nvi/catalog contrib/nvi/cl contrib/nvi/common contrib/nvi/docs contrib/nvi/docs/USD.doc contrib/nvi/docs/internals contrib/nvi/docs...
Message-ID:  <201504142008.t3EK8cFM074445@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Tue Apr 14 20:08:37 2015
New Revision: 281539
URL: https://svnweb.freebsd.org/changeset/base/281539

Log:
  Merge head r261119 through r281537.

Added:
  projects/sendfile/contrib/nvi/docs/man/
     - copied from r281537, head/contrib/nvi/docs/man/
  projects/sendfile/sys/arm/conf/VIRT
     - copied unchanged from r281537, head/sys/arm/conf/VIRT
  projects/sendfile/sys/arm/qemu/
     - copied from r281537, head/sys/arm/qemu/
  projects/sendfile/sys/arm64/arm64/
     - copied from r281537, head/sys/arm64/arm64/
  projects/sendfile/sys/arm64/conf/
     - copied from r281537, head/sys/arm64/conf/
  projects/sendfile/sys/arm64/include/_bus.h
     - copied unchanged from r281537, head/sys/arm64/include/_bus.h
  projects/sendfile/sys/arm64/include/armreg.h
     - copied unchanged from r281537, head/sys/arm64/include/armreg.h
  projects/sendfile/sys/arm64/include/bus.h
     - copied unchanged from r281537, head/sys/arm64/include/bus.h
  projects/sendfile/sys/arm64/include/bus_dma.h
     - copied unchanged from r281537, head/sys/arm64/include/bus_dma.h
  projects/sendfile/sys/arm64/include/clock.h
     - copied unchanged from r281537, head/sys/arm64/include/clock.h
  projects/sendfile/sys/arm64/include/counter.h
     - copied unchanged from r281537, head/sys/arm64/include/counter.h
  projects/sendfile/sys/arm64/include/db_machdep.h
     - copied unchanged from r281537, head/sys/arm64/include/db_machdep.h
  projects/sendfile/sys/arm64/include/debug_monitor.h
     - copied unchanged from r281537, head/sys/arm64/include/debug_monitor.h
  projects/sendfile/sys/arm64/include/devmap.h
     - copied unchanged from r281537, head/sys/arm64/include/devmap.h
  projects/sendfile/sys/arm64/include/dump.h
     - copied unchanged from r281537, head/sys/arm64/include/dump.h
  projects/sendfile/sys/arm64/include/hypervisor.h
     - copied unchanged from r281537, head/sys/arm64/include/hypervisor.h
  projects/sendfile/sys/arm64/include/in_cksum.h
     - copied unchanged from r281537, head/sys/arm64/include/in_cksum.h
  projects/sendfile/sys/arm64/include/intr.h
     - copied unchanged from r281537, head/sys/arm64/include/intr.h
  projects/sendfile/sys/arm64/include/kdb.h
     - copied unchanged from r281537, head/sys/arm64/include/kdb.h
  projects/sendfile/sys/arm64/include/machdep.h
     - copied unchanged from r281537, head/sys/arm64/include/machdep.h
  projects/sendfile/sys/arm64/include/md_var.h
     - copied unchanged from r281537, head/sys/arm64/include/md_var.h
  projects/sendfile/sys/arm64/include/memdev.h
     - copied unchanged from r281537, head/sys/arm64/include/memdev.h
  projects/sendfile/sys/arm64/include/metadata.h
     - copied unchanged from r281537, head/sys/arm64/include/metadata.h
  projects/sendfile/sys/arm64/include/ofw_machdep.h
     - copied unchanged from r281537, head/sys/arm64/include/ofw_machdep.h
  projects/sendfile/sys/arm64/include/psl.h
     - copied unchanged from r281537, head/sys/arm64/include/psl.h
  projects/sendfile/sys/arm64/include/resource.h
     - copied unchanged from r281537, head/sys/arm64/include/resource.h
  projects/sendfile/sys/arm64/include/sf_buf.h
     - copied unchanged from r281537, head/sys/arm64/include/sf_buf.h
  projects/sendfile/sys/arm64/include/smp.h
     - copied unchanged from r281537, head/sys/arm64/include/smp.h
  projects/sendfile/sys/arm64/include/stack.h
     - copied unchanged from r281537, head/sys/arm64/include/stack.h
  projects/sendfile/sys/arm64/include/trap.h
     - copied unchanged from r281537, head/sys/arm64/include/trap.h
  projects/sendfile/sys/arm64/include/vfp.h
     - copied unchanged from r281537, head/sys/arm64/include/vfp.h
  projects/sendfile/sys/boot/Makefile.arm64
     - copied unchanged from r281537, head/sys/boot/Makefile.arm64
  projects/sendfile/sys/boot/arm64/
     - copied from r281537, head/sys/boot/arm64/
  projects/sendfile/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu
     - copied unchanged from r281537, head/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu
  projects/sendfile/sys/boot/efi/include/arm64/
     - copied from r281537, head/sys/boot/efi/include/arm64/
  projects/sendfile/sys/boot/efi/loader/arch/arm64/
     - copied from r281537, head/sys/boot/efi/loader/arch/arm64/
  projects/sendfile/sys/boot/efi/loader/arch/i386/Makefile.inc
     - copied unchanged from r281537, head/sys/boot/efi/loader/arch/i386/Makefile.inc
  projects/sendfile/sys/boot/fdt/dts/arm/meson8b.dtsi
     - copied unchanged from r281537, head/sys/boot/fdt/dts/arm/meson8b.dtsi
  projects/sendfile/sys/conf/Makefile.arm64
     - copied unchanged from r281537, head/sys/conf/Makefile.arm64
  projects/sendfile/sys/conf/files.arm64
     - copied unchanged from r281537, head/sys/conf/files.arm64
  projects/sendfile/sys/conf/ldscript.arm64
     - copied unchanged from r281537, head/sys/conf/ldscript.arm64
  projects/sendfile/sys/conf/options.arm64
     - copied unchanged from r281537, head/sys/conf/options.arm64
  projects/sendfile/sys/dev/fdt/fdt_arm64.c
     - copied unchanged from r281537, head/sys/dev/fdt/fdt_arm64.c
  projects/sendfile/sys/dev/psci/
     - copied from r281537, head/sys/dev/psci/
Deleted:
  projects/sendfile/contrib/nvi/catalog/spell.ok
  projects/sendfile/contrib/nvi/docs/TODO
  projects/sendfile/contrib/nvi/docs/USD.doc/
  projects/sendfile/contrib/nvi/docs/changelog
  projects/sendfile/contrib/nvi/docs/ev
  projects/sendfile/contrib/nvi/docs/features
  projects/sendfile/contrib/nvi/docs/help
  projects/sendfile/contrib/nvi/docs/internals/
  projects/sendfile/contrib/nvi/docs/interp/
  projects/sendfile/contrib/nvi/docs/spell.ok
  projects/sendfile/contrib/nvi/docs/tutorial/
  projects/sendfile/share/doc/usd/10.exref/
  projects/sendfile/share/doc/usd/11.vitut/
  projects/sendfile/share/doc/usd/12.vi/
  projects/sendfile/share/doc/usd/13.viref/
  projects/sendfile/tools/regression/sockets/so_setfib/so_setfib.t
Modified:
  projects/sendfile/ObsoleteFiles.inc
  projects/sendfile/README
  projects/sendfile/contrib/nvi/README
  projects/sendfile/contrib/nvi/catalog/dump.c
  projects/sendfile/contrib/nvi/cl/cl.h
  projects/sendfile/contrib/nvi/cl/cl_funcs.c
  projects/sendfile/contrib/nvi/cl/cl_main.c
  projects/sendfile/contrib/nvi/cl/cl_read.c
  projects/sendfile/contrib/nvi/cl/cl_screen.c
  projects/sendfile/contrib/nvi/cl/cl_term.c
  projects/sendfile/contrib/nvi/cl/extern.h
  projects/sendfile/contrib/nvi/common/common.h
  projects/sendfile/contrib/nvi/common/conv.c
  projects/sendfile/contrib/nvi/common/cut.c
  projects/sendfile/contrib/nvi/common/delete.c
  projects/sendfile/contrib/nvi/common/encoding.c
  projects/sendfile/contrib/nvi/common/exf.c
  projects/sendfile/contrib/nvi/common/extern.h
  projects/sendfile/contrib/nvi/common/gs.h
  projects/sendfile/contrib/nvi/common/key.c
  projects/sendfile/contrib/nvi/common/line.c
  projects/sendfile/contrib/nvi/common/log.c
  projects/sendfile/contrib/nvi/common/main.c
  projects/sendfile/contrib/nvi/common/mark.c
  projects/sendfile/contrib/nvi/common/msg.c
  projects/sendfile/contrib/nvi/common/options.c
  projects/sendfile/contrib/nvi/common/options.h
  projects/sendfile/contrib/nvi/common/options_f.c
  projects/sendfile/contrib/nvi/common/put.c
  projects/sendfile/contrib/nvi/common/recover.c
  projects/sendfile/contrib/nvi/common/screen.c
  projects/sendfile/contrib/nvi/common/search.c
  projects/sendfile/contrib/nvi/common/seq.c
  projects/sendfile/contrib/nvi/common/util.c
  projects/sendfile/contrib/nvi/ex/ex.c
  projects/sendfile/contrib/nvi/ex/ex.h
  projects/sendfile/contrib/nvi/ex/ex_abbrev.c
  projects/sendfile/contrib/nvi/ex/ex_append.c
  projects/sendfile/contrib/nvi/ex/ex_args.c
  projects/sendfile/contrib/nvi/ex/ex_argv.c
  projects/sendfile/contrib/nvi/ex/ex_at.c
  projects/sendfile/contrib/nvi/ex/ex_bang.c
  projects/sendfile/contrib/nvi/ex/ex_cd.c
  projects/sendfile/contrib/nvi/ex/ex_cscope.c
  projects/sendfile/contrib/nvi/ex/ex_delete.c
  projects/sendfile/contrib/nvi/ex/ex_display.c
  projects/sendfile/contrib/nvi/ex/ex_edit.c
  projects/sendfile/contrib/nvi/ex/ex_equal.c
  projects/sendfile/contrib/nvi/ex/ex_file.c
  projects/sendfile/contrib/nvi/ex/ex_filter.c
  projects/sendfile/contrib/nvi/ex/ex_global.c
  projects/sendfile/contrib/nvi/ex/ex_init.c
  projects/sendfile/contrib/nvi/ex/ex_join.c
  projects/sendfile/contrib/nvi/ex/ex_map.c
  projects/sendfile/contrib/nvi/ex/ex_mark.c
  projects/sendfile/contrib/nvi/ex/ex_mkexrc.c
  projects/sendfile/contrib/nvi/ex/ex_move.c
  projects/sendfile/contrib/nvi/ex/ex_open.c
  projects/sendfile/contrib/nvi/ex/ex_preserve.c
  projects/sendfile/contrib/nvi/ex/ex_print.c
  projects/sendfile/contrib/nvi/ex/ex_put.c
  projects/sendfile/contrib/nvi/ex/ex_quit.c
  projects/sendfile/contrib/nvi/ex/ex_read.c
  projects/sendfile/contrib/nvi/ex/ex_screen.c
  projects/sendfile/contrib/nvi/ex/ex_script.c
  projects/sendfile/contrib/nvi/ex/ex_set.c
  projects/sendfile/contrib/nvi/ex/ex_shell.c
  projects/sendfile/contrib/nvi/ex/ex_shift.c
  projects/sendfile/contrib/nvi/ex/ex_source.c
  projects/sendfile/contrib/nvi/ex/ex_stop.c
  projects/sendfile/contrib/nvi/ex/ex_subst.c
  projects/sendfile/contrib/nvi/ex/ex_tag.c
  projects/sendfile/contrib/nvi/ex/ex_txt.c
  projects/sendfile/contrib/nvi/ex/ex_undo.c
  projects/sendfile/contrib/nvi/ex/ex_usage.c
  projects/sendfile/contrib/nvi/ex/ex_util.c
  projects/sendfile/contrib/nvi/ex/ex_version.c
  projects/sendfile/contrib/nvi/ex/ex_visual.c
  projects/sendfile/contrib/nvi/ex/ex_write.c
  projects/sendfile/contrib/nvi/ex/ex_yank.c
  projects/sendfile/contrib/nvi/ex/ex_z.c
  projects/sendfile/contrib/nvi/ex/extern.h
  projects/sendfile/contrib/nvi/ex/version.h
  projects/sendfile/contrib/nvi/regex/COPYRIGHT
  projects/sendfile/contrib/nvi/regex/cclass.h
  projects/sendfile/contrib/nvi/regex/cname.h
  projects/sendfile/contrib/nvi/regex/engine.c
  projects/sendfile/contrib/nvi/regex/re_format.7
  projects/sendfile/contrib/nvi/regex/regcomp.c
  projects/sendfile/contrib/nvi/regex/regerror.c
  projects/sendfile/contrib/nvi/regex/regex.3
  projects/sendfile/contrib/nvi/regex/regex.h
  projects/sendfile/contrib/nvi/regex/regex2.h
  projects/sendfile/contrib/nvi/regex/regexec.c
  projects/sendfile/contrib/nvi/regex/regfree.c
  projects/sendfile/contrib/nvi/regex/utils.h
  projects/sendfile/contrib/nvi/vi/extern.h
  projects/sendfile/contrib/nvi/vi/getc.c
  projects/sendfile/contrib/nvi/vi/v_at.c
  projects/sendfile/contrib/nvi/vi/v_ch.c
  projects/sendfile/contrib/nvi/vi/v_delete.c
  projects/sendfile/contrib/nvi/vi/v_ex.c
  projects/sendfile/contrib/nvi/vi/v_increment.c
  projects/sendfile/contrib/nvi/vi/v_init.c
  projects/sendfile/contrib/nvi/vi/v_itxt.c
  projects/sendfile/contrib/nvi/vi/v_left.c
  projects/sendfile/contrib/nvi/vi/v_mark.c
  projects/sendfile/contrib/nvi/vi/v_match.c
  projects/sendfile/contrib/nvi/vi/v_paragraph.c
  projects/sendfile/contrib/nvi/vi/v_put.c
  projects/sendfile/contrib/nvi/vi/v_redraw.c
  projects/sendfile/contrib/nvi/vi/v_replace.c
  projects/sendfile/contrib/nvi/vi/v_right.c
  projects/sendfile/contrib/nvi/vi/v_screen.c
  projects/sendfile/contrib/nvi/vi/v_scroll.c
  projects/sendfile/contrib/nvi/vi/v_search.c
  projects/sendfile/contrib/nvi/vi/v_section.c
  projects/sendfile/contrib/nvi/vi/v_sentence.c
  projects/sendfile/contrib/nvi/vi/v_status.c
  projects/sendfile/contrib/nvi/vi/v_txt.c
  projects/sendfile/contrib/nvi/vi/v_ulcase.c
  projects/sendfile/contrib/nvi/vi/v_undo.c
  projects/sendfile/contrib/nvi/vi/v_util.c
  projects/sendfile/contrib/nvi/vi/v_word.c
  projects/sendfile/contrib/nvi/vi/v_xchar.c
  projects/sendfile/contrib/nvi/vi/v_yank.c
  projects/sendfile/contrib/nvi/vi/v_z.c
  projects/sendfile/contrib/nvi/vi/v_zexit.c
  projects/sendfile/contrib/nvi/vi/vi.c
  projects/sendfile/contrib/nvi/vi/vi.h
  projects/sendfile/contrib/nvi/vi/vs_line.c
  projects/sendfile/contrib/nvi/vi/vs_msg.c
  projects/sendfile/contrib/nvi/vi/vs_refresh.c
  projects/sendfile/contrib/nvi/vi/vs_relative.c
  projects/sendfile/contrib/nvi/vi/vs_smap.c
  projects/sendfile/contrib/nvi/vi/vs_split.c
  projects/sendfile/etc/mtree/BSD.usr.dist
  projects/sendfile/lib/libc/sys/mount.2
  projects/sendfile/lib/liblzma/Makefile
  projects/sendfile/lib/liblzma/Symbol.map
  projects/sendfile/lib/liblzma/config.h
  projects/sendfile/share/doc/usd/Makefile
  projects/sendfile/share/mk/bsd.progs.mk
  projects/sendfile/share/mk/src.libnames.mk
  projects/sendfile/sys/amd64/include/metadata.h
  projects/sendfile/sys/arm/amlogic/aml8726/aml8726_clkmsr.c
  projects/sendfile/sys/arm/amlogic/aml8726/aml8726_i2c.c
  projects/sendfile/sys/arm/amlogic/aml8726/aml8726_identsoc.c
  projects/sendfile/sys/arm/amlogic/aml8726/aml8726_machdep.c
  projects/sendfile/sys/arm/amlogic/aml8726/aml8726_mmc.c
  projects/sendfile/sys/arm/amlogic/aml8726/aml8726_soc.h
  projects/sendfile/sys/arm/amlogic/aml8726/aml8726_timer.c
  projects/sendfile/sys/arm/amlogic/aml8726/aml8726_wdt.c
  projects/sendfile/sys/arm/amlogic/aml8726/uart_dev_aml8726.c
  projects/sendfile/sys/arm/arm/devmap.c
  projects/sendfile/sys/arm/arm/pmap-v6-new.c
  projects/sendfile/sys/arm/arm/pmap-v6.c
  projects/sendfile/sys/arm/arm/pmap.c
  projects/sendfile/sys/arm/freescale/vybrid/vf_uart.c
  projects/sendfile/sys/arm/include/pmap-v6.h
  projects/sendfile/sys/arm/include/pmap.h
  projects/sendfile/sys/arm/samsung/exynos/exynos_uart.c
  projects/sendfile/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c
  projects/sendfile/sys/arm64/include/cpufunc.h
  projects/sendfile/sys/arm64/include/pmap.h
  projects/sendfile/sys/boot/Makefile.arm
  projects/sendfile/sys/boot/common/Makefile.inc
  projects/sendfile/sys/boot/efi/Makefile
  projects/sendfile/sys/boot/efi/boot1/Makefile
  projects/sendfile/sys/boot/efi/boot1/generate-fat.sh
  projects/sendfile/sys/boot/efi/fdt/Makefile
  projects/sendfile/sys/boot/efi/libefi/Makefile
  projects/sendfile/sys/boot/efi/loader/Makefile
  projects/sendfile/sys/boot/efi/loader/arch/amd64/Makefile.inc
  projects/sendfile/sys/boot/efi/loader/arch/arm/Makefile.inc
  projects/sendfile/sys/boot/efi/loader/arch/arm/ldscript.arm
  projects/sendfile/sys/boot/efi/loader/arch/arm/start.S
  projects/sendfile/sys/boot/efi/loader/arch/i386/elf32_freebsd.c
  projects/sendfile/sys/boot/efi/loader/bootinfo.c
  projects/sendfile/sys/boot/efi/loader/copy.c
  projects/sendfile/sys/boot/fdt/dts/arm/odroidc1.dts
  projects/sendfile/sys/boot/fdt/dts/arm/vsatv102-m6.dts
  projects/sendfile/sys/cam/cam_xpt.c
  projects/sendfile/sys/compat/svr4/svr4_stream.c
  projects/sendfile/sys/conf/files.arm
  projects/sendfile/sys/conf/options.i386
  projects/sendfile/sys/contrib/dev/acpica/acpica_prep.sh
  projects/sendfile/sys/contrib/dev/acpica/changes.txt
  projects/sendfile/sys/contrib/dev/acpica/common/adfile.c
  projects/sendfile/sys/contrib/dev/acpica/common/adisasm.c
  projects/sendfile/sys/contrib/dev/acpica/common/dmtable.c
  projects/sendfile/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/sendfile/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslcodegen.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/sendfile/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslfold.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asllisting.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslmapenter.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asloptions.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslrules.y
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asltree.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/asltypes.y
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/aslwalks.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/dtcompile.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/dtcompiler.h
  projects/sendfile/sys/contrib/dev/acpica/compiler/dtio.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/dttable.c
  projects/sendfile/sys/contrib/dev/acpica/compiler/dttemplate.h
  projects/sendfile/sys/contrib/dev/acpica/compiler/dtutils.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbxface.c
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
  projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evregion.c
  projects/sendfile/sys/contrib/dev/acpica/components/events/evxfevnt.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exdump.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exfldio.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exoparg3.c
  projects/sendfile/sys/contrib/dev/acpica/components/executer/exregion.c
  projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwvalid.c
  projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsdump.c
  projects/sendfile/sys/contrib/dev/acpica/components/parser/psopcode.c
  projects/sendfile/sys/contrib/dev/acpica/components/parser/psopinfo.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsaddr.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsdump.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
  projects/sendfile/sys/contrib/dev/acpica/components/resources/rsxface.c
  projects/sendfile/sys/contrib/dev/acpica/components/tables/tbdata.c
  projects/sendfile/sys/contrib/dev/acpica/components/tables/tbinstal.c
  projects/sendfile/sys/contrib/dev/acpica/components/tables/tbprint.c
  projects/sendfile/sys/contrib/dev/acpica/components/tables/tbxfroot.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utaddress.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utbuffer.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utglobal.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utmisc.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utosi.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utprint.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utstate.c
  projects/sendfile/sys/contrib/dev/acpica/components/utilities/utuuid.c
  projects/sendfile/sys/contrib/dev/acpica/include/acdebug.h
  projects/sendfile/sys/contrib/dev/acpica/include/acdisasm.h
  projects/sendfile/sys/contrib/dev/acpica/include/acglobal.h
  projects/sendfile/sys/contrib/dev/acpica/include/aclocal.h
  projects/sendfile/sys/contrib/dev/acpica/include/acmacros.h
  projects/sendfile/sys/contrib/dev/acpica/include/acopcode.h
  projects/sendfile/sys/contrib/dev/acpica/include/acpixf.h
  projects/sendfile/sys/contrib/dev/acpica/include/acresrc.h
  projects/sendfile/sys/contrib/dev/acpica/include/acrestyp.h
  projects/sendfile/sys/contrib/dev/acpica/include/acstruct.h
  projects/sendfile/sys/contrib/dev/acpica/include/actables.h
  projects/sendfile/sys/contrib/dev/acpica/include/actbl2.h
  projects/sendfile/sys/contrib/dev/acpica/include/actypes.h
  projects/sendfile/sys/contrib/dev/acpica/include/acutils.h
  projects/sendfile/sys/contrib/dev/acpica/include/amlcode.h
  projects/sendfile/sys/contrib/dev/acpica/include/platform/acenv.h
  projects/sendfile/sys/contrib/x86emu/x86emu.c
  projects/sendfile/sys/dev/acpica/acpi_pcib_acpi.c
  projects/sendfile/sys/dev/acpica/acpi_resource.c
  projects/sendfile/sys/dev/acpica/acpivar.h
  projects/sendfile/sys/dev/atkbdc/psm.c
  projects/sendfile/sys/dev/fdt/fdt_pinctrl.c
  projects/sendfile/sys/dev/hptnr/README
  projects/sendfile/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
  projects/sendfile/sys/dev/hptnr/him.h
  projects/sendfile/sys/dev/hptnr/hptintf.h
  projects/sendfile/sys/dev/hptnr/hptnr_config.c
  projects/sendfile/sys/dev/hptnr/hptnr_config.h
  projects/sendfile/sys/dev/hptnr/hptnr_osm_bsd.c
  projects/sendfile/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu
  projects/sendfile/sys/dev/hptnr/ldm.h
  projects/sendfile/sys/dev/hptnr/os_bsd.h
  projects/sendfile/sys/dev/iwn/if_iwn.c
  projects/sendfile/sys/dev/netmap/netmap.c
  projects/sendfile/sys/dev/streams/streams.c
  projects/sendfile/sys/dev/uart/uart_bus.h
  projects/sendfile/sys/dev/uart/uart_bus_fdt.c
  projects/sendfile/sys/dev/uart/uart_core.c
  projects/sendfile/sys/dev/uart/uart_cpu.h
  projects/sendfile/sys/dev/uart/uart_cpu_fdt.c
  projects/sendfile/sys/dev/uart/uart_dev_imx.c
  projects/sendfile/sys/dev/uart/uart_dev_lpc.c
  projects/sendfile/sys/dev/uart/uart_dev_msm.c
  projects/sendfile/sys/dev/uart/uart_dev_ns8250.c
  projects/sendfile/sys/dev/uart/uart_dev_pl011.c
  projects/sendfile/sys/dev/uart/uart_dev_quicc.c
  projects/sendfile/sys/dev/uart/uart_dev_sab82532.c
  projects/sendfile/sys/dev/uart/uart_dev_ti8250.c
  projects/sendfile/sys/dev/uart/uart_dev_z8530.c
  projects/sendfile/sys/dev/usb/controller/ehci_pci.c
  projects/sendfile/sys/dev/usb/controller/uhci_pci.c
  projects/sendfile/sys/dev/usb/controller/xhci_pci.c
  projects/sendfile/sys/dev/usb/serial/uftdi.c
  projects/sendfile/sys/dev/vt/vt_font.c
  projects/sendfile/sys/fs/tmpfs/tmpfs_vnops.c
  projects/sendfile/sys/gnu/dts/arm/meson.dtsi
  projects/sendfile/sys/gnu/dts/arm/meson6.dtsi
  projects/sendfile/sys/gnu/dts/arm/meson8.dtsi
  projects/sendfile/sys/i386/i386/bios.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/minidump_machdep.c
  projects/sendfile/sys/i386/i386/mpboot.s
  projects/sendfile/sys/i386/i386/pmap.c
  projects/sendfile/sys/i386/i386/swtch.s
  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/param.h
  projects/sendfile/sys/i386/include/pmap.h
  projects/sendfile/sys/i386/include/vmparam.h
  projects/sendfile/sys/kern/kern_descrip.c
  projects/sendfile/sys/kern/kern_fork.c
  projects/sendfile/sys/kern/kern_poll.c
  projects/sendfile/sys/kern/kern_timeout.c
  projects/sendfile/sys/kern/sys_pipe.c
  projects/sendfile/sys/kern/tty_pts.c
  projects/sendfile/sys/kern/uipc_mqueue.c
  projects/sendfile/sys/kern/uipc_sem.c
  projects/sendfile/sys/kern/uipc_shm.c
  projects/sendfile/sys/kern/uipc_syscalls.c
  projects/sendfile/sys/mips/adm5120/uart_dev_adm5120.c
  projects/sendfile/sys/mips/atheros/uart_dev_ar933x.c
  projects/sendfile/sys/mips/cavium/uart_dev_oct16550.c
  projects/sendfile/sys/mips/conf/CARAMBOLA2.hints
  projects/sendfile/sys/mips/rt305x/uart_dev_rt305x.c
  projects/sendfile/sys/net/if_types.h
  projects/sendfile/sys/net80211/ieee80211_mesh.c
  projects/sendfile/sys/netinet/ip_input.c
  projects/sendfile/sys/netinet/sctp_syscalls.c
  projects/sendfile/sys/netinet6/in6_mcast.c
  projects/sendfile/sys/netinet6/nd6.c
  projects/sendfile/sys/netpfil/pf/pf.c
  projects/sendfile/sys/netpfil/pf/pf_norm.c
  projects/sendfile/sys/ofed/include/linux/file.h
  projects/sendfile/sys/sparc64/pci/sbbc.c
  projects/sendfile/sys/sys/cdefs.h
  projects/sendfile/sys/sys/filedesc.h
  projects/sendfile/sys/sys/kerneldump.h
  projects/sendfile/sys/sys/module.h
  projects/sendfile/sys/sys/mouse.h
  projects/sendfile/sys/sys/socketvar.h
  projects/sendfile/sys/vm/uma_core.c
  projects/sendfile/sys/vm/uma_int.h
  projects/sendfile/sys/vm/vm_reserv.c
  projects/sendfile/sys/x86/acpica/OsdEnvironment.c
  projects/sendfile/sys/x86/acpica/acpi_wakeup.c
  projects/sendfile/tools/regression/sockets/pr_atomic/Makefile
  projects/sendfile/tools/regression/sockets/pr_atomic/pr_atomic.c
  projects/sendfile/tools/regression/sockets/reconnect/Makefile
  projects/sendfile/tools/regression/sockets/reconnect/reconnect.c
  projects/sendfile/tools/regression/sockets/rtsocket/Makefile
  projects/sendfile/tools/regression/sockets/rtsocket/rtsocket.c
  projects/sendfile/tools/regression/sockets/sblock/Makefile
  projects/sendfile/tools/regression/sockets/sblock/sblock.c
  projects/sendfile/tools/regression/sockets/sendfile/sendfile.c
  projects/sendfile/tools/regression/sockets/shutdown/Makefile
  projects/sendfile/tools/regression/sockets/shutdown/shutdown.c
  projects/sendfile/tools/regression/sockets/sigpipe/Makefile
  projects/sendfile/tools/regression/sockets/sigpipe/sigpipe.c
  projects/sendfile/tools/regression/sockets/so_setfib/Makefile
  projects/sendfile/tools/regression/sockets/so_setfib/so_setfib.c
  projects/sendfile/tools/regression/sockets/socketpair/Makefile
  projects/sendfile/tools/regression/sockets/socketpair/socketpair.c
  projects/sendfile/tools/regression/sockets/unix_bindconnect/Makefile
  projects/sendfile/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c
  projects/sendfile/tools/regression/sockets/unix_close_race/Makefile
  projects/sendfile/tools/regression/sockets/unix_close_race/unix_close_race.c
  projects/sendfile/tools/regression/sockets/unix_sendtorace/Makefile
  projects/sendfile/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c
  projects/sendfile/tools/regression/sockets/unix_socket/Makefile
  projects/sendfile/tools/regression/sockets/unix_socket/unix_socket.c
  projects/sendfile/tools/regression/sockets/unix_sorflush/Makefile
  projects/sendfile/tools/regression/sockets/unix_sorflush/unix_sorflush.c
  projects/sendfile/tools/regression/sockets/zerosend/zerosend.c
  projects/sendfile/usr.bin/Makefile
  projects/sendfile/usr.bin/gzip/gzip.1
  projects/sendfile/usr.bin/gzip/gzip.c
  projects/sendfile/usr.bin/ipcs/Makefile
  projects/sendfile/usr.bin/ipcs/ipc.c
  projects/sendfile/usr.bin/ipcs/ipc.h
  projects/sendfile/usr.bin/ipcs/ipcs.c
  projects/sendfile/usr.bin/iscsictl/Makefile
  projects/sendfile/usr.bin/iscsictl/iscsictl.c
  projects/sendfile/usr.bin/iscsictl/parse.y
  projects/sendfile/usr.bin/iscsictl/periphs.c
  projects/sendfile/usr.bin/vi/Makefile
  projects/sendfile/usr.sbin/bluetooth/hccontrol/hccontrol.c
  projects/sendfile/usr.sbin/bluetooth/hccontrol/util.c
  projects/sendfile/usr.sbin/ctld/discovery.c
  projects/sendfile/usr.sbin/ctld/isns.c
  projects/sendfile/usr.sbin/ctld/keys.c
  projects/sendfile/usr.sbin/ctld/login.c
  projects/sendfile/usr.sbin/ctld/parse.y
  projects/sendfile/usr.sbin/ctld/pdu.c
  projects/sendfile/usr.sbin/ctld/token.l
  projects/sendfile/usr.sbin/fifolog/fifolog_reader/Makefile
  projects/sendfile/usr.sbin/fifolog/fifolog_writer/Makefile
Directory Properties:
  projects/sendfile/   (props changed)
  projects/sendfile/contrib/nvi/   (props changed)
  projects/sendfile/etc/   (props changed)
  projects/sendfile/lib/libc/   (props changed)
  projects/sendfile/share/   (props changed)
  projects/sendfile/sys/   (props changed)
  projects/sendfile/sys/boot/   (props changed)
  projects/sendfile/sys/conf/   (props changed)
  projects/sendfile/sys/contrib/dev/acpica/   (props changed)
  projects/sendfile/sys/contrib/x86emu/   (props changed)
  projects/sendfile/sys/gnu/dts/   (props changed)
  projects/sendfile/sys/gnu/dts/arm/   (props changed)

Modified: projects/sendfile/ObsoleteFiles.inc
==============================================================================
--- projects/sendfile/ObsoleteFiles.inc	Tue Apr 14 20:05:26 2015	(r281538)
+++ projects/sendfile/ObsoleteFiles.inc	Tue Apr 14 20:08:37 2015	(r281539)
@@ -38,6 +38,18 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150410
+OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz
+OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/10.exref
+OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/11.edit
+OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz
+OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz
+OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/12.vi
+OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/13.viref
 # 20150329
 .if ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/bootconfig.h

Modified: projects/sendfile/README
==============================================================================
--- projects/sendfile/README	Tue Apr 14 20:05:26 2015	(r281538)
+++ projects/sendfile/README	Tue Apr 14 20:08:37 2015	(r281539)
@@ -34,9 +34,7 @@ The sample kernel configuration files re
 sub-directory (assuming that you've installed the kernel sources), the
 file named GENERIC being the one used to build your initial installation
 kernel.  The file NOTES contains entries and documentation for all possible
-devices, not just those commonly used.  It is the successor of the ancient
-LINT file, but in contrast to LINT, it is not buildable as a kernel but a
-pure reference and documentation file.
+devices, not just those commonly used.
 
 
 Source Roadmap:
@@ -77,6 +75,9 @@ share		Shared resources.
 
 sys		Kernel sources.
 
+tests		Regression tests which can be run by Kyua.  See tests/README
+		for additional information.
+
 tools		Utilities for regression testing and miscellaneous tasks.
 
 usr.bin		User commands.

Modified: projects/sendfile/contrib/nvi/README
==============================================================================
--- projects/sendfile/contrib/nvi/README	Tue Apr 14 20:05:26 2015	(r281538)
+++ projects/sendfile/contrib/nvi/README	Tue Apr 14 20:08:37 2015	(r281539)
@@ -1,6 +1,6 @@
-#	$Id: README,v 9.1 2013/11/02 02:50:23 zy Exp $
+#	$Id: README,v 9.2 2015/04/08 17:18:56 zy Exp $
 
-This is version 2.1.2 (2012-11-02) of nex/nvi, a reimplementation of the ex/vi
+This is version 2.1.3 (2015-04-08) of nex/nvi, a reimplementation of the ex/vi
 text editors originally distributed as part of the Fourth Berkeley
 Software Distribution (4BSD), by the University of California, Berkeley.
 

Modified: projects/sendfile/contrib/nvi/catalog/dump.c
==============================================================================
--- projects/sendfile/contrib/nvi/catalog/dump.c	Tue Apr 14 20:05:26 2015	(r281538)
+++ projects/sendfile/contrib/nvi/catalog/dump.c	Tue Apr 14 20:08:37 2015	(r281539)
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -32,12 +28,6 @@
  */
 
 #ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
 static char sccsid[] = "@(#)dump.c	8.1 (Berkeley) 8/31/94";
 #endif /* not lint */
 
@@ -45,8 +35,7 @@ static char sccsid[] = "@(#)dump.c	8.1 (
 #include <stdio.h>
 
 static void
-parse(fp)
-	FILE *fp;
+parse(FILE *fp)
 {
 	int ch, s1, s2, s3;
 
@@ -96,9 +85,7 @@ parse(fp)
 }
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	FILE *fp;
 

Modified: projects/sendfile/contrib/nvi/cl/cl.h
==============================================================================
--- projects/sendfile/contrib/nvi/cl/cl.h	Tue Apr 14 20:05:26 2015	(r281538)
+++ projects/sendfile/contrib/nvi/cl/cl.h	Tue Apr 14 20:08:37 2015	(r281539)
@@ -80,16 +80,4 @@ typedef enum { INP_OK=0, INP_EOF, INP_ER
 #define	RCNO(sp, cno)	(cno)
 #define	RLNO(sp, lno)	(lno)
 
-/*
- * XXX
- * Some implementations of curses.h don't define these for us.  Used for
- * compatibility only.
- */
-#ifndef TRUE
-#define	TRUE	1
-#endif
-#ifndef FALSE
-#define	FALSE	0
-#endif
-
 #include "extern.h"

Modified: projects/sendfile/contrib/nvi/cl/cl_funcs.c
==============================================================================
--- projects/sendfile/contrib/nvi/cl/cl_funcs.c	Tue Apr 14 20:05:26 2015	(r281538)
+++ projects/sendfile/contrib/nvi/cl/cl_funcs.c	Tue Apr 14 20:08:37 2015	(r281539)
@@ -33,7 +33,7 @@ static const char sccsid[] = "$Id: cl_fu
 #include "../vi/vi.h"
 #include "cl.h"
 
-static void cl_rdiv __P((SCR *));
+static void cl_rdiv(SCR *);
 
 static int 
 addstr4(SCR *sp, void *str, size_t len, int wide)
@@ -76,31 +76,31 @@ addstr4(SCR *sp, void *str, size_t len, 
  * cl_waddstr --
  *	Add len bytes from the string at the cursor, advancing the cursor.
  *
- * PUBLIC: int cl_waddstr __P((SCR *, const CHAR_T *, size_t));
+ * PUBLIC: int cl_waddstr(SCR *, const CHAR_T *, size_t);
  */
 int
 cl_waddstr(SCR *sp, const CHAR_T *str, size_t len)
 {
-    return addstr4(sp, (void *)str, len, 1);
+	return addstr4(sp, (void *)str, len, 1);
 }
 
 /*
  * cl_addstr --
  *	Add len bytes from the string at the cursor, advancing the cursor.
  *
- * PUBLIC: int cl_addstr __P((SCR *, const char *, size_t));
+ * PUBLIC: int cl_addstr(SCR *, const char *, size_t);
  */
 int
 cl_addstr(SCR *sp, const char *str, size_t len)
 {
-    return addstr4(sp, (void *)str, len, 0);
+	return addstr4(sp, (void *)str, len, 0);
 }
 
 /*
  * cl_attr --
  *	Toggle a screen attribute on/off.
  *
- * PUBLIC: int cl_attr __P((SCR *, scr_attr_t, int));
+ * PUBLIC: int cl_attr(SCR *, scr_attr_t, int);
  */
 int
 cl_attr(SCR *sp, scr_attr_t attribute, int on)
@@ -187,7 +187,7 @@ cl_attr(SCR *sp, scr_attr_t attribute, i
  * cl_baud --
  *	Return the baud rate.
  *
- * PUBLIC: int cl_baud __P((SCR *, u_long *));
+ * PUBLIC: int cl_baud(SCR *, u_long *);
  */
 int
 cl_baud(SCR *sp, u_long *ratep)
@@ -228,7 +228,7 @@ cl_baud(SCR *sp, u_long *ratep)
  * cl_bell --
  *	Ring the bell/flash the screen.
  *
- * PUBLIC: int cl_bell __P((SCR *));
+ * PUBLIC: int cl_bell(SCR *);
  */
 int
 cl_bell(SCR *sp)
@@ -252,7 +252,7 @@ cl_bell(SCR *sp)
  * cl_clrtoeol --
  *	Clear from the current cursor to the end of the line.
  *
- * PUBLIC: int cl_clrtoeol __P((SCR *));
+ * PUBLIC: int cl_clrtoeol(SCR *);
  */
 int
 cl_clrtoeol(SCR *sp)
@@ -281,7 +281,7 @@ cl_clrtoeol(SCR *sp)
  * cl_cursor --
  *	Return the current cursor position.
  *
- * PUBLIC: int cl_cursor __P((SCR *, size_t *, size_t *));
+ * PUBLIC: int cl_cursor(SCR *, size_t *, size_t *);
  */
 int
 cl_cursor(SCR *sp, size_t *yp, size_t *xp)
@@ -307,7 +307,7 @@ cl_cursor(SCR *sp, size_t *yp, size_t *x
  * cl_deleteln --
  *	Delete the current line, scrolling all lines below it.
  *
- * PUBLIC: int cl_deleteln __P((SCR *));
+ * PUBLIC: int cl_deleteln(SCR *);
  */
 int
 cl_deleteln(SCR *sp)
@@ -344,7 +344,7 @@ cl_deleteln(SCR *sp)
  * cl_discard --
  *	Discard a screen.
  *
- * PUBLIC: int cl_discard __P((SCR *, SCR **));
+ * PUBLIC: int cl_discard(SCR *, SCR **);
  */
 int
 cl_discard(SCR *discardp, SCR **acquirep)
@@ -385,7 +385,7 @@ cl_discard(SCR *discardp, SCR **acquirep
  *	Adjust the screen for ex.  This routine is purely for standalone
  *	ex programs.  All special purpose, all special case.
  *
- * PUBLIC: int cl_ex_adjust __P((SCR *, exadj_t));
+ * PUBLIC: int cl_ex_adjust(SCR *, exadj_t);
  */
 int
 cl_ex_adjust(SCR *sp, exadj_t action)
@@ -440,7 +440,7 @@ cl_ex_adjust(SCR *sp, exadj_t action)
  * cl_insertln --
  *	Push down the current line, discarding the bottom line.
  *
- * PUBLIC: int cl_insertln __P((SCR *));
+ * PUBLIC: int cl_insertln(SCR *);
  */
 int
 cl_insertln(SCR *sp)
@@ -458,7 +458,7 @@ cl_insertln(SCR *sp)
  * cl_keyval --
  *	Return the value for a special key.
  *
- * PUBLIC: int cl_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *));
+ * PUBLIC: int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *);
  */
 int
 cl_keyval(SCR *sp, scr_keyval_t val, CHAR_T *chp, int *dnep)
@@ -496,7 +496,7 @@ cl_keyval(SCR *sp, scr_keyval_t val, CHA
  * cl_move --
  *	Move the cursor.
  *
- * PUBLIC: int cl_move __P((SCR *, size_t, size_t));
+ * PUBLIC: int cl_move(SCR *, size_t, size_t);
  */
 int
 cl_move(SCR *sp, size_t lno, size_t cno)
@@ -516,7 +516,7 @@ cl_move(SCR *sp, size_t lno, size_t cno)
  * cl_refresh --
  *	Refresh the screen.
  *
- * PUBLIC: int cl_refresh __P((SCR *, int));
+ * PUBLIC: int cl_refresh(SCR *, int);
  */
 int
 cl_refresh(SCR *sp, int repaint)
@@ -599,7 +599,7 @@ cl_rdiv(SCR *sp)
  * cl_rename --
  *	Rename the file.
  *
- * PUBLIC: int cl_rename __P((SCR *, char *, int));
+ * PUBLIC: int cl_rename(SCR *, char *, int);
  */
 int
 cl_rename(SCR *sp, char *name, int on)
@@ -621,7 +621,7 @@ cl_rename(SCR *sp, char *name, int on)
 	if (on) {
 		clp->focus = sp;
 		if (!F_ISSET(clp, CL_RENAME_OK) ||
-				strncmp(OG_STR(gp, GO_TERM), "xterm", 5))
+		    strncmp(OG_STR(gp, GO_TERM), "xterm", 5))
 			return (0);
 
 		if (clp->oname == NULL && (wid = getenv("WINDOWID"))) {
@@ -654,7 +654,7 @@ rename:		cl_setname(gp, name);
  * cl_setname --
  *	Set a X11 icon/window name.
  *
- * PUBLIC: void cl_setname __P((GS *, char *));
+ * PUBLIC: void cl_setname(GS *, char *);
  */
 void
 cl_setname(GS *gp, char *name)
@@ -671,7 +671,7 @@ cl_setname(GS *gp, char *name)
  * cl_split --
  *	Split a screen.
  *
- * PUBLIC: int cl_split __P((SCR *, SCR *));
+ * PUBLIC: int cl_split(SCR *, SCR *);
  */
 int
 cl_split(SCR *origp, SCR *newp)
@@ -697,7 +697,7 @@ cl_split(SCR *origp, SCR *newp)
  * cl_suspend --
  *	Suspend a screen.
  *
- * PUBLIC: int cl_suspend __P((SCR *, int *));
+ * PUBLIC: int cl_suspend(SCR *, int *);
  */
 int
 cl_suspend(SCR *sp, int *allowedp)
@@ -825,7 +825,7 @@ cl_suspend(SCR *sp, int *allowedp)
  * cl_usage --
  *	Print out the curses usage messages.
  * 
- * PUBLIC: void cl_usage __P((void));
+ * PUBLIC: void cl_usage(void);
  */
 void
 cl_usage(void)

Modified: projects/sendfile/contrib/nvi/cl/cl_main.c
==============================================================================
--- projects/sendfile/contrib/nvi/cl/cl_main.c	Tue Apr 14 20:05:26 2015	(r281538)
+++ projects/sendfile/contrib/nvi/cl/cl_main.c	Tue Apr 14 20:08:37 2015	(r281539)
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: cl_main.c,v 10.55 2011/08/15 19:52:28 zy Exp $";
+static const char sccsid[] = "$Id: cl_main.c,v 10.56 2015/04/05 06:20:53 zy Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -36,20 +36,20 @@ static const char sccsid[] = "$Id: cl_ma
 GS *__global_list;				/* GLOBAL: List of screens. */
 sigset_t __sigblockset;				/* GLOBAL: Blocked signals. */
 
-static void	   cl_func_std __P((GS *));
-static CL_PRIVATE *cl_init __P((GS *));
-static GS	  *gs_init __P((char *));
-static void	   perr __P((char *, char *));
-static int	   setsig __P((int, struct sigaction *, void (*)(int)));
-static void	   sig_end __P((GS *));
-static void	   term_init __P((char *, char *));
+static void	   cl_func_std(GS *);
+static CL_PRIVATE *cl_init(GS *);
+static GS	  *gs_init(char *);
+static void	   perr(char *, char *);
+static int	   setsig(int, struct sigaction *, void (*)(int));
+static void	   sig_end(GS *);
+static void	   term_init(char *, char *);
 
 /*
  * main --
  *	This is the main loop for the standalone curses editor.
  */
 int
-main(int argc, char **argv)
+main(int argc, char *argv[])
 {
 	static int reenter;
 	CL_PRIVATE *clp;
@@ -92,7 +92,7 @@ main(int argc, char **argv)
 	 * have to use termcap/terminfo to find out how big the screen is.
 	 */
 	if ((ttype = getenv("TERM")) == NULL)
-		ttype = "unknown";
+		ttype = "ansi";
 	term_init(gp->progname, ttype);
 
 	/* Add the terminal type to the global structure. */
@@ -146,7 +146,7 @@ main(int argc, char **argv)
 	}
 
 	/* Free the global and CL private areas. */
-#if defined(DEBUG) || defined(PURIFY) || defined(LIBRARY)
+#if defined(DEBUG) || defined(PURIFY)
 	if (clp->oname != NULL)
 		free(clp->oname);
 	free(clp);
@@ -292,7 +292,7 @@ h_winch(int signo)
  * sig_init --
  *	Initialize signals.
  *
- * PUBLIC: int sig_init __P((GS *, SCR *));
+ * PUBLIC: int sig_init(GS *, SCR *);
  */
 int
 sig_init(GS *gp, SCR *sp)
@@ -337,7 +337,7 @@ sig_init(GS *gp, SCR *sp)
  *	Set a signal handler.
  */
 static int
-setsig(int signo, struct sigaction *oactp, void (*handler) (int))
+setsig(int signo, struct sigaction *oactp, void (*handler)(int))
 {
 	struct sigaction act;
 
@@ -345,21 +345,12 @@ setsig(int signo, struct sigaction *oact
 	 * Use sigaction(2), not signal(3), since we don't always want to
 	 * restart system calls.  The example is when waiting for a command
 	 * mode keystroke and SIGWINCH arrives.  Besides, you can't portably
-	 * restart system calls (thanks, POSIX!).  On the other hand, you
-	 * can't portably NOT restart system calls (thanks, Sun!).  SunOS
-	 * used SA_INTERRUPT as their extension to NOT restart read calls.
-	 * We sure hope nobody else used it for anything else.  Mom told me
-	 * there'd be days like this.  She just never told me that there'd
-	 * be so many.
+	 * restart system calls (thanks, POSIX!).
 	 */
 	act.sa_handler = handler;
 	sigemptyset(&act.sa_mask);
 
-#ifdef SA_INTERRUPT
-	act.sa_flags = SA_INTERRUPT;
-#else
 	act.sa_flags = 0;
-#endif
 	return (sigaction(signo, &act, oactp));
 }
 

Modified: projects/sendfile/contrib/nvi/cl/cl_read.c
==============================================================================
--- projects/sendfile/contrib/nvi/cl/cl_read.c	Tue Apr 14 20:05:26 2015	(r281538)
+++ projects/sendfile/contrib/nvi/cl/cl_read.c	Tue Apr 14 20:08:37 2015	(r281539)
@@ -35,15 +35,15 @@ static const char sccsid[] = "$Id: cl_re
 #undef columns
 #undef lines  
 
-static input_t	cl_read __P((SCR *,
-    u_int32_t, char *, size_t, int *, struct timeval *));
-static int	cl_resize __P((SCR *, size_t, size_t));
+static input_t	cl_read(SCR *,
+    u_int32_t, char *, size_t, int *, struct timeval *);
+static int	cl_resize(SCR *, size_t, size_t);
 
 /*
  * cl_event --
  *	Return a single event.
  *
- * PUBLIC: int cl_event __P((SCR *, EVENT *, u_int32_t, int));
+ * PUBLIC: int cl_event(SCR *, EVENT *, u_int32_t, int);
  */
 int
 cl_event(SCR *sp, EVENT *evp, u_int32_t flags, int ms)
@@ -143,7 +143,8 @@ read:
  *	Read characters from the input.
  */
 static input_t
-cl_read(SCR *sp, u_int32_t flags, char *bp, size_t blen, int *nrp, struct timeval *tp)
+cl_read(SCR *sp, u_int32_t flags, char *bp, size_t blen, int *nrp,
+    struct timeval *tp)
 {
 	struct termios term1, term2;
 	CL_PRIVATE *clp;

Modified: projects/sendfile/contrib/nvi/cl/cl_screen.c
==============================================================================
--- projects/sendfile/contrib/nvi/cl/cl_screen.c	Tue Apr 14 20:05:26 2015	(r281538)
+++ projects/sendfile/contrib/nvi/cl/cl_screen.c	Tue Apr 14 20:08:37 2015	(r281539)
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: cl_screen.c,v 10.56 2002/05/03 19:59:44 skimo Exp $";
+static const char sccsid[] = "$Id: cl_screen.c,v 10.58 2015/04/08 02:12:11 zy Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -32,18 +32,18 @@ static const char sccsid[] = "$Id: cl_sc
 #include "../common/common.h"
 #include "cl.h"
 
-static int	cl_ex_end __P((GS *));
-static int	cl_ex_init __P((SCR *));
-static void	cl_freecap __P((CL_PRIVATE *));
-static int	cl_vi_end __P((GS *));
-static int	cl_vi_init __P((SCR *));
-static int	cl_putenv __P((char *, char *, u_long));
+static int	cl_ex_end(GS *);
+static int	cl_ex_init(SCR *);
+static void	cl_freecap(CL_PRIVATE *);
+static int	cl_vi_end(GS *);
+static int	cl_vi_init(SCR *);
+static int	cl_putenv(char *, char *, u_long);
 
 /*
  * cl_screen --
  *	Switch screen types.
  *
- * PUBLIC: int cl_screen __P((SCR *, u_int32_t));
+ * PUBLIC: int cl_screen(SCR *, u_int32_t);
  */
 int
 cl_screen(SCR *sp, u_int32_t flags)
@@ -58,11 +58,9 @@ cl_screen(SCR *sp, u_int32_t flags)
 
 	/* See if the current information is incorrect. */
 	if (F_ISSET(gp, G_SRESTART)) {
-		if (CLSP(sp)) {
-		    delwin(CLSP(sp));
-		    sp->cl_private = NULL;
-		}
-		if (cl_quit(gp))
+		if ((!F_ISSET(sp, SC_SCR_EX | SC_SCR_VI) ||
+		     resizeterm(O_VAL(sp, O_LINES), O_VAL(sp, O_COLUMNS))) &&
+		    cl_quit(gp))
 			return (1);
 		F_CLR(gp, G_SRESTART);
 	}
@@ -131,7 +129,7 @@ cl_screen(SCR *sp, u_int32_t flags)
  * cl_quit --
  *	Shutdown the screens.
  *
- * PUBLIC: int cl_quit __P((GS *));
+ * PUBLIC: int cl_quit(GS *);
  */
 int
 cl_quit(GS *gp)
@@ -234,20 +232,15 @@ cl_vi_init(SCR *sp)
 	cl_putenv("COLUMNS", NULL, (u_long)O_VAL(sp, O_COLUMNS));
 
 	/*
-	 * We don't care about the SCREEN reference returned by newterm, we
-	 * never have more than one SCREEN at a time.
-	 *
-	 * XXX
-	 * The SunOS initscr() can't be called twice.  Don't even think about
-	 * using it.  It fails in subtle ways (e.g. select(2) on fileno(stdin)
-	 * stops working).  (The SVID notes that applications should only call
-	 * initscr() once.)
-	 *
-	 * XXX
-	 * The HP/UX newterm doesn't support the NULL first argument, so we
-	 * have to specify the terminal type.
+	 * The terminal is aways initialized, either in `main`, or by a
+	 * previous call to newterm(3X).
 	 */
 	(void)del_curterm(cur_term);
+
+	/*
+	 * We never have more than one SCREEN at a time, so set_term(NULL) will
+	 * give us the last SCREEN.
+	 */
 	errno = 0;
 	if (newterm(ttype, stdout, stdin) == NULL) {
 		if (errno)
@@ -416,6 +409,9 @@ cl_vi_end(GS *gp)
 	/* End curses window. */
 	(void)endwin();
 
+	/* Free the SCREEN created by newterm(3X). */
+	delscreen(set_term(NULL));
+
 	/*
 	 * XXX
 	 * The screen TE sequence just got sent.  See the comment in
@@ -520,7 +516,7 @@ cl_ex_end(GS *gp)
  * cl_getcap --
  *	Retrieve termcap/terminfo strings.
  *
- * PUBLIC: int cl_getcap __P((SCR *, char *, char **));
+ * PUBLIC: int cl_getcap(SCR *, char *, char **);
  */
 int
 cl_getcap(SCR *sp, char *name, char **elementp)

Modified: projects/sendfile/contrib/nvi/cl/cl_term.c
==============================================================================
--- projects/sendfile/contrib/nvi/cl/cl_term.c	Tue Apr 14 20:05:26 2015	(r281538)
+++ projects/sendfile/contrib/nvi/cl/cl_term.c	Tue Apr 14 20:08:37 2015	(r281539)
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: cl_term.c,v 10.34 2013/12/07 16:21:14 wjenkner Exp $";
+static const char sccsid[] = "$Id: cl_term.c,v 10.35 2015/04/08 02:12:11 zy Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -34,7 +34,7 @@ static const char sccsid[] = "$Id: cl_te
 #include "../common/common.h"
 #include "cl.h"
 
-static int cl_pfmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
+static int cl_pfmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t);
 
 /*
  * XXX
@@ -81,7 +81,7 @@ static TKLIST const m2_tklist[] = {	/* I
  * cl_term_init --
  *	Initialize the special keys defined by the termcap/terminfo entry.
  *
- * PUBLIC: int cl_term_init __P((SCR *));
+ * PUBLIC: int cl_term_init(SCR *);
  */
 int
 cl_term_init(SCR *sp)
@@ -182,7 +182,7 @@ cl_term_init(SCR *sp)
  * cl_term_end --
  *	End the special keys defined by the termcap/terminfo entry.
  *
- * PUBLIC: int cl_term_end __P((GS *));
+ * PUBLIC: int cl_term_end(GS *);
  */
 int
 cl_term_end(GS *gp)
@@ -206,7 +206,7 @@ cl_term_end(GS *gp)
  * cl_fmap --
  *	Map a function key.
  *
- * PUBLIC: int cl_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
+ * PUBLIC: int cl_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t);
  */
 int
 cl_fmap(SCR *sp, seq_t stype, CHAR_T *from, size_t flen, CHAR_T *to, size_t tlen)
@@ -258,7 +258,7 @@ cl_pfmap(SCR *sp, seq_t stype, CHAR_T *f
  * cl_optchange --
  *	Curses screen specific "option changed" routine.
  *
- * PUBLIC: int cl_optchange __P((SCR *, int, char *, u_long *));
+ * PUBLIC: int cl_optchange(SCR *, int, char *, u_long *);
  */
 int
 cl_optchange(SCR *sp, int opt, char *str, u_long *valp)
@@ -268,15 +268,16 @@ cl_optchange(SCR *sp, int opt, char *str
 	clp = CLP(sp);
 
 	switch (opt) {
+	case O_TERM:
+		F_CLR(sp, SC_SCR_EX | SC_SCR_VI);
+		/* FALLTHROUGH */
 	case O_COLUMNS:
 	case O_LINES:
-	case O_TERM:
 		/*
-		 * Changing the columns, lines or terminal require that
-		 * we restart the screen.
+		 * Changing the terminal type requires that we reinitialize
+		 * curses, while resizing does not.
 		 */
 		F_SET(sp->gp, G_SRESTART);
-		F_CLR(sp, SC_SCR_EX | SC_SCR_VI);
 		break;
 	case O_MESG:
 		(void)cl_omesg(sp, clp, *valp);
@@ -305,7 +306,7 @@ cl_optchange(SCR *sp, int opt, char *str
  * cl_omesg --
  *	Turn the tty write permission on or off.
  *
- * PUBLIC: int cl_omesg __P((SCR *, CL_PRIVATE *, int));
+ * PUBLIC: int cl_omesg(SCR *, CL_PRIVATE *, int);
  */
 int
 cl_omesg(SCR *sp, CL_PRIVATE *clp, int on)
@@ -351,7 +352,7 @@ cl_omesg(SCR *sp, CL_PRIVATE *clp, int o
  * cl_ssize --
  *	Return the terminal size.
  *
- * PUBLIC: int cl_ssize __P((SCR *, int, size_t *, size_t *, int *));
+ * PUBLIC: int cl_ssize(SCR *, int, size_t *, size_t *, int *);
  */
 int
 cl_ssize(SCR *sp, int sigwinch, size_t *rowp, size_t *colp, int *changedp)
@@ -467,7 +468,7 @@ noterm:	if (row == 0)
  * cl_putchar --
  *	Function version of putchar, for tputs.
  *
- * PUBLIC: int cl_putchar __P((int));
+ * PUBLIC: int cl_putchar(int);
  */
 int
 cl_putchar(int ch)

Modified: projects/sendfile/contrib/nvi/cl/extern.h
==============================================================================
--- projects/sendfile/contrib/nvi/cl/extern.h	Tue Apr 14 20:05:26 2015	(r281538)
+++ projects/sendfile/contrib/nvi/cl/extern.h	Tue Apr 14 20:08:37 2015	(r281539)
@@ -1,31 +1,31 @@
-int cl_waddstr __P((SCR *, const CHAR_T *, size_t));
-int cl_addstr __P((SCR *, const char *, size_t));
-int cl_attr __P((SCR *, scr_attr_t, int));
-int cl_baud __P((SCR *, u_long *));
-int cl_bell __P((SCR *));
-int cl_clrtoeol __P((SCR *));
-int cl_cursor __P((SCR *, size_t *, size_t *));
-int cl_deleteln __P((SCR *));
-int cl_discard __P((SCR *, SCR **));
-int cl_ex_adjust __P((SCR *, exadj_t));
-int cl_insertln __P((SCR *));
-int cl_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *));
-int cl_move __P((SCR *, size_t, size_t));
-int cl_refresh __P((SCR *, int));
-int cl_rename __P((SCR *, char *, int));
-void cl_setname __P((GS *, char *));
-int cl_split __P((SCR *, SCR *));
-int cl_suspend __P((SCR *, int *));
-void cl_usage __P((void));
-int sig_init __P((GS *, SCR *));
-int cl_event __P((SCR *, EVENT *, u_int32_t, int));
-int cl_screen __P((SCR *, u_int32_t));
-int cl_quit __P((GS *));
-int cl_getcap __P((SCR *, char *, char **));
-int cl_term_init __P((SCR *));
-int cl_term_end __P((GS *));
-int cl_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
-int cl_optchange __P((SCR *, int, char *, u_long *));
-int cl_omesg __P((SCR *, CL_PRIVATE *, int));
-int cl_ssize __P((SCR *, int, size_t *, size_t *, int *));
-int cl_putchar __P((int));
+int cl_waddstr(SCR *, const CHAR_T *, size_t);
+int cl_addstr(SCR *, const char *, size_t);
+int cl_attr(SCR *, scr_attr_t, int);
+int cl_baud(SCR *, u_long *);
+int cl_bell(SCR *);
+int cl_clrtoeol(SCR *);
+int cl_cursor(SCR *, size_t *, size_t *);
+int cl_deleteln(SCR *);
+int cl_discard(SCR *, SCR **);
+int cl_ex_adjust(SCR *, exadj_t);
+int cl_insertln(SCR *);
+int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *);
+int cl_move(SCR *, size_t, size_t);
+int cl_refresh(SCR *, int);
+int cl_rename(SCR *, char *, int);
+void cl_setname(GS *, char *);
+int cl_split(SCR *, SCR *);
+int cl_suspend(SCR *, int *);
+void cl_usage(void);
+int sig_init(GS *, SCR *);
+int cl_event(SCR *, EVENT *, u_int32_t, int);
+int cl_screen(SCR *, u_int32_t);
+int cl_quit(GS *);
+int cl_getcap(SCR *, char *, char **);
+int cl_term_init(SCR *);
+int cl_term_end(GS *);
+int cl_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t);
+int cl_optchange(SCR *, int, char *, u_long *);
+int cl_omesg(SCR *, CL_PRIVATE *, int);
+int cl_ssize(SCR *, int, size_t *, size_t *, int *);
+int cl_putchar(int);

Modified: projects/sendfile/contrib/nvi/common/common.h
==============================================================================
--- projects/sendfile/contrib/nvi/common/common.h	Tue Apr 14 20:05:26 2015	(r281538)
+++ projects/sendfile/contrib/nvi/common/common.h	Tue Apr 14 20:08:37 2015	(r281539)
@@ -23,8 +23,8 @@
  */
 typedef struct _cb		CB;
 typedef struct _csc		CSC;
-typedef struct _conv	    	CONV;
-typedef struct _conv_win    	CONVWIN;
+typedef struct _conv		CONV;
+typedef struct _conv_win	CONVWIN;
 typedef struct _event		EVENT;
 typedef struct _excmd		EXCMD;
 typedef struct _exf		EXF;

Modified: projects/sendfile/contrib/nvi/common/conv.c
==============================================================================
--- projects/sendfile/contrib/nvi/common/conv.c	Tue Apr 14 20:05:26 2015	(r281538)
+++ projects/sendfile/contrib/nvi/common/conv.c	Tue Apr 14 20:08:37 2015	(r281539)
@@ -12,7 +12,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: conv.c,v 2.39 2013/07/01 23:28:13 zy Exp $";
+static const char sccsid[] = "$Id: conv.c,v 2.40 2014/02/27 16:25:29 zy Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -36,35 +36,37 @@ static const char sccsid[] = "$Id: conv.
  * codeset --
  *	Get the locale encoding.
  *
- * PUBLIC: char * codeset __P((void));
+ * PUBLIC: char * codeset(void);
  */
 char *
-codeset(void) {
-    static char *cs;
+codeset(void)
+{
+	static char *cs;
+
+	if (cs == NULL)
+		cs = nl_langinfo(CODESET);
 
-    if (cs == NULL)
-	cs = nl_langinfo(CODESET);
-    return cs;
+	return cs;
 }
 
 #ifdef USE_WIDECHAR
 static int 
-raw2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw,
-	size_t *tolen, CHAR_T **dst)
+raw2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, size_t *tolen,
+    CHAR_T **dst)
 {
-    int i;
-    CHAR_T **tostr = &cw->bp1.wc;
-    size_t  *blen = &cw->blen1;
+	int i;
+	CHAR_T **tostr = &cw->bp1.wc;
+	size_t  *blen = &cw->blen1;
 
-    BINC_RETW(NULL, *tostr, *blen, len);
+	BINC_RETW(NULL, *tostr, *blen, len);
 
-    *tolen = len;
-    for (i = 0; i < len; ++i)
-	(*tostr)[i] = (u_char) str[i];
+	*tolen = len;
+	for (i = 0; i < len; ++i)
+		(*tostr)[i] = (u_char) str[i];
 
-    *dst = cw->bp1.wc;
+	*dst = cw->bp1.wc;
 
-    return 0;
+	return 0;
 }
 
 #define CONV_BUFFER_SIZE    512
@@ -73,27 +75,27 @@ raw2int(SCR *sp, const char * str, ssize
  * len contains the number of bytes put in the buffer
  */
 #ifdef USE_ICONV
-#define CONVERT(str, left, src, len)				    	\
-    do {								\
-	size_t outleft;							\
-	char *bp = buffer;						\
-	outleft = CONV_BUFFER_SIZE;					\
-	errno = 0;							\
-	if (iconv(id, (iconv_src_t)&str, &left, &bp, &outleft) == -1 &&	\
-		errno != E2BIG)						\
-	    goto err;							\
-	if ((len = CONV_BUFFER_SIZE - outleft) == 0) {			\
-	    error = -left;						\
-	    goto err;							\
-	}				    				\
-	src = buffer;							\
-    } while (0)
+#define CONVERT(str, left, src, len)					\
+	do {								\
+		size_t outleft;						\
+		char *bp = buffer;					\
+		outleft = CONV_BUFFER_SIZE;				\
+		errno = 0;						\
+		if (iconv(id, (iconv_src_t)&str, &left, &bp, &outleft)	\
+		    == -1 && errno != E2BIG)				\
+			goto err;					\
+		if ((len = CONV_BUFFER_SIZE - outleft) == 0) {		\
+			error = -left;					\
+			goto err;					\
+		}							\
+		src = buffer;						\
+	} while (0)
 
 #define IC_RESET()							\
-    do {								\
-	if (id != (iconv_t)-1)						\
-	    iconv(id, NULL, NULL, NULL, NULL);				\
-    } while(0)
+	do {								\
+		if (id != (iconv_t)-1)					\
+			iconv(id, NULL, NULL, NULL, NULL);		\
+	} while(0)
 #else
 #define CONVERT(str, left, src, len)
 #define IC_RESET()
@@ -101,114 +103,116 @@ raw2int(SCR *sp, const char * str, ssize
 
 static int 
 default_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, 
-		size_t *tolen, CHAR_T **dst, iconv_t id)
+    size_t *tolen, CHAR_T **dst, iconv_t id)
 {
-    size_t i = 0, j;
-    CHAR_T **tostr = &cw->bp1.wc;
-    size_t  *blen = &cw->blen1;
-    mbstate_t mbs;
-    size_t   n;
-    ssize_t  nlen = len;
-    char *src = (char *)str;
+	size_t i = 0, j;
+	CHAR_T **tostr = &cw->bp1.wc;
+	size_t *blen = &cw->blen1;
+	mbstate_t mbs;
+	size_t n;
+	ssize_t nlen = len;
+	char *src = (char *)str;
 #ifdef USE_ICONV
-    char	buffer[CONV_BUFFER_SIZE];
+	char buffer[CONV_BUFFER_SIZE];
 #endif
-    size_t	left = len;
-    int		error = 1;
+	size_t left = len;
+	int error = 1;
 
-    BZERO(&mbs, 1);
-    BINC_RETW(NULL, *tostr, *blen, nlen);
+	BZERO(&mbs, 1);
+	BINC_RETW(NULL, *tostr, *blen, nlen);
 
 #ifdef USE_ICONV
-    if (id != (iconv_t)-1)
-	CONVERT(str, left, src, len);
+	if (id != (iconv_t)-1)
+		CONVERT(str, left, src, len);
 #endif
 
-    for (i = 0, j = 0; j < len; ) {
-	n = mbrtowc((*tostr)+i, src+j, len-j, &mbs);
-	/* NULL character converted */
-	if (n == -2) error = -(len-j);
-	if (n == -1 || n == -2) goto err;
-	if (n == 0) n = 1;
-	j += n;
-	if (++i >= *blen) {
-	    nlen += 256;
-	    BINC_RETW(NULL, *tostr, *blen, nlen);
-	}
-	if (id != (iconv_t)-1 && j == len && left) {
-	    CONVERT(str, left, src, len);
-	    j = 0;
+	for (i = 0, j = 0; j < len; ) {
+		n = mbrtowc((*tostr)+i, src+j, len-j, &mbs);
+		/* NULL character converted */
+		if (n == -2)
+			error = -(len-j);
+		if (n == -1 || n == -2)
+			goto err;
+		if (n == 0)
+			n = 1;
+		j += n;
+		if (++i >= *blen) {
+			nlen += 256;
+			BINC_RETW(NULL, *tostr, *blen, nlen);
+		}
+		if (id != (iconv_t)-1 && j == len && left) {
+			CONVERT(str, left, src, len);
+			j = 0;
+		}
 	}
-    }
 
-    error = 0;
+	error = 0;
 err:
-    *tolen = i;
-    *dst = cw->bp1.wc;
-    IC_RESET();
+	*tolen = i;
+	*dst = cw->bp1.wc;
+	IC_RESET();
 
-    return error;
+	return error;
 }
 
 static int 
-fe_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, 
-	    size_t *tolen, CHAR_T **dst)
+fe_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, size_t *tolen,
+    CHAR_T **dst)
 {
-    return default_char2int(sp, str, len, cw, tolen, dst,
-	sp->conv.id[IC_FE_CHAR2INT]);
+	return default_char2int(sp, str, len, cw, tolen, dst,
+	    sp->conv.id[IC_FE_CHAR2INT]);
 }
 
 static int 
-ie_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, 
-	    size_t *tolen, CHAR_T **dst)
+ie_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, size_t *tolen,
+    CHAR_T **dst)
 {
-    return default_char2int(sp, str, len, cw, tolen, dst,
-	sp->conv.id[IC_IE_CHAR2INT]);
+	return default_char2int(sp, str, len, cw, tolen, dst,
+	    sp->conv.id[IC_IE_CHAR2INT]);
 }
 
 static int 
-cs_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, 
-	    size_t *tolen, CHAR_T **dst)
+cs_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, size_t *tolen,
+    CHAR_T **dst)
 {
-    return default_char2int(sp, str, len, cw, tolen, dst,
-	(iconv_t)-1);
+	return default_char2int(sp, str, len, cw, tolen, dst, (iconv_t)-1);
 }
 
 static int 
-int2raw(SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw,
-	size_t *tolen, char **dst)
+int2raw(SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw, size_t *tolen,
+    char **dst)
 {
-    int i;
-    char **tostr = &cw->bp1.c;
-    size_t  *blen = &cw->blen1;
+	int i;
+	char **tostr = &cw->bp1.c;
+	size_t  *blen = &cw->blen1;
 
-    BINC_RETC(NULL, *tostr, *blen, len);
+	BINC_RETC(NULL, *tostr, *blen, len);
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504142008.t3EK8cFM074445>