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

20020730a'.

Sprout from addons 2002-06-28 21:58:41 UTC Eric Norum <WENorum@lbl.gov> 'Useful add-on libraries'
Cherrypick from master 2002-07-30 23:06:02 UTC Joel Sherrill <joel.sherrill@OARcorp.com> '2002-07-30	Joel Sherrill <joel@OARcorp.com>':
    ChangeLog
    RTEMS_Makefiles/Makefile.readline-4.3
    SUPPORT
    VERSION
    bit
    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, 337 insertions, 0 deletions

diff --git a/readline-4.3.orig/mbutil.c b/readline-4.3.orig/mbutil.c
new file mode 100644
index 0000000..50302f0
--- /dev/null
+++ b/readline-4.3.orig/mbutil.c
@@ -0,0 +1,337 @@
+/* mbutil.c -- readline multibyte character utility functions */
+
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+
+   This file is part of the GNU Readline Library, a library for
+   reading lines of text with interactive input and history editing.
+
+   The GNU Readline Library is free software; you can redistribute it
+   and/or modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2, or
+   (at your option) any later version.
+
+   The GNU Readline Library is distributed in the hope that it will be
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   The GNU General Public License is often shipped with GNU software, and
+   is generally kept in a file called COPYING or LICENSE.  If you do not
+   have a copy of the license, write to the Free Software Foundation,
+   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#define READLINE_LIBRARY
+
+#if defined (HAVE_CONFIG_H)
+#  include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <fcntl.h>
+#include "posixjmp.h"
+
+#if defined (HAVE_UNISTD_H)
+#  include <unistd.h>	   /* for _POSIX_VERSION */
+#endif /* HAVE_UNISTD_H */
+
+#if defined (HAVE_STDLIB_H)
+#  include <stdlib.h>
+#else
+#  include "ansi_stdlib.h"
+#endif /* HAVE_STDLIB_H */
+
+#include <stdio.h>
+#include <ctype.h>
+
+/* System-specific feature definitions and include files. */
+#include "rldefs.h"
+#include "rlmbutil.h"
+
+#if defined (TIOCSTAT_IN_SYS_IOCTL)
+#  include <sys/ioctl.h>
+#endif /* TIOCSTAT_IN_SYS_IOCTL */
+
+/* Some standard library routines. */
+#include "readline.h"
+
+#include "rlprivate.h"
+#include "xmalloc.h"
+
+/* Declared here so it can be shared between the readline and history
+   libraries. */
+#if defined (HANDLE_MULTIBYTE)
+int rl_byte_oriented = 0;
+#else
+int rl_byte_oriented = 1;
+#endif
+
+/* **************************************************************** */
+/*								    */
+/*		Multibyte Character Utility Functions		    */
+/*								    */
+/* **************************************************************** */
+
+#if defined(HANDLE_MULTIBYTE)
+
+static int
+_rl_find_next_mbchar_internal (string, seed, count, find_non_zero)
+     char *string;
+     int seed, count, find_non_zero;
+{
+  size_t tmp = 0;
+  mbstate_t ps;
+  int point = 0;
+  wchar_t wc;
+
+  memset(&ps, 0, sizeof (mbstate_t));
+  if (seed < 0)
+    seed = 0;
+  if (count <= 0)
+    return seed;
+
+  point = seed + _rl_adjust_point(string, seed, &ps);
+  /* if this is true, means that seed was not pointed character
+     started byte.  So correct the point and consume count */
+  if (seed < point)
+    count --;
+
+  while (count > 0)  
+    {
+      tmp = mbrtowc (&wc, string+point, strlen(string + point), &ps);
+      if ((size_t)(tmp) == (size_t)-1 || (size_t)(tmp) == (size_t)-2)
+	{
+	  /* invalid bytes. asume a byte represents a character */
+	  point++;
+	  count--;
+	  /* reset states. */
+	  memset(&ps, 0, sizeof(mbstate_t));
+	}
+      else if (tmp == (size_t)0)
+	/* found '\0' char */
+	break;
+      else
+	{
+	  /* valid bytes */
+	  point += tmp;
+	  if (find_non_zero)
+	    {
+	      if (wcwidth (wc) == 0)
+		continue;
+	      else
+		count--;
+	    }
+	  else
+	    count--;
+	}
+    }
+
+  if (find_non_zero)
+    {
+      tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
+      while (wcwidth (wc) == 0)
+	{
+	  point += tmp;
+	  tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
+	  if (tmp == (size_t)(0) || tmp == (size_t)(-1) || tmp == (size_t)(-2))
+	    break;
+	}
+    }
+    return point;
+}
+
+static int
+_rl_find_prev_mbchar_internal (string, seed, find_non_zero)
+     char *string;
+     int seed, find_non_zero;
+{
+  mbstate_t ps;
+  int prev, non_zero_prev, point, length;
+  size_t tmp;
+  wchar_t wc;
+
+  memset(&ps, 0, sizeof(mbstate_t));
+  length = strlen(string);
+  
+  if (seed < 0)
+    return 0;
+  else if (length < seed)
+    return length;
+
+  prev = non_zero_prev = point = 0;
+  while (point < seed)
+    {
+      tmp = mbrtowc (&wc, string + point, length - point, &ps);
+      if ((size_t)(tmp) == (size_t)-1 || (size_t)(tmp) == (size_t)-2)
+	{
+	  /* in this case, bytes are invalid or shorted to compose
+	     multibyte char, so assume that the first byte represents
+	     a single character anyway. */
+	  tmp = 1;
+	  /* clear the state of the byte sequence, because
+	     in this case effect of mbstate is undefined  */
+	  memset(&ps, 0, sizeof (mbstate_t));
+	}
+      else if (tmp == 0)
+	break;			/* Found '\0' char.  Can this happen? */
+      else
+	{
+	  if (find_non_zero)
+	    {
+	      if (wcwidth (wc) != 0)
+		prev = point;
+	    }
+	  else
+	    prev = point;  
+	}
+
+      point += tmp;
+    }
+
+  return prev;
+}
+
+/* return the number of bytes parsed from the multibyte sequence starting
+   at src, if a non-L'\0' wide character was recognized. It returns 0, 
+   if a L'\0' wide character was recognized. It  returns (size_t)(-1), 
+   if an invalid multibyte sequence was encountered. It returns (size_t)(-2) 
+   if it couldn't parse a complete  multibyte character.  */
+int
+_rl_get_char_len (src, ps)
+     char *src;
+     mbstate_t *ps;
+{
+  size_t tmp;
+
+  tmp = mbrlen((const char *)src, (size_t)strlen (src), ps);
+  if (tmp == (size_t)(-2))
+    {
+      /* shorted to compose multibyte char */
+      memset (ps, 0, sizeof(mbstate_t));
+      return -2;
+    }
+  else if (tmp == (size_t)(-1))
+    {
+      /* invalid to compose multibyte char */
+      /* initialize the conversion state */
+      memset (ps, 0, sizeof(mbstate_t));
+      return -1;
+    }
+  else if (tmp == (size_t)0)
+    return 0;
+  else
+    return (int)tmp;
+}
+
+/* compare the specified two characters. If the characters matched,
+   return 1. Otherwise return 0. */
+int
+_rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2)
+     char *buf1, *buf2;
+     mbstate_t *ps1, *ps2;
+     int pos1, pos2;
+{
+  int i, w1, w2;
+
+  if ((w1 = _rl_get_char_len (&buf1[pos1], ps1)) <= 0 || 
+	(w2 = _rl_get_char_len (&buf2[pos2], ps2)) <= 0 ||
+	(w1 != w2) ||
+	(buf1[pos1] != buf2[pos2]))
+    return 0;
+
+  for (i = 1; i < w1; i++)
+    if (buf1[pos1+i] != buf2[pos2+i])
+      return 0;
+
+  return 1;
+}
+
+/* adjust pointed byte and find mbstate of the point of string.
+   adjusted point will be point <= adjusted_point, and returns
+   differences of the byte(adjusted_point - point).
+   if point is invalied (point < 0 || more than string length),
+   it returns -1 */
+int
+_rl_adjust_point(string, point, ps)
+     char *string;
+     int point;
+     mbstate_t *ps;
+{
+  size_t tmp = 0;
+  int length;
+  int pos = 0;
+
+  length = strlen(string);
+  if (point < 0)
+    return -1;
+  if (length < point)
+    return -1;
+  
+  while (pos < point)
+    {
+      tmp = mbrlen (string + pos, length - pos, ps);
+      if((size_t)(tmp) == (size_t)-1 || (size_t)(tmp) == (size_t)-2)
+	{
+	  /* in this case, bytes are invalid or shorted to compose
+	     multibyte char, so assume that the first byte represents
+	     a single character anyway. */
+	  pos++;
+	  /* clear the state of the byte sequence, because
+	     in this case effect of mbstate is undefined  */
+	  memset (ps, 0, sizeof (mbstate_t));
+	}
+      else
+	pos += tmp;
+    }
+
+  return (pos - point);
+}
+
+int
+_rl_is_mbchar_matched (string, seed, end, mbchar, length)
+     char *string;
+     int seed, end;
+     char *mbchar;
+     int length;
+{
+  int i;
+
+  if ((end - seed) < length)
+    return 0;
+
+  for (i = 0; i < length; i++)
+    if (string[seed + i] != mbchar[i])
+      return 0;
+  return 1;
+}
+#endif /* HANDLE_MULTIBYTE */
+
+/* Find next `count' characters started byte point of the specified seed.
+   If flags is MB_FIND_NONZERO, we look for non-zero-width multibyte
+   characters. */
+#undef _rl_find_next_mbchar
+int
+_rl_find_next_mbchar (string, seed, count, flags)
+     char *string;
+     int seed, count, flags;
+{
+#if defined (HANDLE_MULTIBYTE)
+  return _rl_find_next_mbchar_internal (string, seed, count, flags);
+#else
+  return (seed + count);
+#endif
+}
+
+/* Find previous character started byte point of the specified seed.
+   Returned point will be point <= seed.  If flags is MB_FIND_NONZERO,
+   we look for non-zero-width multibyte characters. */
+#undef _rl_find_prev_mbchar
+int
+_rl_find_prev_mbchar (string, seed, flags)
+     char *string;
+     int seed, flags;
+{
+#if defined (HANDLE_MULTIBYTE)
+  return _rl_find_prev_mbchar_internal (string, seed, flags);
+#else
+  return ((seed == 0) ? seed : seed - 1);
+#endif
+}