mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 23:25:34 +02:00
Upgrade bundled readline to version 5.0.
cmd-line-utils/readline/INSTALL: Import readline-5.0 cmd-line-utils/readline/Makefile.am: Import readline-5.0 cmd-line-utils/readline/README: Import readline-5.0 cmd-line-utils/readline/bind.c: Import readline-5.0 cmd-line-utils/readline/callback.c: Import readline-5.0 cmd-line-utils/readline/chardefs.h: Import readline-5.0 cmd-line-utils/readline/complete.c: Import readline-5.0 cmd-line-utils/readline/configure.in: Import readline-5.0 cmd-line-utils/readline/display.c: Import readline-5.0 cmd-line-utils/readline/funmap.c: Import readline-5.0 cmd-line-utils/readline/histexpand.c: Import readline-5.0 cmd-line-utils/readline/histfile.c: Import readline-5.0 cmd-line-utils/readline/history.c: Import readline-5.0 cmd-line-utils/readline/history.h: Import readline-5.0 cmd-line-utils/readline/histsearch.c: Import readline-5.0 cmd-line-utils/readline/input.c: Import readline-5.0 cmd-line-utils/readline/isearch.c: Import readline-5.0 cmd-line-utils/readline/keymaps.c: Import readline-5.0 cmd-line-utils/readline/kill.c: Import readline-5.0 cmd-line-utils/readline/macro.c: Import readline-5.0 cmd-line-utils/readline/mbutil.c: Import readline-5.0 cmd-line-utils/readline/misc.c: Import readline-5.0 cmd-line-utils/readline/nls.c: Import readline-5.0 cmd-line-utils/readline/parens.c: Import readline-5.0 cmd-line-utils/readline/posixdir.h: Import readline-5.0 cmd-line-utils/readline/readline.c: Import readline-5.0 cmd-line-utils/readline/readline.h: Import readline-5.0 cmd-line-utils/readline/rldefs.h: Import readline-5.0 cmd-line-utils/readline/rlmbutil.h: Import readline-5.0 cmd-line-utils/readline/rlprivate.h: Import readline-5.0 cmd-line-utils/readline/rlstdc.h: Import readline-5.0 cmd-line-utils/readline/rltty.c: Import readline-5.0 cmd-line-utils/readline/rltty.h: Import readline-5.0 cmd-line-utils/readline/rltypedefs.h: Import readline-5.0 cmd-line-utils/readline/search.c: Import readline-5.0 cmd-line-utils/readline/shell.c: Import readline-5.0 cmd-line-utils/readline/signals.c: Import readline-5.0 cmd-line-utils/readline/terminal.c: Import readline-5.0 cmd-line-utils/readline/text.c: Import readline-5.0 cmd-line-utils/readline/tilde.c: Import readline-5.0 cmd-line-utils/readline/undo.c: Import readline-5.0 cmd-line-utils/readline/util.c: Import readline-5.0 cmd-line-utils/readline/vi_mode.c: Import readline-5.0 cmd-line-utils/readline/xmalloc.c: Import readline-5.0
This commit is contained in:
unknown
parent
c682570431
commit
bb2fb2af22
46 changed files with 1834 additions and 721 deletions
|
|
@ -22,7 +22,9 @@
|
|||
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
|
||||
#define READLINE_LIBRARY
|
||||
|
||||
#include "config_readline.h"
|
||||
#if defined (HAVE_CONFIG_H)
|
||||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#include "posixstat.h"
|
||||
|
|
@ -66,11 +68,11 @@
|
|||
#include "xmalloc.h"
|
||||
|
||||
#ifndef RL_LIBRARY_VERSION
|
||||
# define RL_LIBRARY_VERSION "4.3"
|
||||
# define RL_LIBRARY_VERSION "5.0"
|
||||
#endif
|
||||
|
||||
#ifndef RL_READLINE_VERSION
|
||||
# define RL_READLINE_VERSION 0x0403
|
||||
# define RL_READLINE_VERSION 0x0500
|
||||
#endif
|
||||
|
||||
extern void _rl_free_history_entry PARAMS((HIST_ENTRY *));
|
||||
|
|
@ -83,6 +85,7 @@ static void bind_arrow_keys_internal PARAMS((Keymap));
|
|||
static void bind_arrow_keys PARAMS((void));
|
||||
|
||||
static void readline_default_bindings PARAMS((void));
|
||||
static void reset_default_bindings PARAMS((void));
|
||||
|
||||
/* **************************************************************** */
|
||||
/* */
|
||||
|
|
@ -345,7 +348,7 @@ readline_internal_setup ()
|
|||
|
||||
#if defined (VI_MODE)
|
||||
if (rl_editing_mode == vi_mode)
|
||||
rl_vi_insertion_mode (1, 0);
|
||||
rl_vi_insertion_mode (1, 'i');
|
||||
#endif /* VI_MODE */
|
||||
|
||||
if (rl_pre_input_hook)
|
||||
|
|
@ -648,7 +651,21 @@ _rl_dispatch_subseq (key, map, got_subseq)
|
|||
the function. The recursive call to _rl_dispatch_subseq has
|
||||
already taken care of pushing any necessary input back onto
|
||||
the input queue with _rl_unget_char. */
|
||||
r = _rl_dispatch (ANYOTHERKEY, FUNCTION_TO_KEYMAP (map, key));
|
||||
{
|
||||
#if 0
|
||||
r = _rl_dispatch (ANYOTHERKEY, FUNCTION_TO_KEYMAP (map, key));
|
||||
#else
|
||||
/* XXX - experimental code -- might never be executed. Save
|
||||
for later. */
|
||||
Keymap m = FUNCTION_TO_KEYMAP (map, key);
|
||||
int type = m[ANYOTHERKEY].type;
|
||||
func = m[ANYOTHERKEY].function;
|
||||
if (type == ISFUNC && func == rl_do_lowercase_version)
|
||||
r = _rl_dispatch (_rl_to_lower (key), map);
|
||||
else
|
||||
r = _rl_dispatch (ANYOTHERKEY, m);
|
||||
#endif
|
||||
}
|
||||
else if (r && map[ANYOTHERKEY].function)
|
||||
{
|
||||
/* We didn't match (r is probably -1), so return something to
|
||||
|
|
@ -682,6 +699,7 @@ _rl_dispatch_subseq (key, map, got_subseq)
|
|||
}
|
||||
#if defined (VI_MODE)
|
||||
if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
|
||||
key != ANYOTHERKEY &&
|
||||
_rl_vi_textmod_command (key))
|
||||
_rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
|
||||
#endif
|
||||
|
|
@ -836,7 +854,7 @@ readline_initialize_everything ()
|
|||
/* If the completion parser's default word break characters haven't
|
||||
been set yet, then do so now. */
|
||||
if (rl_completer_word_break_characters == (char *)NULL)
|
||||
rl_completer_word_break_characters = rl_basic_word_break_characters;
|
||||
rl_completer_word_break_characters = (char *)rl_basic_word_break_characters;
|
||||
}
|
||||
|
||||
/* If this system allows us to look at the values of the regular
|
||||
|
|
@ -848,6 +866,15 @@ readline_default_bindings ()
|
|||
rl_tty_set_default_bindings (_rl_keymap);
|
||||
}
|
||||
|
||||
/* Reset the default bindings for the terminal special characters we're
|
||||
interested in back to rl_insert and read the new ones. */
|
||||
static void
|
||||
reset_default_bindings ()
|
||||
{
|
||||
rl_tty_unset_default_bindings (_rl_keymap);
|
||||
rl_tty_set_default_bindings (_rl_keymap);
|
||||
}
|
||||
|
||||
/* Bind some common arrow key sequences in MAP. */
|
||||
static void
|
||||
bind_arrow_keys_internal (map)
|
||||
|
|
@ -859,25 +886,25 @@ bind_arrow_keys_internal (map)
|
|||
_rl_keymap = map;
|
||||
|
||||
#if defined (__MSDOS__)
|
||||
_rl_bind_if_unbound ("\033[0A", rl_get_previous_history);
|
||||
_rl_bind_if_unbound ("\033[0B", rl_backward_char);
|
||||
_rl_bind_if_unbound ("\033[0C", rl_forward_char);
|
||||
_rl_bind_if_unbound ("\033[0D", rl_get_next_history);
|
||||
rl_bind_keyseq_if_unbound ("\033[0A", rl_get_previous_history);
|
||||
rl_bind_keyseq_if_unbound ("\033[0B", rl_backward_char);
|
||||
rl_bind_keyseq_if_unbound ("\033[0C", rl_forward_char);
|
||||
rl_bind_keyseq_if_unbound ("\033[0D", rl_get_next_history);
|
||||
#endif
|
||||
|
||||
_rl_bind_if_unbound ("\033[A", rl_get_previous_history);
|
||||
_rl_bind_if_unbound ("\033[B", rl_get_next_history);
|
||||
_rl_bind_if_unbound ("\033[C", rl_forward_char);
|
||||
_rl_bind_if_unbound ("\033[D", rl_backward_char);
|
||||
_rl_bind_if_unbound ("\033[H", rl_beg_of_line);
|
||||
_rl_bind_if_unbound ("\033[F", rl_end_of_line);
|
||||
rl_bind_keyseq_if_unbound ("\033[A", rl_get_previous_history);
|
||||
rl_bind_keyseq_if_unbound ("\033[B", rl_get_next_history);
|
||||
rl_bind_keyseq_if_unbound ("\033[C", rl_forward_char);
|
||||
rl_bind_keyseq_if_unbound ("\033[D", rl_backward_char);
|
||||
rl_bind_keyseq_if_unbound ("\033[H", rl_beg_of_line);
|
||||
rl_bind_keyseq_if_unbound ("\033[F", rl_end_of_line);
|
||||
|
||||
_rl_bind_if_unbound ("\033OA", rl_get_previous_history);
|
||||
_rl_bind_if_unbound ("\033OB", rl_get_next_history);
|
||||
_rl_bind_if_unbound ("\033OC", rl_forward_char);
|
||||
_rl_bind_if_unbound ("\033OD", rl_backward_char);
|
||||
_rl_bind_if_unbound ("\033OH", rl_beg_of_line);
|
||||
_rl_bind_if_unbound ("\033OF", rl_end_of_line);
|
||||
rl_bind_keyseq_if_unbound ("\033OA", rl_get_previous_history);
|
||||
rl_bind_keyseq_if_unbound ("\033OB", rl_get_next_history);
|
||||
rl_bind_keyseq_if_unbound ("\033OC", rl_forward_char);
|
||||
rl_bind_keyseq_if_unbound ("\033OD", rl_backward_char);
|
||||
rl_bind_keyseq_if_unbound ("\033OH", rl_beg_of_line);
|
||||
rl_bind_keyseq_if_unbound ("\033OF", rl_end_of_line);
|
||||
|
||||
_rl_keymap = xkeymap;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue