This commit was manufactured by cvs2svn to create tag 'rtems-addon-rtems-addon-packages-20021119

packages-20021119'.

Sprout from addons 2002-06-28 21:58:41 UTC Eric Norum <WENorum@lbl.gov> 'Useful add-on libraries'
Cherrypick from master 2002-11-19 12:59:31 UTC Joel Sherrill <joel.sherrill@OARcorp.com> '2002-11-19	Joel Sherrill <joel@OARcorp.com>':
    ChangeLog
    RTEMS_Makefiles/Makefile.libtecla
    RTEMS_Makefiles/Makefile.ncurses
    RTEMS_Makefiles/Makefile.readline-4.3
    SUPPORT
    VERSION
    bit
    libtecla-1.4.1/CHANGES
    libtecla-1.4.1/INSTALL
    libtecla-1.4.1/LICENSE.TERMS
    libtecla-1.4.1/Makefile
    libtecla-1.4.1/Makefile.in
    libtecla-1.4.1/Makefile.rules
    libtecla-1.4.1/Makefile.stub
    libtecla-1.4.1/PORTING
    libtecla-1.4.1/README
    libtecla-1.4.1/RELEASE.NOTES
    libtecla-1.4.1/config.guess
    libtecla-1.4.1/config.sub
    libtecla-1.4.1/configure
    libtecla-1.4.1/configure.in
    libtecla-1.4.1/cplfile.c
    libtecla-1.4.1/cplfile.h
    libtecla-1.4.1/cplmatch.c
    libtecla-1.4.1/demo.c
    libtecla-1.4.1/demo2.c
    libtecla-1.4.1/direader.c
    libtecla-1.4.1/direader.h
    libtecla-1.4.1/enhance.c
    libtecla-1.4.1/expand.c
    libtecla-1.4.1/freelist.c
    libtecla-1.4.1/freelist.h
    libtecla-1.4.1/getline.c
    libtecla-1.4.1/getline.h
    libtecla-1.4.1/hash.c
    libtecla-1.4.1/hash.h
    libtecla-1.4.1/history.c
    libtecla-1.4.1/history.h
    libtecla-1.4.1/homedir.c
    libtecla-1.4.1/homedir.h
    libtecla-1.4.1/html/changes.html
    libtecla-1.4.1/html/cpl_complete_word.html
    libtecla-1.4.1/html/ef_expand_file.html
    libtecla-1.4.1/html/enhance.html
    libtecla-1.4.1/html/gl_get_line.html
    libtecla-1.4.1/html/index.html
    libtecla-1.4.1/html/libtecla.html
    libtecla-1.4.1/html/pca_lookup_file.html
    libtecla-1.4.1/html/release.html
    libtecla-1.4.1/install-sh
    libtecla-1.4.1/keytab.c
    libtecla-1.4.1/keytab.h
    libtecla-1.4.1/libtecla.h
    libtecla-1.4.1/libtecla.map
    libtecla-1.4.1/man3/cfc_file_start.3
    libtecla-1.4.1/man3/cfc_literal_escapes.3
    libtecla-1.4.1/man3/cfc_set_check_fn.3
    libtecla-1.4.1/man3/cpl_add_completion.3
    libtecla-1.4.1/man3/cpl_complete_word.3
    libtecla-1.4.1/man3/cpl_file_completions.3
    libtecla-1.4.1/man3/cpl_last_error.3
    libtecla-1.4.1/man3/cpl_list_completions.3
    libtecla-1.4.1/man3/cpl_record_error.3
    libtecla-1.4.1/man3/del_CplFileConf.3
    libtecla-1.4.1/man3/del_ExpandFile.3
    libtecla-1.4.1/man3/del_GetLine.3
    libtecla-1.4.1/man3/del_PathCache.3
    libtecla-1.4.1/man3/del_PcaPathConf.3
    libtecla-1.4.1/man3/del_WordCompletion.3
    libtecla-1.4.1/man3/ef_expand_file.3
    libtecla-1.4.1/man3/ef_last_error.3
    libtecla-1.4.1/man3/ef_list_expansions.3
    libtecla-1.4.1/man3/enhance.3
    libtecla-1.4.1/man3/gl_change_terminal.3
    libtecla-1.4.1/man3/gl_clear_history.3
    libtecla-1.4.1/man3/gl_configure_getline.3
    libtecla-1.4.1/man3/gl_customize_completion.3
    libtecla-1.4.1/man3/gl_echo_mode.3
    libtecla-1.4.1/man3/gl_get_line.3
    libtecla-1.4.1/man3/gl_group_history.3
    libtecla-1.4.1/man3/gl_ignore_signal.3
    libtecla-1.4.1/man3/gl_last_signal.3
    libtecla-1.4.1/man3/gl_limit_history.3
    libtecla-1.4.1/man3/gl_load_history.3
    libtecla-1.4.1/man3/gl_lookup_history.3
    libtecla-1.4.1/man3/gl_prompt_style.3
    libtecla-1.4.1/man3/gl_range_of_history.3
    libtecla-1.4.1/man3/gl_resize_history.3
    libtecla-1.4.1/man3/gl_save_history.3
    libtecla-1.4.1/man3/gl_show_history.3
    libtecla-1.4.1/man3/gl_size_of_history.3
    libtecla-1.4.1/man3/gl_state_of_history.3
    libtecla-1.4.1/man3/gl_terminal_size.3
    libtecla-1.4.1/man3/gl_toggle_history.3
    libtecla-1.4.1/man3/gl_trap_signal.3
    libtecla-1.4.1/man3/gl_watch_fd.3
    libtecla-1.4.1/man3/libtecla.3
    libtecla-1.4.1/man3/libtecla_version.3
    libtecla-1.4.1/man3/new_CplFileConf.3
    libtecla-1.4.1/man3/new_ExpandFile.3
    libtecla-1.4.1/man3/new_GetLine.3
    libtecla-1.4.1/man3/new_PathCache.3
    libtecla-1.4.1/man3/new_PcaPathConf.3
    libtecla-1.4.1/man3/new_WordCompletion.3
    libtecla-1.4.1/man3/pca_last_error.3
    libtecla-1.4.1/man3/pca_lookup_file.3
    libtecla-1.4.1/man3/pca_path_completions.3
    libtecla-1.4.1/man3/pca_scan_path.3
    libtecla-1.4.1/man3/pca_set_check_fn.3
    libtecla-1.4.1/man3/ppc_file_start.3
    libtecla-1.4.1/man3/ppc_literal_escapes.3
    libtecla-1.4.1/pathutil.c
    libtecla-1.4.1/pathutil.h
    libtecla-1.4.1/pcache.c
    libtecla-1.4.1/stringrp.c
    libtecla-1.4.1/stringrp.h
    libtecla-1.4.1/strngmem.c
    libtecla-1.4.1/strngmem.h
    libtecla-1.4.1/update_html
    libtecla-1.4.1/update_version
    libtecla-1.4.1/version.c
    readline-4.3.orig/CHANGELOG
    readline-4.3.orig/CHANGES
    readline-4.3.orig/COPYING
    readline-4.3.orig/INSTALL
    readline-4.3.orig/MANIFEST
    readline-4.3.orig/Makefile.in
    readline-4.3.orig/README
    readline-4.3.orig/USAGE
    readline-4.3.orig/aclocal.m4
    readline-4.3.orig/ansi_stdlib.h
    readline-4.3.orig/bind.c
    readline-4.3.orig/callback.c
    readline-4.3.orig/chardefs.h
    readline-4.3.orig/compat.c
    readline-4.3.orig/complete.c
    readline-4.3.orig/config.h.in
    readline-4.3.orig/configure
    readline-4.3.orig/configure.in
    readline-4.3.orig/display.c
    readline-4.3.orig/doc/Makefile.in
    readline-4.3.orig/doc/hist.texinfo
    readline-4.3.orig/doc/history.0
    readline-4.3.orig/doc/history.3
    readline-4.3.orig/doc/history.dvi
    readline-4.3.orig/doc/history.html
    readline-4.3.orig/doc/history.info
    readline-4.3.orig/doc/history.ps
    readline-4.3.orig/doc/history_3.ps
    readline-4.3.orig/doc/hstech.texinfo
    readline-4.3.orig/doc/hsuser.texinfo
    readline-4.3.orig/doc/manvers.texinfo
    readline-4.3.orig/doc/readline.0
    readline-4.3.orig/doc/readline.3
    readline-4.3.orig/doc/readline.dvi
    readline-4.3.orig/doc/readline.html
    readline-4.3.orig/doc/readline.info
    readline-4.3.orig/doc/readline.ps
    readline-4.3.orig/doc/readline_3.ps
    readline-4.3.orig/doc/rlman.texinfo
    readline-4.3.orig/doc/rltech.texinfo
    readline-4.3.orig/doc/rluser.texinfo
    readline-4.3.orig/doc/rluserman.dvi
    readline-4.3.orig/doc/rluserman.html
    readline-4.3.orig/doc/rluserman.info
    readline-4.3.orig/doc/rluserman.ps
    readline-4.3.orig/doc/rluserman.texinfo
    readline-4.3.orig/doc/texi2dvi
    readline-4.3.orig/doc/texi2html
    readline-4.3.orig/doc/texinfo.tex
    readline-4.3.orig/emacs_keymap.c
    readline-4.3.orig/examples/Inputrc
    readline-4.3.orig/examples/Makefile.in
    readline-4.3.orig/examples/excallback.c
    readline-4.3.orig/examples/fileman.c
    readline-4.3.orig/examples/histexamp.c
    readline-4.3.orig/examples/manexamp.c
    readline-4.3.orig/examples/readlinebuf.h
    readline-4.3.orig/examples/rl.c
    readline-4.3.orig/examples/rlcat.c
    readline-4.3.orig/examples/rlfe.c
    readline-4.3.orig/examples/rltest.c
    readline-4.3.orig/examples/rlversion.c
    readline-4.3.orig/funmap.c
    readline-4.3.orig/histexpand.c
    readline-4.3.orig/histfile.c
    readline-4.3.orig/histlib.h
    readline-4.3.orig/history.c
    readline-4.3.orig/history.h
    readline-4.3.orig/histsearch.c
    readline-4.3.orig/input.c
    readline-4.3.orig/isearch.c
    readline-4.3.orig/keymaps.c
    readline-4.3.orig/keymaps.h
    readline-4.3.orig/kill.c
    readline-4.3.orig/macro.c
    readline-4.3.orig/mbutil.c
    readline-4.3.orig/misc.c
    readline-4.3.orig/nls.c
    readline-4.3.orig/parens.c
    readline-4.3.orig/posixdir.h
    readline-4.3.orig/posixjmp.h
    readline-4.3.orig/posixstat.h
    readline-4.3.orig/readline.c
    readline-4.3.orig/readline.h
    readline-4.3.orig/rlconf.h
    readline-4.3.orig/rldefs.h
    readline-4.3.orig/rlmbutil.h
    readline-4.3.orig/rlprivate.h
    readline-4.3.orig/rlshell.h
    readline-4.3.orig/rlstdc.h
    readline-4.3.orig/rltty.c
    readline-4.3.orig/rltty.h
    readline-4.3.orig/rltypedefs.h
    readline-4.3.orig/rlwinsize.h
    readline-4.3.orig/savestring.c
    readline-4.3.orig/search.c
    readline-4.3.orig/shell.c
    readline-4.3.orig/shlib/Makefile.in
    readline-4.3.orig/signals.c
    readline-4.3.orig/support/config.guess
    readline-4.3.orig/support/config.sub
    readline-4.3.orig/support/install.sh
    readline-4.3.orig/support/mkdirs
    readline-4.3.orig/support/mkdist
    readline-4.3.orig/support/shlib-install
    readline-4.3.orig/support/shobj-conf
    readline-4.3.orig/support/wcwidth.c
    readline-4.3.orig/tcap.h
    readline-4.3.orig/terminal.c
    readline-4.3.orig/text.c
    readline-4.3.orig/tilde.c
    readline-4.3.orig/tilde.h
    readline-4.3.orig/undo.c
    readline-4.3.orig/util.c
    readline-4.3.orig/vi_keymap.c
    readline-4.3.orig/vi_mode.c
    readline-4.3.orig/xmalloc.c
    readline-4.3.orig/xmalloc.h
    readline-4.3/CHANGELOG-ReadLine
    readline-4.3/CHANGES
    readline-4.3/COPYING
    readline-4.3/INSTALL
    readline-4.3/MANIFEST
    readline-4.3/Makefile.in
    readline-4.3/README
    readline-4.3/USAGE
    readline-4.3/aclocal.m4
    readline-4.3/ansi_stdlib.h
    readline-4.3/bind.c
    readline-4.3/callback.c
    readline-4.3/chardefs.h
    readline-4.3/compat.c
    readline-4.3/complete.c
    readline-4.3/config.h.in
    readline-4.3/configure
    readline-4.3/configure.in
    readline-4.3/display.c
    readline-4.3/doc/Makefile.in
    readline-4.3/doc/hist.texinfo
    readline-4.3/doc/history.3
    readline-4.3/doc/hstech.texinfo
    readline-4.3/doc/hsuser.texinfo
    readline-4.3/doc/manvers.texinfo
    readline-4.3/doc/readline.3
    readline-4.3/doc/rlman.texinfo
    readline-4.3/doc/rltech.texinfo
    readline-4.3/doc/rluser.texinfo
    readline-4.3/doc/rluserman.texinfo
    readline-4.3/doc/texi2dvi
    readline-4.3/doc/texi2html
    readline-4.3/doc/texinfo.tex
    readline-4.3/emacs_keymap.c
    readline-4.3/examples/Inputrc
    readline-4.3/examples/Makefile.in
    readline-4.3/examples/excallback.c
    readline-4.3/examples/fileman.c
    readline-4.3/examples/histexamp.c
    readline-4.3/examples/manexamp.c
    readline-4.3/examples/readlinebuf.h
    readline-4.3/examples/rl.c
    readline-4.3/examples/rlcat.c
    readline-4.3/examples/rlfe.c
    readline-4.3/examples/rltest.c
    readline-4.3/examples/rlversion.c
    readline-4.3/funmap.c
    readline-4.3/histexpand.c
    readline-4.3/histfile.c
    readline-4.3/histlib.h
    readline-4.3/history.c
    readline-4.3/history.h
    readline-4.3/histsearch.c
    readline-4.3/input.c
    readline-4.3/isearch.c
    readline-4.3/keymaps.c
    readline-4.3/keymaps.h
    readline-4.3/kill.c
    readline-4.3/macro.c
    readline-4.3/mbutil.c
    readline-4.3/misc.c
    readline-4.3/nls.c
    readline-4.3/parens.c
    readline-4.3/posixdir.h
    readline-4.3/posixjmp.h
    readline-4.3/posixstat.h
    readline-4.3/readline.c
    readline-4.3/readline.h
    readline-4.3/rlconf.h
    readline-4.3/rldefs.h
    readline-4.3/rlmbutil.h
    readline-4.3/rlprivate.h
    readline-4.3/rlshell.h
    readline-4.3/rlstdc.h
    readline-4.3/rltty.c
    readline-4.3/rltty.h
    readline-4.3/rltypedefs.h
    readline-4.3/rlwinsize.h
    readline-4.3/savestring.c
    readline-4.3/search.c
    readline-4.3/shell.c
    readline-4.3/shlib/Makefile.in
    readline-4.3/signals.c
    readline-4.3/support/config.guess
    readline-4.3/support/config.sub
    readline-4.3/support/install.sh
    readline-4.3/support/mkdirs
    readline-4.3/support/mkdist
    readline-4.3/support/shlib-install
    readline-4.3/support/shobj-conf
    readline-4.3/support/wcwidth.c
    readline-4.3/tcap.h
    readline-4.3/terminal.c
    readline-4.3/text.c
    readline-4.3/tilde.c
    readline-4.3/tilde.h
    readline-4.3/undo.c
    readline-4.3/util.c
    readline-4.3/vi_keymap.c
    readline-4.3/vi_mode.c
    readline-4.3/xmalloc.c
    readline-4.3/xmalloc.h
    readline-doc-4.3/MANIFEST.doc
    readline-doc-4.3/doc/history.0
    readline-doc-4.3/doc/history.dvi
    readline-doc-4.3/doc/history.html
    readline-doc-4.3/doc/history.info
    readline-doc-4.3/doc/history.ps
    readline-doc-4.3/doc/history_3.ps
    readline-doc-4.3/doc/readline.0
    readline-doc-4.3/doc/readline.dvi
    readline-doc-4.3/doc/readline.html
    readline-doc-4.3/doc/readline.info
    readline-doc-4.3/doc/readline.ps
    readline-doc-4.3/doc/readline_3.ps
    readline-doc-4.3/doc/rluserman.dvi
    readline-doc-4.3/doc/rluserman.html
    readline-doc-4.3/doc/rluserman.info
    readline-doc-4.3/doc/rluserman.ps
Delete:
    RTEMS_Makefiles/Makefile.readline
    SendSrc.bash
    readline-4.2/CHANGELOG
    readline-4.2/CHANGES
    readline-4.2/COPYING
    readline-4.2/INSTALL
    readline-4.2/MANIFEST
    readline-4.2/Makefile.in
    readline-4.2/README
    readline-4.2/USAGE
    readline-4.2/aclocal.m4
    readline-4.2/ansi_stdlib.h
    readline-4.2/bind.c
    readline-4.2/callback.c
    readline-4.2/chardefs.h
    readline-4.2/compat.c
    readline-4.2/complete.c
    readline-4.2/config.h.in
    readline-4.2/configure
    readline-4.2/configure.in
    readline-4.2/display.c
    readline-4.2/doc/Makefile.in
    readline-4.2/doc/hist.texinfo
    readline-4.2/doc/history.0
    readline-4.2/doc/history.3
    readline-4.2/doc/history.dvi
    readline-4.2/doc/history.html
    readline-4.2/doc/history.info
    readline-4.2/doc/history.ps
    readline-4.2/doc/history_3.ps
    readline-4.2/doc/hstech.texinfo
    readline-4.2/doc/hsuser.texinfo
    readline-4.2/doc/manvers.texinfo
    readline-4.2/doc/readline.0
    readline-4.2/doc/readline.3
    readline-4.2/doc/readline.dvi
    readline-4.2/doc/readline.html
    readline-4.2/doc/readline.info
    readline-4.2/doc/readline.ps
    readline-4.2/doc/readline_3.ps
    readline-4.2/doc/rlman.texinfo
    readline-4.2/doc/rltech.texinfo
    readline-4.2/doc/rluser.texinfo
    readline-4.2/doc/rluserman.html
    readline-4.2/doc/rluserman.info
    readline-4.2/doc/rluserman.ps
    readline-4.2/doc/rluserman.texinfo
    readline-4.2/doc/texi2dvi
    readline-4.2/doc/texi2html
    readline-4.2/doc/texinfo.tex
    readline-4.2/emacs_keymap.c
    readline-4.2/examples/Inputrc
    readline-4.2/examples/Makefile.in
    readline-4.2/examples/excallback.c
    readline-4.2/examples/fileman.c
    readline-4.2/examples/histexamp.c
    readline-4.2/examples/manexamp.c
    readline-4.2/examples/rl.c
    readline-4.2/examples/rlfe.c
    readline-4.2/examples/rltest.c
    readline-4.2/examples/rlversion.c
    readline-4.2/funmap.c
    readline-4.2/histexpand.c
    readline-4.2/histfile.c
    readline-4.2/histlib.h
    readline-4.2/history.c
    readline-4.2/history.h
    readline-4.2/histsearch.c
    readline-4.2/input.c
    readline-4.2/isearch.c
    readline-4.2/keymaps.c
    readline-4.2/keymaps.h
    readline-4.2/kill.c
    readline-4.2/macro.c
    readline-4.2/nls.c
    readline-4.2/parens.c
    readline-4.2/posixdir.h
    readline-4.2/posixjmp.h
    readline-4.2/posixstat.h
    readline-4.2/readline.c
    readline-4.2/readline.h
    readline-4.2/rlconf.h
    readline-4.2/rldefs.h
    readline-4.2/rlprivate.h
    readline-4.2/rlshell.h
    readline-4.2/rlstdc.h
    readline-4.2/rltty.c
    readline-4.2/rltty.h
    readline-4.2/rltypedefs.h
    readline-4.2/rlwinsize.h
    readline-4.2/savestring.c
    readline-4.2/search.c
    readline-4.2/shell.c
    readline-4.2/shlib/Makefile.in
    readline-4.2/signals.c
    readline-4.2/support/config.guess
    readline-4.2/support/config.sub
    readline-4.2/support/install.sh
    readline-4.2/support/mkdirs
    readline-4.2/support/mkdist
    readline-4.2/support/shlib-install
    readline-4.2/support/shobj-conf
    readline-4.2/tcap.h
    readline-4.2/terminal.c
    readline-4.2/tilde.c
    readline-4.2/tilde.h
    readline-4.2/undo.c
    readline-4.2/util.c
    readline-4.2/vi_keymap.c
    readline-4.2/vi_mode.c
    readline-4.2/xmalloc.c
    readline-4.2/xmalloc.h
    readline/CHANGES
    readline/COPYING
    readline/ChangeLog
    readline/MANIFEST
    readline/MANIFEST.doc
    readline/Makefile.in
    readline/Makefile.rtems
    readline/README
    readline/acconfig.h
    readline/aclocal.m4
    readline/ansi_stdlib.h
    readline/bind.c
    readline/callback.c
    readline/chardefs.h
    readline/complete.c
    readline/config.guess
    readline/config.h.bot
    readline/config.h.in
    readline/config.h.rtems
    readline/config.sub
    readline/configure
    readline/configure.in
    readline/configure_jnk
    readline/configure_rtems
    readline/cross-build/cygwin.cache
    readline/display.c
    readline/doc/ChangeLog
    readline/doc/Makefile.in
    readline/doc/hist.texinfo
    readline/doc/hstech.texinfo
    readline/doc/hsuser.texinfo
    readline/doc/inc-hist.texi
    readline/doc/readline.3
    readline/doc/rlman.texinfo
    readline/doc/rltech.texinfo
    readline/doc/rluser.texinfo
    readline/doc/texi2dvi
    readline/doc/texi2html
    readline/emacs_keymap.c
    readline/examples/Inputrc
    readline/examples/Makefile.in
    readline/examples/fileman.c
    readline/examples/histexamp.c
    readline/examples/manexamp.c
    readline/examples/rl.c
    readline/examples/rltest.c
    readline/funmap.c
    readline/histexpand.c
    readline/histfile.c
    readline/histlib.h
    readline/history.c
    readline/history.h
    readline/histsearch.c
    readline/input.c
    readline/install
    readline/install-sh
    readline/install.sh
    readline/isearch.c
    readline/keymaps.c
    readline/keymaps.h
    readline/kill.c
    readline/macro.c
    readline/mkdirs
    readline/mkdist
    readline/nls.c
    readline/parens.c
    readline/posixdir.h
    readline/posixjmp.h
    readline/posixstat.h
    readline/readline.c
    readline/readline.h
    readline/rlconf.h
    readline/rldefs.h
    readline/rltty.c
    readline/rltty.h
    readline/rlwinsize.h
    readline/search.c
    readline/shell.c
    readline/signals.c
    readline/support/config.guess
    readline/support/config.sub
    readline/support/install.sh
    readline/support/mkdirs
    readline/support/mkdist
    readline/tcap.h
    readline/terminal.c
    readline/tilde.c
    readline/tilde.h
    readline/undo.c
    readline/util.c
    readline/vi_keymap.c
    readline/vi_mode.c
    readline/xmalloc.c

1 files changed, 236 insertions, 0 deletions

diff --git a/readline-4.3/support/wcwidth.c b/readline-4.3/support/wcwidth.c
new file mode 100644
index 0000000..ace9a3a
--- /dev/null
+++ b/readline-4.3/support/wcwidth.c
@@ -0,0 +1,236 @@
+/*
+ * This is an implementation of wcwidth() and wcswidth() as defined in
+ * "The Single UNIX Specification, Version 2, The Open Group, 1997"
+ * <http://www.UNIX-systems.org/online.html>
+ *
+ * Markus Kuhn -- 2001-09-08 -- public domain
+ */
+
+#include <wchar.h>
+
+struct interval {
+  unsigned short first;
+  unsigned short last;
+};
+
+/* auxiliary function for binary search in interval table */
+static int bisearch(wchar_t ucs, const struct interval *table, int max) {
+  int min = 0;
+  int mid;
+
+  if (ucs < table[0].first || ucs > table[max].last)
+    return 0;
+  while (max >= min) {
+    mid = (min + max) / 2;
+    if (ucs > table[mid].last)
+      min = mid + 1;
+    else if (ucs < table[mid].first)
+      max = mid - 1;
+    else
+      return 1;
+  }
+
+  return 0;
+}
+
+
+/* The following functions define the column width of an ISO 10646
+ * character as follows:
+ *
+ *    - The null character (U+0000) has a column width of 0.
+ *
+ *    - Other C0/C1 control characters and DEL will lead to a return
+ *      value of -1.
+ *
+ *    - Non-spacing and enclosing combining characters (general
+ *      category code Mn or Me in the Unicode database) have a
+ *      column width of 0.
+ *
+ *    - Other format characters (general category code Cf in the Unicode
+ *      database) and ZERO WIDTH SPACE (U+200B) have a column width of 0.
+ *
+ *    - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
+ *      have a column width of 0.
+ *
+ *    - Spacing characters in the East Asian Wide (W) or East Asian
+ *      FullWidth (F) category as defined in Unicode Technical
+ *      Report #11 have a column width of 2.
+ *
+ *    - All remaining characters (including all printable
+ *      ISO 8859-1 and WGL4 characters, Unicode control characters,
+ *      etc.) have a column width of 1.
+ *
+ * This implementation assumes that wchar_t characters are encoded
+ * in ISO 10646.
+ */
+
+int wcwidth(wchar_t ucs)
+{
+  /* sorted list of non-overlapping intervals of non-spacing characters */
+  static const struct interval combining[] = {
+    { 0x0300, 0x034E }, { 0x0360, 0x0362 }, { 0x0483, 0x0486 },
+    { 0x0488, 0x0489 }, { 0x0591, 0x05A1 }, { 0x05A3, 0x05B9 },
+    { 0x05BB, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },
+    { 0x05C4, 0x05C4 }, { 0x064B, 0x0655 }, { 0x0670, 0x0670 },
+    { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },
+    { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },
+    { 0x07A6, 0x07B0 }, { 0x0901, 0x0902 }, { 0x093C, 0x093C },
+    { 0x0941, 0x0948 }, { 0x094D, 0x094D }, { 0x0951, 0x0954 },
+    { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, { 0x09BC, 0x09BC },
+    { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, { 0x09E2, 0x09E3 },
+    { 0x0A02, 0x0A02 }, { 0x0A3C, 0x0A3C }, { 0x0A41, 0x0A42 },
+    { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, { 0x0A70, 0x0A71 },
+    { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, { 0x0AC1, 0x0AC5 },
+    { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, { 0x0B01, 0x0B01 },
+    { 0x0B3C, 0x0B3C }, { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 },
+    { 0x0B4D, 0x0B4D }, { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 },
+    { 0x0BC0, 0x0BC0 }, { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 },
+    { 0x0C46, 0x0C48 }, { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 },
+    { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },
+    { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, { 0x0DCA, 0x0DCA },
+    { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, { 0x0E31, 0x0E31 },
+    { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, { 0x0EB1, 0x0EB1 },
+    { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, { 0x0EC8, 0x0ECD },
+    { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, { 0x0F37, 0x0F37 },
+    { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, { 0x0F80, 0x0F84 },
+    { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, { 0x0F99, 0x0FBC },
+    { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, { 0x1032, 0x1032 },
+    { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, { 0x1058, 0x1059 },
+    { 0x1160, 0x11FF }, { 0x17B7, 0x17BD }, { 0x17C6, 0x17C6 },
+    { 0x17C9, 0x17D3 }, { 0x180B, 0x180E }, { 0x18A9, 0x18A9 },
+    { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x206A, 0x206F },
+    { 0x20D0, 0x20E3 }, { 0x302A, 0x302F }, { 0x3099, 0x309A },
+    { 0xFB1E, 0xFB1E }, { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF },
+    { 0xFFF9, 0xFFFB }
+  };
+
+  /* test for 8-bit control characters */
+  if (ucs == 0)
+    return 0;
+  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
+    return -1;
+
+  /* binary search in table of non-spacing characters */
+  if (bisearch(ucs, combining,
+	       sizeof(combining) / sizeof(struct interval) - 1))
+    return 0;
+
+  /* if we arrive here, ucs is not a combining or C0/C1 control character */
+
+  return 1 + 
+    (ucs >= 0x1100 &&
+     (ucs <= 0x115f ||                    /* Hangul Jamo init. consonants */
+      (ucs >= 0x2e80 && ucs <= 0xa4cf && (ucs & ~0x0011) != 0x300a &&
+       ucs != 0x303f) ||                  /* CJK ... Yi */
+      (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
+      (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
+      (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
+      (ucs >= 0xff00 && ucs <= 0xff5f) || /* Fullwidth Forms */
+      (ucs >= 0xffe0 && ucs <= 0xffe6) ||
+      (ucs >= 0x20000 && ucs <= 0x2ffff)));
+}
+
+
+int wcswidth(const wchar_t *pwcs, size_t n)
+{
+  int w, width = 0;
+
+  for (;*pwcs && n-- > 0; pwcs++)
+    if ((w = wcwidth(*pwcs)) < 0)
+      return -1;
+    else
+      width += w;
+
+  return width;
+}
+
+
+/*
+ * The following function is the same as wcwidth(), except that
+ * spacing characters in the East Asian Ambiguous (A) category as
+ * defined in Unicode Technical Report #11 have a column width of 2.
+ * This experimental variant might be useful for users of CJK legacy
+ * encodings who want to migrate to UCS. It is not otherwise
+ * recommended for general use.
+ */
+static int wcwidth_cjk(wchar_t ucs)
+{
+  /* sorted list of non-overlapping intervals of East Asian Ambiguous
+   * characters */
+  static const struct interval ambiguous[] = {
+    { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 },
+    { 0x00AA, 0x00AA }, { 0x00AD, 0x00AE }, { 0x00B0, 0x00B4 },
+    { 0x00B6, 0x00BA }, { 0x00BC, 0x00BF }, { 0x00C6, 0x00C6 },
+    { 0x00D0, 0x00D0 }, { 0x00D7, 0x00D8 }, { 0x00DE, 0x00E1 },
+    { 0x00E6, 0x00E6 }, { 0x00E8, 0x00EA }, { 0x00EC, 0x00ED },
+    { 0x00F0, 0x00F0 }, { 0x00F2, 0x00F3 }, { 0x00F7, 0x00FA },
+    { 0x00FC, 0x00FC }, { 0x00FE, 0x00FE }, { 0x0101, 0x0101 },
+    { 0x0111, 0x0111 }, { 0x0113, 0x0113 }, { 0x011B, 0x011B },
+    { 0x0126, 0x0127 }, { 0x012B, 0x012B }, { 0x0131, 0x0133 },
+    { 0x0138, 0x0138 }, { 0x013F, 0x0142 }, { 0x0144, 0x0144 },
+    { 0x0148, 0x014B }, { 0x014D, 0x014D }, { 0x0152, 0x0153 },
+    { 0x0166, 0x0167 }, { 0x016B, 0x016B }, { 0x01CE, 0x01CE },
+    { 0x01D0, 0x01D0 }, { 0x01D2, 0x01D2 }, { 0x01D4, 0x01D4 },
+    { 0x01D6, 0x01D6 }, { 0x01D8, 0x01D8 }, { 0x01DA, 0x01DA },
+    { 0x01DC, 0x01DC }, { 0x0251, 0x0251 }, { 0x0261, 0x0261 },
+    { 0x02C4, 0x02C4 }, { 0x02C7, 0x02C7 }, { 0x02C9, 0x02CB },
+    { 0x02CD, 0x02CD }, { 0x02D0, 0x02D0 }, { 0x02D8, 0x02DB },
+    { 0x02DD, 0x02DD }, { 0x02DF, 0x02DF }, { 0x0300, 0x034E },
+    { 0x0360, 0x0362 }, { 0x0391, 0x03A1 }, { 0x03A3, 0x03A9 },
+    { 0x03B1, 0x03C1 }, { 0x03C3, 0x03C9 }, { 0x0401, 0x0401 },
+    { 0x0410, 0x044F }, { 0x0451, 0x0451 }, { 0x2010, 0x2010 },
+    { 0x2013, 0x2016 }, { 0x2018, 0x2019 }, { 0x201C, 0x201D },
+    { 0x2020, 0x2022 }, { 0x2024, 0x2027 }, { 0x2030, 0x2030 },
+    { 0x2032, 0x2033 }, { 0x2035, 0x2035 }, { 0x203B, 0x203B },
+    { 0x203E, 0x203E }, { 0x2074, 0x2074 }, { 0x207F, 0x207F },
+    { 0x2081, 0x2084 }, { 0x20AC, 0x20AC }, { 0x2103, 0x2103 },
+    { 0x2105, 0x2105 }, { 0x2109, 0x2109 }, { 0x2113, 0x2113 },
+    { 0x2116, 0x2116 }, { 0x2121, 0x2122 }, { 0x2126, 0x2126 },
+    { 0x212B, 0x212B }, { 0x2153, 0x2155 }, { 0x215B, 0x215E },
+    { 0x2160, 0x216B }, { 0x2170, 0x2179 }, { 0x2190, 0x2199 },
+    { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 }, { 0x21D4, 0x21D4 },
+    { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 }, { 0x2202, 0x2203 },
+    { 0x2207, 0x2208 }, { 0x220B, 0x220B }, { 0x220F, 0x220F },
+    { 0x2211, 0x2211 }, { 0x2215, 0x2215 }, { 0x221A, 0x221A },
+    { 0x221D, 0x2220 }, { 0x2223, 0x2223 }, { 0x2225, 0x2225 },
+    { 0x2227, 0x222C }, { 0x222E, 0x222E }, { 0x2234, 0x2237 },
+    { 0x223C, 0x223D }, { 0x2248, 0x2248 }, { 0x224C, 0x224C },
+    { 0x2252, 0x2252 }, { 0x2260, 0x2261 }, { 0x2264, 0x2267 },
+    { 0x226A, 0x226B }, { 0x226E, 0x226F }, { 0x2282, 0x2283 },
+    { 0x2286, 0x2287 }, { 0x2295, 0x2295 }, { 0x2299, 0x2299 },
+    { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF }, { 0x2312, 0x2312 },
+    { 0x2329, 0x232A }, { 0x2460, 0x24BF }, { 0x24D0, 0x24E9 },
+    { 0x2500, 0x254B }, { 0x2550, 0x2574 }, { 0x2580, 0x258F },
+    { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 },
+    { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD },
+    { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB },
+    { 0x25CE, 0x25D1 }, { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF },
+    { 0x2605, 0x2606 }, { 0x2609, 0x2609 }, { 0x260E, 0x260F },
+    { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 },
+    { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 },
+    { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F },
+    { 0x273D, 0x273D }, { 0x3008, 0x300B }, { 0x3014, 0x3015 },
+    { 0x3018, 0x301B }, { 0xFFFD, 0xFFFD }
+  };
+
+  /* binary search in table of non-spacing characters */
+  if (bisearch(ucs, ambiguous,
+	       sizeof(ambiguous) / sizeof(struct interval) - 1))
+    return 2;
+
+  return wcwidth(ucs);
+}
+
+
+int wcswidth_cjk(const wchar_t *pwcs, size_t n)
+{
+  int w, width = 0;
+
+  for (;*pwcs && n-- > 0; pwcs++)
+    if ((w = wcwidth_cjk(*pwcs)) < 0)
+      return -1;
+    else
+      width += w;
+
+  return width;
+}