cc88a640ca
[patch 0/3] readline-6.2 rebase http://sourceware.org/ml/gdb-patches/2011-05/msg00003.html [patch 1/3] readline-6.2: Merge of already posted patches http://sourceware.org/ml/gdb-patches/2011-05/msg00004.html = [Bug-readline] [RFC/readline] bind.c, rl_function_dumper, Free allocated http://lists.gnu.org/archive/html/bug-readline/2011-03/msg00000.html [Bug-readline] [patch] Fix underquotation in readline/examples/rlfe/conf http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00001.html [Bug-readline] [patch] Makefile.in htm<->html http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00002.html Re: [Bug-readline] [patch] Makefile.in dependency: callback.o: xmalloc.h http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00004.html [Bug-readline] [patch] Remove . from the VPATH directive http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00005.html Eli Zaretskii's __MSDOS__ / __GO32__ / __MINGW32__ / __DJGPP__ stuff: http://sourceware.org/ml/gdb/2011-04/msg00002.html Jan Kratochvil's patch for FSF GDB tree local-specific changes: http://sourceware.org/ml/gdb/2011-04/msg00006.html Preservation of existing ChangeLog.gdb files, their updates. [patch 2/3] readline-6.2: Workaround "ask" regression http://sourceware.org/ml/gdb-patches/2011-05/msg00005.html [patch 3/3] readline-6.2: Revert 5.x compat., apply 6.x compat. http://sourceware.org/ml/gdb-patches/2011-05/msg00006.html [patch 4/3] readline-6.2: Substitute inc-hist.texinfo http://sourceware.org/ml/gdb-patches/2011-05/msg00010.html readline/ Workaround gdb.base/completion.exp regression on readline-6.2. * complete.c (get_y_or_n): Disable the return on RL_STATE_CALLBACK. Imported readline 6.2, and upstream patch 001. * configure: Regenerate. readline/doc/ * hsuser.texi (Using History Interactively): Disable !BashFeatures @defcodeindex. Make the `Programming with GNU History' reference external. * inc-hist.texinfo: Remove. Imported readline 6.2, and upstream patch 001. readline/examples/ Imported readline 6.2, and upstream patch 001. readline/examples/rlfe/ Imported readline 6.2, and upstream patch 001. gdb/ * config.in: Regenerate. * configure: Regenerate. * configure.ac <--with-system-readline> (for readline_echoing_p): Remove the test. * tui/tui-io.c (tui_old_readline_echoing_p): Rename to ... (tui_old_rl_echoing_p): ... here. (tui_setup_io): Rename extern declaration readline_echoing_p to _rl_echoing_p. Adjust assignments for the both renames. gdb/doc/ * Makefile.in (GDB_DOC_SOURCE_INCLUDES): Rename inc-hist.texinfo to hsuser.texi. * gdb.texinfo <!SYSTEM_READLINE>: Rename inc-hist.texinfo inclusion and comment to hsuser.texi. Change rluser.texi name in the comment.
154 lines
5 KiB
C
154 lines
5 KiB
C
/* rlmbutil.h -- utility functions for multibyte characters. */
|
|
|
|
/* Copyright (C) 2001-2009 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU Readline Library (Readline), a library
|
|
for reading lines of text with interactive input and history editing.
|
|
|
|
Readline 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 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
Readline 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.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with Readline. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#if !defined (_RL_MBUTIL_H_)
|
|
#define _RL_MBUTIL_H_
|
|
|
|
#include "rlstdc.h"
|
|
|
|
/************************************************/
|
|
/* check multibyte capability for I18N code */
|
|
/************************************************/
|
|
|
|
/* For platforms which support the ISO C amendement 1 functionality we
|
|
support user defined character classes. */
|
|
/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */
|
|
#if defined (HAVE_WCTYPE_H) && defined (HAVE_WCHAR_H) && defined (HAVE_LOCALE_H)
|
|
# include <wchar.h>
|
|
# include <wctype.h>
|
|
# if defined (HAVE_ISWCTYPE) && \
|
|
defined (HAVE_ISWLOWER) && \
|
|
defined (HAVE_ISWUPPER) && \
|
|
defined (HAVE_MBSRTOWCS) && \
|
|
defined (HAVE_MBRTOWC) && \
|
|
defined (HAVE_MBRLEN) && \
|
|
defined (HAVE_TOWLOWER) && \
|
|
defined (HAVE_TOWUPPER) && \
|
|
defined (HAVE_WCHAR_T) && \
|
|
defined (HAVE_WCWIDTH)
|
|
/* system is supposed to support XPG5 */
|
|
# define HANDLE_MULTIBYTE 1
|
|
# endif
|
|
#endif
|
|
|
|
/* If we don't want multibyte chars even on a system that supports them, let
|
|
the configuring user turn multibyte support off. */
|
|
#if defined (NO_MULTIBYTE_SUPPORT)
|
|
# undef HANDLE_MULTIBYTE
|
|
#endif
|
|
|
|
/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */
|
|
#if HANDLE_MULTIBYTE && !defined (HAVE_MBSTATE_T)
|
|
# define wcsrtombs(dest, src, len, ps) (wcsrtombs) (dest, src, len, 0)
|
|
# define mbsrtowcs(dest, src, len, ps) (mbsrtowcs) (dest, src, len, 0)
|
|
# define wcrtomb(s, wc, ps) (wcrtomb) (s, wc, 0)
|
|
# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
|
|
# define mbrlen(s, n, ps) (mbrlen) (s, n, 0)
|
|
# define mbstate_t int
|
|
#endif
|
|
|
|
/* Make sure MB_LEN_MAX is at least 16 on systems that claim to be able to
|
|
handle multibyte chars (some systems define MB_LEN_MAX as 1) */
|
|
#ifdef HANDLE_MULTIBYTE
|
|
# include <limits.h>
|
|
# if defined(MB_LEN_MAX) && (MB_LEN_MAX < 16)
|
|
# undef MB_LEN_MAX
|
|
# endif
|
|
# if !defined (MB_LEN_MAX)
|
|
# define MB_LEN_MAX 16
|
|
# endif
|
|
#endif
|
|
|
|
/************************************************/
|
|
/* end of multibyte capability checks for I18N */
|
|
/************************************************/
|
|
|
|
/*
|
|
* Flags for _rl_find_prev_mbchar and _rl_find_next_mbchar:
|
|
*
|
|
* MB_FIND_ANY find any multibyte character
|
|
* MB_FIND_NONZERO find a non-zero-width multibyte character
|
|
*/
|
|
|
|
#define MB_FIND_ANY 0x00
|
|
#define MB_FIND_NONZERO 0x01
|
|
|
|
extern int _rl_find_prev_mbchar PARAMS((char *, int, int));
|
|
extern int _rl_find_next_mbchar PARAMS((char *, int, int, int));
|
|
|
|
#ifdef HANDLE_MULTIBYTE
|
|
|
|
extern int _rl_compare_chars PARAMS((char *, int, mbstate_t *, char *, int, mbstate_t *));
|
|
extern int _rl_get_char_len PARAMS((char *, mbstate_t *));
|
|
extern int _rl_adjust_point PARAMS((char *, int, mbstate_t *));
|
|
|
|
extern int _rl_read_mbchar PARAMS((char *, int));
|
|
extern int _rl_read_mbstring PARAMS((int, char *, int));
|
|
|
|
extern int _rl_is_mbchar_matched PARAMS((char *, int, int, char *, int));
|
|
|
|
extern wchar_t _rl_char_value PARAMS((char *, int));
|
|
extern int _rl_walphabetic PARAMS((wchar_t));
|
|
|
|
#define _rl_to_wupper(wc) (iswlower (wc) ? towupper (wc) : (wc))
|
|
#define _rl_to_wlower(wc) (iswupper (wc) ? towlower (wc) : (wc))
|
|
|
|
#define MB_NEXTCHAR(b,s,c,f) \
|
|
((MB_CUR_MAX > 1 && rl_byte_oriented == 0) \
|
|
? _rl_find_next_mbchar ((b), (s), (c), (f)) \
|
|
: ((s) + (c)))
|
|
#define MB_PREVCHAR(b,s,f) \
|
|
((MB_CUR_MAX > 1 && rl_byte_oriented == 0) \
|
|
? _rl_find_prev_mbchar ((b), (s), (f)) \
|
|
: ((s) - 1))
|
|
|
|
#define MB_INVALIDCH(x) ((x) == (size_t)-1 || (x) == (size_t)-2)
|
|
#define MB_NULLWCH(x) ((x) == 0)
|
|
|
|
#else /* !HANDLE_MULTIBYTE */
|
|
|
|
#undef MB_LEN_MAX
|
|
#undef MB_CUR_MAX
|
|
|
|
#define MB_LEN_MAX 1
|
|
#define MB_CUR_MAX 1
|
|
|
|
#define _rl_find_prev_mbchar(b, i, f) (((i) == 0) ? (i) : ((i) - 1))
|
|
#define _rl_find_next_mbchar(b, i1, i2, f) ((i1) + (i2))
|
|
|
|
#define _rl_char_value(buf,ind) ((buf)[(ind)])
|
|
|
|
#define _rl_walphabetic(c) (rl_alphabetic (c))
|
|
|
|
#define _rl_to_wupper(c) (_rl_to_upper (c))
|
|
#define _rl_to_wlower(c) (_rl_to_lower (c))
|
|
|
|
#define MB_NEXTCHAR(b,s,c,f) ((s) + (c))
|
|
#define MB_PREVCHAR(b,s,f) ((s) - 1)
|
|
|
|
#define MB_INVALIDCH(x) (0)
|
|
#define MB_NULLWCH(x) (0)
|
|
|
|
#endif /* !HANDLE_MULTIBYTE */
|
|
|
|
extern int rl_byte_oriented;
|
|
|
|
#endif /* _RL_MBUTIL_H_ */
|