Commit 29d7b245 authored by unknown's avatar unknown

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build

into  ramayana.hindu.god:/home/tsmith/m/bk/build/50

parents 7f99a2db dd433ff1
Basic Installation Basic Installation
================== ==================
These are installation instructions for Readline-5.0. These are installation instructions for Readline-5.2.
The simplest way to compile readline is: The simplest way to compile readline is:
...@@ -238,6 +238,9 @@ SHLIB_XLDFLAGS Additional flags to pass to SHOBJ_LD for shared library ...@@ -238,6 +238,9 @@ SHLIB_XLDFLAGS Additional flags to pass to SHOBJ_LD for shared library
SHLIB_LIBS Any additional libraries that shared libraries should be SHLIB_LIBS Any additional libraries that shared libraries should be
linked against when they are created. linked against when they are created.
SHLIB_LIBPREF The prefix to use when generating the filename of the shared
library. The default is `lib'; Cygwin uses `cyg'.
SHLIB_LIBSUFF The suffix to add to `libreadline' and `libhistory' when SHLIB_LIBSUFF The suffix to add to `libreadline' and `libhistory' when
generating the filename of the shared library. Many systems generating the filename of the shared library. Many systems
use `so'; HP-UX uses `sl'. use `so'; HP-UX uses `sl'.
...@@ -254,6 +257,17 @@ SHLIB_LIBVERSION The string to append to the filename to indicate the version ...@@ -254,6 +257,17 @@ SHLIB_LIBVERSION The string to append to the filename to indicate the version
numbers; use `$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' on those systems. numbers; use `$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' on those systems.
Other Unix versions use different schemes. Other Unix versions use different schemes.
SHLIB_DLLVERSION The version number for shared libraries that determines API
compatibility between readline versions and the underlying
system. Used only on Cygwin. Defaults to $SHLIB_MAJOR, but
can be overridden at configuration time by defining DLLVERSION
in the environment.
SHLIB_DOT The character used to separate the name of the shared library
from the suffix and version information. The default is `.';
systems like Cygwin which don't separate version information
from the library name should set this to the empty string.
SHLIB_STATUS Set this to `supported' when you have defined the other SHLIB_STATUS Set this to `supported' when you have defined the other
necessary variables. Make uses this to determine whether necessary variables. Make uses this to determine whether
or not shared library creation should be attempted. If or not shared library creation should be attempted. If
......
Introduction Introduction
============ ============
This is the Gnu Readline library, version 5.0. This is the Gnu Readline library, version 5.2.
The Readline library provides a set of functions for use by applications The Readline library provides a set of functions for use by applications
that allow users to edit command lines as they are typed in. Both that allow users to edit command lines as they are typed in. Both
...@@ -102,6 +102,9 @@ SHLIB_XLDFLAGS Additional flags to pass to SHOBJ_LD for shared library ...@@ -102,6 +102,9 @@ SHLIB_XLDFLAGS Additional flags to pass to SHOBJ_LD for shared library
SHLIB_LIBS Any additional libraries that shared libraries should be SHLIB_LIBS Any additional libraries that shared libraries should be
linked against when they are created. linked against when they are created.
SHLIB_LIBPREF The prefix to use when generating the filename of the shared
library. The default is `lib'; Cygwin uses `cyg'.
SHLIB_LIBSUFF The suffix to add to `libreadline' and `libhistory' when SHLIB_LIBSUFF The suffix to add to `libreadline' and `libhistory' when
generating the filename of the shared library. Many systems generating the filename of the shared library. Many systems
use `so'; HP-UX uses `sl'. use `so'; HP-UX uses `sl'.
...@@ -118,6 +121,17 @@ SHLIB_LIBVERSION The string to append to the filename to indicate the version ...@@ -118,6 +121,17 @@ SHLIB_LIBVERSION The string to append to the filename to indicate the version
numbers; use `$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' on those systems. numbers; use `$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' on those systems.
Other Unix versions use different schemes. Other Unix versions use different schemes.
SHLIB_DLLVERSION The version number for shared libraries that determines API
compatibility between readline versions and the underlying
system. Used only on Cygwin. Defaults to $SHLIB_MAJOR, but
can be overridden at configuration time by defining DLLVERSION
in the environment.
SHLIB_DOT The character used to separate the name of the shared library
from the suffix and version information. The default is `.';
systems like Cygwin which don't separate version information
from the library name should set this to the empty string.
SHLIB_STATUS Set this to `supported' when you have defined the other SHLIB_STATUS Set this to `supported' when you have defined the other
necessary variables. Make uses this to determine whether necessary variables. Make uses this to determine whether
or not shared library creation should be attempted. or not shared library creation should be attempted.
...@@ -169,4 +183,4 @@ list (mirrored to the Usenet newsgroup gnu.bash.bug) often contains ...@@ -169,4 +183,4 @@ list (mirrored to the Usenet newsgroup gnu.bash.bug) often contains
Readline bug reports and fixes. Readline bug reports and fixes.
Chet Ramey Chet Ramey
chet@po.cwru.edu chet.ramey@case.edu
This diff is collapsed.
/* callback.c -- functions to use readline as an X `callback' mechanism. */ /* callback.c -- functions to use readline as an X `callback' mechanism. */
/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc. /* Copyright (C) 1987-2005 Free Software Foundation, Inc.
This file is part of the GNU Readline Library, a library for This file is part of the GNU Readline Library, a library for
reading lines of text with interactive input and history editing. reading lines of text with interactive input and history editing.
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */ 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY #define READLINE_LIBRARY
#include "config_readline.h" #if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#include "rlconf.h" #include "rlconf.h"
...@@ -41,6 +43,12 @@ ...@@ -41,6 +43,12 @@
#include "rldefs.h" #include "rldefs.h"
#include "readline.h" #include "readline.h"
#include "rlprivate.h" #include "rlprivate.h"
#include "xmalloc.h"
/* Private data for callback registration functions. See comments in
rl_callback_read_char for more details. */
_rl_callback_func_t *_rl_callback_func = 0;
_rl_callback_generic_arg *_rl_callback_data = 0;
/* **************************************************************** */ /* **************************************************************** */
/* */ /* */
...@@ -70,6 +78,7 @@ _rl_callback_newline () ...@@ -70,6 +78,7 @@ _rl_callback_newline ()
{ {
in_handler = 1; in_handler = 1;
if (rl_prep_term_function)
(*rl_prep_term_function) (_rl_meta_flag); (*rl_prep_term_function) (_rl_meta_flag);
#if defined (HANDLE_SIGNALS) #if defined (HANDLE_SIGNALS)
...@@ -87,6 +96,7 @@ rl_callback_handler_install (prompt, linefunc) ...@@ -87,6 +96,7 @@ rl_callback_handler_install (prompt, linefunc)
rl_vcpfunc_t *linefunc; rl_vcpfunc_t *linefunc;
{ {
rl_set_prompt (prompt); rl_set_prompt (prompt);
RL_SETSTATE (RL_STATE_CALLBACK);
rl_linefunc = linefunc; rl_linefunc = linefunc;
_rl_callback_newline (); _rl_callback_newline ();
} }
...@@ -96,7 +106,8 @@ void ...@@ -96,7 +106,8 @@ void
rl_callback_read_char () rl_callback_read_char ()
{ {
char *line; char *line;
int eof; int eof, jcode;
static procenv_t olevel;
if (rl_linefunc == NULL) if (rl_linefunc == NULL)
{ {
...@@ -104,15 +115,88 @@ rl_callback_read_char () ...@@ -104,15 +115,88 @@ rl_callback_read_char ()
abort (); abort ();
} }
memcpy ((void *)olevel, (void *)readline_top_level, sizeof (procenv_t));
jcode = setjmp (readline_top_level);
if (jcode)
{
(*rl_redisplay_function) ();
_rl_want_redisplay = 0;
memcpy ((void *)readline_top_level, (void *)olevel, sizeof (procenv_t));
return;
}
do
{
if (RL_ISSTATE (RL_STATE_ISEARCH))
{
eof = _rl_isearch_callback (_rl_iscxt);
if (eof == 0 && (RL_ISSTATE (RL_STATE_ISEARCH) == 0) && RL_ISSTATE (RL_STATE_INPUTPENDING))
rl_callback_read_char ();
return;
}
else if (RL_ISSTATE (RL_STATE_NSEARCH))
{
eof = _rl_nsearch_callback (_rl_nscxt);
return;
}
else if (RL_ISSTATE (RL_STATE_NUMERICARG))
{
eof = _rl_arg_callback (_rl_argcxt);
if (eof == 0 && (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) && RL_ISSTATE (RL_STATE_INPUTPENDING))
rl_callback_read_char ();
/* XXX - this should handle _rl_last_command_was_kill better */
else if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
_rl_internal_char_cleanup ();
return;
}
else if (RL_ISSTATE (RL_STATE_MULTIKEY))
{
eof = _rl_dispatch_callback (_rl_kscxt); /* For now */
while ((eof == -1 || eof == -2) && RL_ISSTATE (RL_STATE_MULTIKEY) && _rl_kscxt && (_rl_kscxt->flags & KSEQ_DISPATCHED))
eof = _rl_dispatch_callback (_rl_kscxt);
if (RL_ISSTATE (RL_STATE_MULTIKEY) == 0)
{
_rl_internal_char_cleanup ();
_rl_want_redisplay = 1;
}
}
else if (_rl_callback_func)
{
/* This allows functions that simply need to read an additional
character (like quoted-insert) to register a function to be
called when input is available. _rl_callback_data is simply a
pointer to a struct that has the argument count originally
passed to the registering function and space for any additional
parameters. */
eof = (*_rl_callback_func) (_rl_callback_data);
/* If the function `deregisters' itself, make sure the data is
cleaned up. */
if (_rl_callback_func == 0)
{
if (_rl_callback_data)
{
_rl_callback_data_dispose (_rl_callback_data);
_rl_callback_data = 0;
}
_rl_internal_char_cleanup ();
}
}
else
eof = readline_internal_char (); eof = readline_internal_char ();
/* We loop in case some function has pushed input back with rl_execute_next. */ if (rl_done == 0 && _rl_want_redisplay)
for (;;)
{ {
(*rl_redisplay_function) ();
_rl_want_redisplay = 0;
}
if (rl_done) if (rl_done)
{ {
line = readline_internal_teardown (eof); line = readline_internal_teardown (eof);
if (rl_deprep_term_function)
(*rl_deprep_term_function) (); (*rl_deprep_term_function) ();
#if defined (HANDLE_SIGNALS) #if defined (HANDLE_SIGNALS)
rl_clear_signals (); rl_clear_signals ();
...@@ -129,11 +213,8 @@ rl_callback_read_char () ...@@ -129,11 +213,8 @@ rl_callback_read_char ()
if (in_handler == 0 && rl_linefunc) if (in_handler == 0 && rl_linefunc)
_rl_callback_newline (); _rl_callback_newline ();
} }
if (rl_pending_input || _rl_pushed_input_available ())
eof = readline_internal_char ();
else
break;
} }
while (rl_pending_input || _rl_pushed_input_available () || RL_ISSTATE (RL_STATE_MACROINPUT));
} }
/* Remove the handler, and make sure the terminal is in its normal state. */ /* Remove the handler, and make sure the terminal is in its normal state. */
...@@ -141,9 +222,11 @@ void ...@@ -141,9 +222,11 @@ void
rl_callback_handler_remove () rl_callback_handler_remove ()
{ {
rl_linefunc = NULL; rl_linefunc = NULL;
RL_UNSETSTATE (RL_STATE_CALLBACK);
if (in_handler) if (in_handler)
{ {
in_handler = 0; in_handler = 0;
if (rl_deprep_term_function)
(*rl_deprep_term_function) (); (*rl_deprep_term_function) ();
#if defined (HANDLE_SIGNALS) #if defined (HANDLE_SIGNALS)
rl_clear_signals (); rl_clear_signals ();
...@@ -151,4 +234,25 @@ rl_callback_handler_remove () ...@@ -151,4 +234,25 @@ rl_callback_handler_remove ()
} }
} }
_rl_callback_generic_arg *
_rl_callback_data_alloc (count)
int count;
{
_rl_callback_generic_arg *arg;
arg = (_rl_callback_generic_arg *)xmalloc (sizeof (_rl_callback_generic_arg));
arg->count = count;
arg->i1 = arg->i2 = 0;
return arg;
}
void _rl_callback_data_dispose (arg)
_rl_callback_generic_arg *arg;
{
if (arg)
free (arg);
}
#endif #endif
...@@ -59,11 +59,7 @@ ...@@ -59,11 +59,7 @@
#define largest_char 255 /* Largest character value. */ #define largest_char 255 /* Largest character value. */
#define CTRL_CHAR(c) ((c) < control_character_threshold && (((c) & 0x80) == 0)) #define CTRL_CHAR(c) ((c) < control_character_threshold && (((c) & 0x80) == 0))
#if largest_char >= 255
#define META_CHAR(c) ((c) > meta_character_threshold)
#else
#define META_CHAR(c) ((c) > meta_character_threshold && (c) <= largest_char) #define META_CHAR(c) ((c) > meta_character_threshold && (c) <= largest_char)
#endif
#define CTRL(c) ((c) & control_character_mask) #define CTRL(c) ((c) & control_character_mask)
#define META(c) ((c) | meta_character_bit) #define META(c) ((c) | meta_character_bit)
...@@ -90,6 +86,8 @@ ...@@ -90,6 +86,8 @@
/* Some systems define these; we want our definitions. */ /* Some systems define these; we want our definitions. */
#undef ISPRINT #undef ISPRINT
/* Beware: these only work with single-byte ASCII characters. */
#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c)) #define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c))
#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c)) #define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c))
#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c)) #define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c))
......
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */ 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY #define READLINE_LIBRARY
#include "config_readline.h" #if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
......
This diff is collapsed.
...@@ -4,9 +4,27 @@ dnl ...@@ -4,9 +4,27 @@ dnl
dnl report bugs to chet@po.cwru.edu dnl report bugs to chet@po.cwru.edu
dnl dnl
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_REVISION([for Readline 5.0, version 2.52, from autoconf version] AC_ACVERSION)
AC_INIT(readline, 5.0-rc1, bug-readline@gnu.org) # Copyright (C) 1987-2005 Free Software Foundation, Inc.
# This program 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.
# This program 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 this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
AC_REVISION([for Readline 5.2, version 2.61])
AC_INIT(readline, 5.2, bug-readline@gnu.org)
dnl make sure we are using a recent autoconf version dnl make sure we are using a recent autoconf version
AC_PREREQ(2.50) AC_PREREQ(2.50)
...@@ -16,20 +34,28 @@ AC_CONFIG_AUX_DIR(./support) ...@@ -16,20 +34,28 @@ AC_CONFIG_AUX_DIR(./support)
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
dnl update the value of RL_READLINE_VERSION in readline.h when this changes dnl update the value of RL_READLINE_VERSION in readline.h when this changes
LIBVERSION=5.0 LIBVERSION=5.2
AC_CANONICAL_HOST AC_CANONICAL_HOST
dnl configure defaults dnl configure defaults
opt_curses=no opt_curses=no
opt_purify=no
dnl arguments to configure dnl arguments to configure
AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval) AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval)
AC_ARG_WITH(purify, AC_HELP_STRING([--with-purify], [configure to postprocess with purify]), opt_purify=$withval)
if test "$opt_curses" = "yes"; then if test "$opt_curses" = "yes"; then
prefer_curses=yes prefer_curses=yes
fi fi
if test "$opt_purify" = yes; then
PURIFY="purify"
else
PURIFY=
fi
dnl option parsing for optional features dnl option parsing for optional features
opt_multibyte=yes opt_multibyte=yes
opt_static_libs=yes opt_static_libs=yes
...@@ -43,6 +69,36 @@ if test $opt_multibyte = no; then ...@@ -43,6 +69,36 @@ if test $opt_multibyte = no; then
AC_DEFINE(NO_MULTIBYTE_SUPPORT) AC_DEFINE(NO_MULTIBYTE_SUPPORT)
fi fi
dnl load up the cross-building cache file -- add more cases and cache
dnl files as necessary
dnl Note that host and target machine are the same, and different than the
dnl build machine.
CROSS_COMPILE=
if test "x$cross_compiling" = "xyes"; then
case "${host}" in
*-cygwin*)
cross_cache=${srcdir}/cross-build/cygwin.cache
;;
*-mingw*)
cross_cache=${srcdir}/cross-build/mingw.cache
;;
i[[3456]]86-*-beos*)
cross_cache=${srcdir}/cross-build/x86-beos.cache
;;
*) echo "configure: cross-compiling for $host is not supported" >&2
;;
esac
if test -n "${cross_cache}" && test -r "${cross_cache}"; then
echo "loading cross-build cache file ${cross_cache}"
. ${cross_cache}
fi
unset cross_cache
CROSS_COMPILE='-DCROSS_COMPILING'
AC_SUBST(CROSS_COMPILE)
fi
echo "" echo ""
echo "Beginning configuration for readline-$LIBVERSION for ${host_cpu}-${host_vendor}-${host_os}" echo "Beginning configuration for readline-$LIBVERSION for ${host_cpu}-${host_vendor}-${host_os}"
echo "" echo ""
...@@ -83,14 +139,24 @@ AC_HEADER_STDC ...@@ -83,14 +139,24 @@ AC_HEADER_STDC
AC_HEADER_STAT AC_HEADER_STAT
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_CHECK_FUNCS(lstat memmove putenv select setenv setlocale \ AC_CHECK_FUNCS(fcntl kill lstat)
strcasecmp strpbrk tcgetattr vsnprintf isascii isxdigit) AC_CHECK_FUNCS(memmove putenv select setenv setlocale \
strcasecmp strpbrk tcgetattr vsnprintf)
AC_CHECK_FUNCS(isascii isxdigit)
AC_CHECK_FUNCS(getpwent getpwnam getpwuid)
AC_FUNC_STRCOLL AC_FUNC_STRCOLL
AC_CHECK_HEADERS(unistd.h stdlib.h varargs.h stdarg.h string.h strings.h \ AC_CHECK_HEADERS(fcntl.h unistd.h stdlib.h varargs.h stdarg.h string.h strings.h \
limits.h sys/ptem.h sys/pte.h sys/stream.h sys/select.h \ limits.h locale.h pwd.h memory.h termcap.h termios.h termio.h)
termcap.h termios.h termio.h sys/file.h locale.h memory.h ) AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h)
AC_CHECK_HEADERS(sys/ptem.h,,,
[[
#if HAVE_SYS_STREAM_H
# include <sys/stream.h>
#endif
]])
BASH_SYS_SIGNAL_VINTAGE BASH_SYS_SIGNAL_VINTAGE
BASH_SYS_REINSTALL_SIGHANDLERS BASH_SYS_REINSTALL_SIGHANDLERS
...@@ -143,7 +209,13 @@ esac ...@@ -143,7 +209,13 @@ esac
# #
if test -f ${srcdir}/support/shobj-conf; then if test -f ${srcdir}/support/shobj-conf; then
AC_MSG_CHECKING(configuration for building shared libraries) AC_MSG_CHECKING(configuration for building shared libraries)
eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}` eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
# case "$SHLIB_LIBS" in
# *curses*|*termcap*|*termlib*) ;;
# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
# esac
AC_SUBST(SHOBJ_CC) AC_SUBST(SHOBJ_CC)
AC_SUBST(SHOBJ_CFLAGS) AC_SUBST(SHOBJ_CFLAGS)
AC_SUBST(SHOBJ_LD) AC_SUBST(SHOBJ_LD)
...@@ -153,8 +225,11 @@ if test -f ${srcdir}/support/shobj-conf; then ...@@ -153,8 +225,11 @@ if test -f ${srcdir}/support/shobj-conf; then
AC_SUBST(SHOBJ_STATUS) AC_SUBST(SHOBJ_STATUS)
AC_SUBST(SHLIB_STATUS) AC_SUBST(SHLIB_STATUS)
AC_SUBST(SHLIB_XLDFLAGS) AC_SUBST(SHLIB_XLDFLAGS)
AC_SUBST(SHLIB_DOT)
AC_SUBST(SHLIB_LIBPREF)
AC_SUBST(SHLIB_LIBSUFF) AC_SUBST(SHLIB_LIBSUFF)
AC_SUBST(SHLIB_LIBVERSION) AC_SUBST(SHLIB_LIBVERSION)
AC_SUBST(SHLIB_DLLVERSION)
AC_SUBST(SHLIB_LIBS) AC_SUBST(SHLIB_LIBS)
AC_MSG_RESULT($SHLIB_STATUS) AC_MSG_RESULT($SHLIB_STATUS)
...@@ -191,6 +266,12 @@ msdosdjgpp*) BUILD_DIR=`pwd.exe` ;; # to prevent //d/path/file ...@@ -191,6 +266,12 @@ msdosdjgpp*) BUILD_DIR=`pwd.exe` ;; # to prevent //d/path/file
*) BUILD_DIR=`pwd` ;; *) BUILD_DIR=`pwd` ;;
esac esac
case "$BUILD_DIR" in
*\ *) BUILD_DIR=`echo "$BUILD_DIR" | sed 's: :\\\\ :g'` ;;
*) ;;
esac
AC_SUBST(PURIFY)
AC_SUBST(BUILD_DIR) AC_SUBST(BUILD_DIR)
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
......
This diff is collapsed.
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */ 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY #define READLINE_LIBRARY
#include "config_readline.h" #if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#if !defined (BUFSIZ) #if !defined (BUFSIZ)
#include <stdio.h> #include <stdio.h>
...@@ -174,6 +176,7 @@ static FUNMAP default_funmap[] = { ...@@ -174,6 +176,7 @@ static FUNMAP default_funmap[] = {
{ "vi-put", rl_vi_put }, { "vi-put", rl_vi_put },
{ "vi-redo", rl_vi_redo }, { "vi-redo", rl_vi_redo },
{ "vi-replace", rl_vi_replace }, { "vi-replace", rl_vi_replace },
{ "vi-rubout", rl_vi_rubout },
{ "vi-search", rl_vi_search }, { "vi-search", rl_vi_search },
{ "vi-search-again", rl_vi_search_again }, { "vi-search-again", rl_vi_search_again },
{ "vi-set-mark", rl_vi_set_mark }, { "vi-set-mark", rl_vi_set_mark },
......
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
#define READLINE_LIBRARY #define READLINE_LIBRARY
#include "config_readline.h" #if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
...@@ -54,8 +56,6 @@ ...@@ -54,8 +56,6 @@
typedef int _hist_search_func_t PARAMS((const char *, int)); typedef int _hist_search_func_t PARAMS((const char *, int));
extern int rl_byte_oriented; /* declared in mbutil.c */
static char error_pointer; static char error_pointer;
static char *subst_lhs; static char *subst_lhs;
...@@ -87,14 +87,14 @@ char history_comment_char = '\0'; ...@@ -87,14 +87,14 @@ char history_comment_char = '\0';
/* The list of characters which inhibit the expansion of text if found /* The list of characters which inhibit the expansion of text if found
immediately following history_expansion_char. */ immediately following history_expansion_char. */
char *history_no_expand_chars = (char*) " \t\n\r="; char *history_no_expand_chars = " \t\n\r=";
/* If set to a non-zero value, single quotes inhibit history expansion. /* If set to a non-zero value, single quotes inhibit history expansion.
The default is 0. */ The default is 0. */
int history_quotes_inhibit_expansion = 0; int history_quotes_inhibit_expansion = 0;
/* Used to split words by history_tokenize_internal. */ /* Used to split words by history_tokenize_internal. */
char *history_word_delimiters = (char*) HISTORY_WORD_DELIMITERS; char *history_word_delimiters = HISTORY_WORD_DELIMITERS;
/* If set, this points to a function that is called to verify that a /* If set, this points to a function that is called to verify that a
particular history expansion should be performed. */ particular history expansion should be performed. */
...@@ -203,7 +203,8 @@ get_history_event (string, caller_index, delimiting_quote) ...@@ -203,7 +203,8 @@ get_history_event (string, caller_index, delimiting_quote)
} }
/* Only a closing `?' or a newline delimit a substring search string. */ /* Only a closing `?' or a newline delimit a substring search string. */
for (local_index = i; (c = string[i]); i++) for (local_index = i; c = string[i]; i++)
{
#if defined (HANDLE_MULTIBYTE) #if defined (HANDLE_MULTIBYTE)
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
{ {
...@@ -220,7 +221,7 @@ get_history_event (string, caller_index, delimiting_quote) ...@@ -220,7 +221,7 @@ get_history_event (string, caller_index, delimiting_quote)
continue; continue;
} }
} }
else
#endif /* HANDLE_MULTIBYTE */ #endif /* HANDLE_MULTIBYTE */
if ((!substring_okay && (whitespace (c) || c == ':' || if ((!substring_okay && (whitespace (c) || c == ':' ||
(history_search_delimiter_chars && member (c, history_search_delimiter_chars)) || (history_search_delimiter_chars && member (c, history_search_delimiter_chars)) ||
...@@ -228,6 +229,7 @@ get_history_event (string, caller_index, delimiting_quote) ...@@ -228,6 +229,7 @@ get_history_event (string, caller_index, delimiting_quote)
string[i] == '\n' || string[i] == '\n' ||
(substring_okay && string[i] == '?')) (substring_okay && string[i] == '?'))
break; break;
}
which = i - local_index; which = i - local_index;
temp = (char *)xmalloc (1 + which); temp = (char *)xmalloc (1 + which);
...@@ -560,12 +562,12 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) ...@@ -560,12 +562,12 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line)
#if defined (HANDLE_MULTIBYTE) #if defined (HANDLE_MULTIBYTE)
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
{ {
int chr, l; int ch, l;
l = _rl_find_prev_mbchar (string, i, MB_FIND_ANY); l = _rl_find_prev_mbchar (string, i, MB_FIND_ANY);
chr = string[l]; ch = string[l];
/* XXX - original patch had i - 1 ??? If i == 0 it would fail. */ /* XXX - original patch had i - 1 ??? If i == 0 it would fail. */
if (i && (chr == '\'' || chr == '"')) if (i && (ch == '\'' || ch == '"'))
quoted_search_delimiter = chr; quoted_search_delimiter = ch;
} }
else else
#endif /* HANDLE_MULTIBYTE */ #endif /* HANDLE_MULTIBYTE */
...@@ -1426,6 +1428,8 @@ history_tokenize_word (string, ind) ...@@ -1426,6 +1428,8 @@ history_tokenize_word (string, ind)
{ {
if (peek == '<' && string[i + 2] == '-') if (peek == '<' && string[i + 2] == '-')
i++; i++;
else if (peek == '<' && string[i + 2] == '<')
i++;
i += 2; i += 2;
return i; return i;
} }
......
...@@ -30,7 +30,9 @@ ...@@ -30,7 +30,9 @@
# include <floss.h> # include <floss.h>
#endif #endif
#include "config_readline.h" #if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
...@@ -184,8 +186,7 @@ read_history_range (filename, from, to) ...@@ -184,8 +186,7 @@ read_history_range (filename, from, to)
file_size = (size_t)finfo.st_size; file_size = (size_t)finfo.st_size;
/* check for overflow on very large files */ /* check for overflow on very large files */
if ((long long) file_size != (long long) finfo.st_size || if (file_size != finfo.st_size || file_size + 1 < file_size)
file_size + 1 < file_size)
{ {
errno = overflow_errno; errno = overflow_errno;
goto error_and_exit; goto error_and_exit;
...@@ -255,6 +256,10 @@ read_history_range (filename, from, to) ...@@ -255,6 +256,10 @@ read_history_range (filename, from, to)
for (line_end = line_start; line_end < bufend; line_end++) for (line_end = line_start; line_end < bufend; line_end++)
if (*line_end == '\n') if (*line_end == '\n')
{ {
/* Change to allow Windows-like \r\n end of line delimiter. */
if (line_end > line_start && line_end[-1] == '\r')
line_end[-1] = '\0';
else
*line_end = '\0'; *line_end = '\0';
if (*line_start) if (*line_start)
...@@ -334,8 +339,7 @@ history_truncate_file (fname, lines) ...@@ -334,8 +339,7 @@ history_truncate_file (fname, lines)
file_size = (size_t)finfo.st_size; file_size = (size_t)finfo.st_size;
/* check for overflow on very large files */ /* check for overflow on very large files */
if ((long long) file_size != (long long) finfo.st_size || if (file_size != finfo.st_size || file_size + 1 < file_size)
file_size + 1 < file_size)
{ {
close (file); close (file);
#if defined (EFBIG) #if defined (EFBIG)
......
/* history.c -- standalone history library */ /* history.c -- standalone history library */
/* Copyright (C) 1989-2003 Free Software Foundation, Inc. /* Copyright (C) 1989-2005 Free Software Foundation, Inc.
This file contains the GNU History Library (the Library), a set of This file contains the GNU History Library (the Library), a set of
routines for managing the text of previously typed lines. routines for managing the text of previously typed lines.
...@@ -25,7 +25,9 @@ ...@@ -25,7 +25,9 @@
you can call. I think I have done that. */ you can call. I think I have done that. */
#define READLINE_LIBRARY #define READLINE_LIBRARY
#include "config_readline.h" #if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
...@@ -202,11 +204,27 @@ history_get (offset) ...@@ -202,11 +204,27 @@ history_get (offset)
int local_index; int local_index;
local_index = offset - history_base; local_index = offset - history_base;
return (local_index >= history_length || local_index < 0 || !the_history) return (local_index >= history_length || local_index < 0 || the_history == 0)
? (HIST_ENTRY *)NULL ? (HIST_ENTRY *)NULL
: the_history[local_index]; : the_history[local_index];
} }
HIST_ENTRY *
alloc_history_entry (string, ts)
char *string;
char *ts;
{
HIST_ENTRY *temp;
temp = (HIST_ENTRY *)xmalloc (sizeof (HIST_ENTRY));
temp->line = string ? savestring (string) : string;
temp->data = (char *)NULL;
temp->timestamp = ts;
return temp;
}
time_t time_t
history_get_time (hist) history_get_time (hist)
HIST_ENTRY *hist; HIST_ENTRY *hist;
...@@ -288,11 +306,7 @@ add_history (string) ...@@ -288,11 +306,7 @@ add_history (string)
} }
} }
temp = (HIST_ENTRY *)xmalloc (sizeof (HIST_ENTRY)); temp = alloc_history_entry (string, hist_inittime ());
temp->line = savestring (string);
temp->data = (char *)NULL;
temp->timestamp = hist_inittime ();
the_history[history_length] = (HIST_ENTRY *)NULL; the_history[history_length] = (HIST_ENTRY *)NULL;
the_history[history_length - 1] = temp; the_history[history_length - 1] = temp;
...@@ -327,6 +341,26 @@ free_history_entry (hist) ...@@ -327,6 +341,26 @@ free_history_entry (hist)
return (x); return (x);
} }
HIST_ENTRY *
copy_history_entry (hist)
HIST_ENTRY *hist;
{
HIST_ENTRY *ret;
char *ts;
if (hist == 0)
return hist;
ret = alloc_history_entry (hist->line, (char *)NULL);
ts = hist->timestamp ? savestring (hist->timestamp) : hist->timestamp;
ret->timestamp = ts;
ret->data = hist->data;
return ret;
}
/* Make the history entry at WHICH have LINE and DATA. This returns /* Make the history entry at WHICH have LINE and DATA. This returns
the old entry so you can dispose of the data. In the case of an the old entry so you can dispose of the data. In the case of an
invalid WHICH, a NULL pointer is returned. */ invalid WHICH, a NULL pointer is returned. */
...@@ -338,7 +372,7 @@ replace_history_entry (which, line, data) ...@@ -338,7 +372,7 @@ replace_history_entry (which, line, data)
{ {
HIST_ENTRY *temp, *old_value; HIST_ENTRY *temp, *old_value;
if (which >= history_length) if (which < 0 || which >= history_length)
return ((HIST_ENTRY *)NULL); return ((HIST_ENTRY *)NULL);
temp = (HIST_ENTRY *)xmalloc (sizeof (HIST_ENTRY)); temp = (HIST_ENTRY *)xmalloc (sizeof (HIST_ENTRY));
...@@ -352,6 +386,51 @@ replace_history_entry (which, line, data) ...@@ -352,6 +386,51 @@ replace_history_entry (which, line, data)
return (old_value); return (old_value);
} }
/* Replace the DATA in the specified history entries, replacing OLD with
NEW. WHICH says which one(s) to replace: WHICH == -1 means to replace
all of the history entries where entry->data == OLD; WHICH == -2 means
to replace the `newest' history entry where entry->data == OLD; and
WHICH >= 0 means to replace that particular history entry's data, as
long as it matches OLD. */
void
replace_history_data (which,old, new)
int which;
histdata_t *old, *new;
{
HIST_ENTRY *entry;
register int i, last;
if (which < -2 || which >= history_length || history_length == 0 || the_history == 0)
return;
if (which >= 0)
{
entry = the_history[which];
if (entry && entry->data == old)
entry->data = new;
return;
}
last = -1;
for (i = 0; i < history_length; i++)
{
entry = the_history[i];
if (entry == 0)
continue;
if (entry->data == old)
{
last = i;
if (which == -1)
entry->data = new;
}
}
if (which == -2 && last >= 0)
{
entry = the_history[last];
entry->data = new; /* XXX - we don't check entry->old */
}
}
/* Remove history element WHICH from the history. The removed /* Remove history element WHICH from the history. The removed
element is returned to you so you can free the line, data, element is returned to you so you can free the line, data,
and containing structure. */ and containing structure. */
...@@ -362,17 +441,15 @@ remove_history (which) ...@@ -362,17 +441,15 @@ remove_history (which)
HIST_ENTRY *return_value; HIST_ENTRY *return_value;
register int i; register int i;
if (which >= history_length || !history_length) if (which < 0 || which >= history_length || history_length == 0 || the_history == 0)
return_value = (HIST_ENTRY *)NULL; return ((HIST_ENTRY *)NULL);
else
{
return_value = the_history[which]; return_value = the_history[which];
for (i = which; i < history_length; i++) for (i = which; i < history_length; i++)
the_history[i] = the_history[i + 1]; the_history[i] = the_history[i + 1];
history_length--; history_length--;
}
return (return_value); return (return_value);
} }
......
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
#define READLINE_LIBRARY #define READLINE_LIBRARY
#include "config_readline.h" #if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
#if defined (HAVE_STDLIB_H) #if defined (HAVE_STDLIB_H)
......
/* input.c -- character input functions for readline. */ /* input.c -- character input functions for readline. */
/* Copyright (C) 1994 Free Software Foundation, Inc. /* Copyright (C) 1994-2005 Free Software Foundation, Inc.
This file is part of the GNU Readline Library, a library for This file is part of the GNU Readline Library, a library for
reading lines of text with interactive input and history editing. reading lines of text with interactive input and history editing.
...@@ -25,7 +25,9 @@ ...@@ -25,7 +25,9 @@
# include <floss.h> # include <floss.h>
#endif #endif
#include "config_readline.h" #if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
...@@ -177,6 +179,7 @@ rl_gather_tyi () ...@@ -177,6 +179,7 @@ rl_gather_tyi ()
struct timeval timeout; struct timeval timeout;
#endif #endif
chars_avail = 0;
tty = fileno (rl_instream); tty = fileno (rl_instream);
#if defined (HAVE_SELECT) #if defined (HAVE_SELECT)
...@@ -218,6 +221,13 @@ rl_gather_tyi () ...@@ -218,6 +221,13 @@ rl_gather_tyi ()
} }
#endif /* O_NDELAY */ #endif /* O_NDELAY */
#if defined (__MINGW32__)
/* Use getch/_kbhit to check for available console input, in the same way
that we read it normally. */
chars_avail = isatty (tty) ? _kbhit () : 0;
result = 0;
#endif
/* If there's nothing available, don't waste time trying to read /* If there's nothing available, don't waste time trying to read
something. */ something. */
if (chars_avail <= 0) if (chars_avail <= 0)
...@@ -261,7 +271,7 @@ rl_set_keyboard_input_timeout (u) ...@@ -261,7 +271,7 @@ rl_set_keyboard_input_timeout (u)
int o; int o;
o = _keyboard_input_timeout; o = _keyboard_input_timeout;
if (u > 0) if (u >= 0)
_keyboard_input_timeout = u; _keyboard_input_timeout = u;
return (o); return (o);
} }
...@@ -301,6 +311,11 @@ _rl_input_available () ...@@ -301,6 +311,11 @@ _rl_input_available ()
return (chars_avail); return (chars_avail);
#endif #endif
#endif
#if defined (__MINGW32__)
if (isatty (tty))
return (_kbhit ());
#endif #endif
return 0; return 0;
...@@ -405,7 +420,7 @@ rl_read_key () ...@@ -405,7 +420,7 @@ rl_read_key ()
else else
{ {
/* If input is coming from a macro, then use that. */ /* If input is coming from a macro, then use that. */
if ((c= _rl_next_macro_key ())) if (c = _rl_next_macro_key ())
return (c); return (c);
/* If the user has an event function, then call it periodically. */ /* If the user has an event function, then call it periodically. */
...@@ -442,6 +457,10 @@ rl_getc (stream) ...@@ -442,6 +457,10 @@ rl_getc (stream)
while (1) while (1)
{ {
#if defined (__MINGW32__)
if (isatty (fileno (stream)))
return (getch ());
#endif
result = read (fileno (stream), &c, sizeof (unsigned char)); result = read (fileno (stream), &c, sizeof (unsigned char));
if (result == sizeof (unsigned char)) if (result == sizeof (unsigned char))
...@@ -483,7 +502,7 @@ rl_getc (stream) ...@@ -483,7 +502,7 @@ rl_getc (stream)
this is simply an interrupted system call to read (). this is simply an interrupted system call to read ().
Otherwise, some error ocurred, also signifying EOF. */ Otherwise, some error ocurred, also signifying EOF. */
if (errno != EINTR) if (errno != EINTR)
return (EOF); return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
} }
} }
...@@ -517,6 +536,12 @@ _rl_read_mbchar (mbchar, size) ...@@ -517,6 +536,12 @@ _rl_read_mbchar (mbchar, size)
ps = ps_back; ps = ps_back;
continue; continue;
} }
else if (mbchar_bytes_length == 0)
{
mbchar[0] = '\0'; /* null wide character */
mb_len = 1;
break;
}
else if (mbchar_bytes_length > (size_t)(0)) else if (mbchar_bytes_length > (size_t)(0))
break; break;
} }
...@@ -525,21 +550,21 @@ _rl_read_mbchar (mbchar, size) ...@@ -525,21 +550,21 @@ _rl_read_mbchar (mbchar, size)
} }
/* Read a multibyte-character string whose first character is FIRST into /* Read a multibyte-character string whose first character is FIRST into
the buffer MB of length MBLEN. Returns the last character read, which the buffer MB of length MLEN. Returns the last character read, which
may be FIRST. Used by the search functions, among others. Very similar may be FIRST. Used by the search functions, among others. Very similar
to _rl_read_mbchar. */ to _rl_read_mbchar. */
int int
_rl_read_mbstring (first, mb, mb_len) _rl_read_mbstring (first, mb, mlen)
int first; int first;
char *mb; char *mb;
int mb_len; int mlen;
{ {
int i, c; int i, c;
mbstate_t ps; mbstate_t ps;
c = first; c = first;
memset (mb, 0, mb_len); memset (mb, 0, mlen);
for (i = 0; i < mb_len; i++) for (i = 0; i < mlen; i++)
{ {
mb[i] = (char)c; mb[i] = (char)c;
memset (&ps, 0, sizeof (mbstate_t)); memset (&ps, 0, sizeof (mbstate_t));
......
This diff is collapsed.
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY #define READLINE_LIBRARY
#include "config_readline.h" #if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#if defined (HAVE_STDLIB_H) #if defined (HAVE_STDLIB_H)
# include <stdlib.h> # include <stdlib.h>
......
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */ 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY #define READLINE_LIBRARY
#include "config_readline.h" #if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#include <sys/types.h> #include <sys/types.h>
...@@ -76,7 +78,8 @@ static int rl_yank_nth_arg_internal PARAMS((int, int, int)); ...@@ -76,7 +78,8 @@ static int rl_yank_nth_arg_internal PARAMS((int, int, int));
/* How to say that you only want to save a certain amount /* How to say that you only want to save a certain amount
of kill material. */ of kill material. */
int int
rl_set_retained_kills (int num __attribute__((unused))) rl_set_retained_kills (num)
int num;
{ {
return 0; return 0;
} }
...@@ -292,8 +295,8 @@ rl_backward_kill_line (direction, ignore) ...@@ -292,8 +295,8 @@ rl_backward_kill_line (direction, ignore)
/* Kill the whole line, no matter where point is. */ /* Kill the whole line, no matter where point is. */
int int
rl_kill_full_line (int count __attribute__((unused)), rl_kill_full_line (count, ignore)
int ignore __attribute__((unused))) int count, ignore;
{ {
rl_begin_undo_group (); rl_begin_undo_group ();
rl_point = 0; rl_point = 0;
...@@ -310,7 +313,8 @@ rl_kill_full_line (int count __attribute__((unused)), ...@@ -310,7 +313,8 @@ rl_kill_full_line (int count __attribute__((unused)),
/* This does what C-w does in Unix. We can't prevent people from /* This does what C-w does in Unix. We can't prevent people from
using behaviour that they expect. */ using behaviour that they expect. */
int int
rl_unix_word_rubout (int count, int key __attribute__((unused))) rl_unix_word_rubout (count, key)
int count, key;
{ {
int orig_point; int orig_point;
...@@ -342,7 +346,8 @@ rl_unix_word_rubout (int count, int key __attribute__((unused))) ...@@ -342,7 +346,8 @@ rl_unix_word_rubout (int count, int key __attribute__((unused)))
/* This deletes one filename component in a Unix pathname. That is, it /* This deletes one filename component in a Unix pathname. That is, it
deletes backward to directory separator (`/') or whitespace. */ deletes backward to directory separator (`/') or whitespace. */
int int
rl_unix_filename_rubout (int count, int key __attribute__((unused))) rl_unix_filename_rubout (count, key)
int count, key;
{ {
int orig_point, c; int orig_point, c;
...@@ -385,8 +390,8 @@ rl_unix_filename_rubout (int count, int key __attribute__((unused))) ...@@ -385,8 +390,8 @@ rl_unix_filename_rubout (int count, int key __attribute__((unused)))
into the line at all, and if you aren't, then you know what you are into the line at all, and if you aren't, then you know what you are
doing. */ doing. */
int int
rl_unix_line_discard (int count __attribute__((unused)), rl_unix_line_discard (count, key)
int key __attribute__((unused))) int count, key;
{ {
if (rl_point == 0) if (rl_point == 0)
rl_ding (); rl_ding ();
...@@ -422,16 +427,16 @@ region_kill_internal (delete) ...@@ -422,16 +427,16 @@ region_kill_internal (delete)
/* Copy the text in the region to the kill ring. */ /* Copy the text in the region to the kill ring. */
int int
rl_copy_region_to_kill (int count __attribute__((unused)), rl_copy_region_to_kill (count, ignore)
int key __attribute__((unused))) int count, ignore;
{ {
return (region_kill_internal (0)); return (region_kill_internal (0));
} }
/* Kill the text between the point and mark. */ /* Kill the text between the point and mark. */
int int
rl_kill_region (int count __attribute__((unused)), rl_kill_region (count, ignore)
int ignore __attribute__((unused))) int count, ignore;
{ {
int r, npoint; int r, npoint;
...@@ -495,7 +500,8 @@ rl_copy_backward_word (count, key) ...@@ -495,7 +500,8 @@ rl_copy_backward_word (count, key)
/* Yank back the last killed text. This ignores arguments. */ /* Yank back the last killed text. This ignores arguments. */
int int
rl_yank (int count __attribute__((unused)), int ignore __attribute__((unused))) rl_yank (count, ignore)
int count, ignore;
{ {
if (rl_kill_ring == 0) if (rl_kill_ring == 0)
{ {
...@@ -513,7 +519,8 @@ rl_yank (int count __attribute__((unused)), int ignore __attribute__((unused))) ...@@ -513,7 +519,8 @@ rl_yank (int count __attribute__((unused)), int ignore __attribute__((unused)))
delete that text from the line, rotate the index down, and delete that text from the line, rotate the index down, and
yank back some other text. */ yank back some other text. */
int int
rl_yank_pop (int count __attribute__((unused)), int key __attribute__((unused))) rl_yank_pop (count, key)
int count, key;
{ {
int l, n; int l, n;
...@@ -575,6 +582,7 @@ rl_yank_nth_arg_internal (count, ignore, history_skip) ...@@ -575,6 +582,7 @@ rl_yank_nth_arg_internal (count, ignore, history_skip)
if (!arg || !*arg) if (!arg || !*arg)
{ {
rl_ding (); rl_ding ();
FREE (arg);
return -1; return -1;
} }
......
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */ 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY #define READLINE_LIBRARY
#include "config_readline.h" #if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#include <sys/types.h> #include <sys/types.h>
...@@ -98,6 +100,8 @@ _rl_with_macro_input (string) ...@@ -98,6 +100,8 @@ _rl_with_macro_input (string)
int int
_rl_next_macro_key () _rl_next_macro_key ()
{ {
int c;
if (rl_executing_macro == 0) if (rl_executing_macro == 0)
return (0); return (0);
...@@ -107,7 +111,14 @@ _rl_next_macro_key () ...@@ -107,7 +111,14 @@ _rl_next_macro_key ()
return (_rl_next_macro_key ()); return (_rl_next_macro_key ());
} }
#if defined (READLINE_CALLBACKS)
c = rl_executing_macro[executing_macro_index++];
if (RL_ISSTATE (RL_STATE_CALLBACK) && RL_ISSTATE (RL_STATE_READCMD|RL_STATE_MOREINPUT) && rl_executing_macro[executing_macro_index] == 0)
_rl_pop_executing_macro ();
return c;
#else
return (rl_executing_macro[executing_macro_index++]); return (rl_executing_macro[executing_macro_index++]);
#endif
} }
/* Save the currently executing macro on a stack of saved macros. */ /* Save the currently executing macro on a stack of saved macros. */
...@@ -189,8 +200,8 @@ _rl_kill_kbd_macro () ...@@ -189,8 +200,8 @@ _rl_kill_kbd_macro ()
definition to the end of the existing macro, and start by definition to the end of the existing macro, and start by
re-executing the existing macro. */ re-executing the existing macro. */
int int
rl_start_kbd_macro (int ignore1 __attribute__((unused)), rl_start_kbd_macro (ignore1, ignore2)
int ignore2 __attribute__((unused))) int ignore1, ignore2;
{ {
if (RL_ISSTATE (RL_STATE_MACRODEF)) if (RL_ISSTATE (RL_STATE_MACRODEF))
{ {
...@@ -214,7 +225,8 @@ rl_start_kbd_macro (int ignore1 __attribute__((unused)), ...@@ -214,7 +225,8 @@ rl_start_kbd_macro (int ignore1 __attribute__((unused)),
A numeric argument says to execute the macro right now, A numeric argument says to execute the macro right now,
that many times, counting the definition as the first time. */ that many times, counting the definition as the first time. */
int int
rl_end_kbd_macro (int count, int ignore __attribute__((unused))) rl_end_kbd_macro (count, ignore)
int count, ignore;
{ {
if (RL_ISSTATE (RL_STATE_MACRODEF) == 0) if (RL_ISSTATE (RL_STATE_MACRODEF) == 0)
{ {
...@@ -233,7 +245,8 @@ rl_end_kbd_macro (int count, int ignore __attribute__((unused))) ...@@ -233,7 +245,8 @@ rl_end_kbd_macro (int count, int ignore __attribute__((unused)))
/* Execute the most recently defined keyboard macro. /* Execute the most recently defined keyboard macro.
COUNT says how many times to execute it. */ COUNT says how many times to execute it. */
int int
rl_call_last_kbd_macro (int count, int ignore __attribute__((unused))) rl_call_last_kbd_macro (count, ignore)
int count, ignore;
{ {
if (current_macro == 0) if (current_macro == 0)
_rl_abort_internal (); _rl_abort_internal ();
......
/* mbutil.c -- readline multibyte character utility functions */ /* mbutil.c -- readline multibyte character utility functions */
/* Copyright (C) 2001-2004 Free Software Foundation, Inc. /* Copyright (C) 2001-2005 Free Software Foundation, Inc.
This file is part of the GNU Readline Library, a library for This file is part of the GNU Readline Library, a library for
reading lines of text with interactive input and history editing. reading lines of text with interactive input and history editing.
...@@ -21,16 +21,11 @@ ...@@ -21,16 +21,11 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */ 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY #define READLINE_LIBRARY
#ifndef _XOPEN_SOURCE #if defined (HAVE_CONFIG_H)
#define _XOPEN_SOURCE 500 # include <config.h>
#endif #endif
#include "config_readline.h"
#include <sys/types.h> #include <sys/types.h>
/* To get SuSE 9.3 to define wcwidth() (in wchar.h) */
#include <fcntl.h> #include <fcntl.h>
#include "posixjmp.h" #include "posixjmp.h"
...@@ -82,18 +77,20 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero) ...@@ -82,18 +77,20 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero)
char *string; char *string;
int seed, count, find_non_zero; int seed, count, find_non_zero;
{ {
size_t tmp = 0; size_t tmp;
mbstate_t ps; mbstate_t ps;
int point = 0; int point;
wchar_t wc; wchar_t wc;
tmp = 0;
memset(&ps, 0, sizeof (mbstate_t)); memset(&ps, 0, sizeof (mbstate_t));
if (seed < 0) if (seed < 0)
seed = 0; seed = 0;
if (count <= 0) if (count <= 0)
return seed; return seed;
point = seed + _rl_adjust_point(string, seed, &ps); point = seed + _rl_adjust_point (string, seed, &ps);
/* if this is true, means that seed was not pointed character /* if this is true, means that seed was not pointed character
started byte. So correct the point and consume count */ started byte. So correct the point and consume count */
if (seed < point) if (seed < point)
...@@ -131,14 +128,15 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero) ...@@ -131,14 +128,15 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero)
if (find_non_zero) if (find_non_zero)
{ {
tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
while (wcwidth (wc) == 0) while (tmp > 0 && wcwidth (wc) == 0)
{ {
point += tmp; point += tmp;
tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
if (tmp == (size_t)(0) || tmp == (size_t)(-1) || tmp == (size_t)(-2)) if (MB_NULLWCH (tmp) || MB_INVALIDCH (tmp))
break; break;
} }
} }
return point; return point;
} }
...@@ -318,6 +316,28 @@ _rl_is_mbchar_matched (string, seed, end, mbchar, length) ...@@ -318,6 +316,28 @@ _rl_is_mbchar_matched (string, seed, end, mbchar, length)
return 0; return 0;
return 1; return 1;
} }
wchar_t
_rl_char_value (buf, ind)
char *buf;
int ind;
{
size_t tmp;
wchar_t wc;
mbstate_t ps;
int l;
if (MB_LEN_MAX == 1 || rl_byte_oriented)
return ((wchar_t) buf[ind]);
l = strlen (buf);
if (ind >= l - 1)
return ((wchar_t) buf[ind]);
memset (&ps, 0, sizeof (mbstate_t));
tmp = mbrtowc (&wc, buf + ind, l - ind, &ps);
if (MB_INVALIDCH (tmp) || MB_NULLWCH (tmp))
return ((wchar_t) buf[ind]);
return wc;
}
#endif /* HANDLE_MULTIBYTE */ #endif /* HANDLE_MULTIBYTE */
/* Find next `count' characters started byte point of the specified seed. /* Find next `count' characters started byte point of the specified seed.
......
This diff is collapsed.
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */ 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY #define READLINE_LIBRARY
#include "config_readline.h" #if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#include <sys/types.h> #include <sys/types.h>
...@@ -111,7 +113,7 @@ _rl_init_eightbit () ...@@ -111,7 +113,7 @@ _rl_init_eightbit ()
if (lspec == 0 || *lspec == 0) if (lspec == 0 || *lspec == 0)
lspec = setlocale (LC_CTYPE, (char *)NULL); lspec = setlocale (LC_CTYPE, (char *)NULL);
if (lspec == 0) if (lspec == 0)
lspec = (char*) ""; lspec = "";
t = setlocale (LC_CTYPE, lspec); t = setlocale (LC_CTYPE, lspec);
if (t && *t && (t[0] != 'C' || t[1]) && (STREQ (t, "POSIX") == 0)) if (t && *t && (t[0] != 'C' || t[1]) && (STREQ (t, "POSIX") == 0))
......
...@@ -27,7 +27,9 @@ ...@@ -27,7 +27,9 @@
#include "rlconf.h" #include "rlconf.h"
#include "config_readline.h" #if defined (HAVE_CONFIG_H)
# include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
......
This diff is collapsed.
/* Readline.h -- the names of functions callable from within readline. */ /* Readline.h -- the names of functions callable from within readline. */
/* Copyright (C) 1987-2004 Free Software Foundation, Inc. /* Copyright (C) 1987-2005 Free Software Foundation, Inc.
This file is part of the GNU Readline Library, a library for This file is part of the GNU Readline Library, a library for
reading lines of text with interactive input and history editing. reading lines of text with interactive input and history editing.
...@@ -40,9 +40,9 @@ extern "C" { ...@@ -40,9 +40,9 @@ extern "C" {
#endif #endif
/* Hex-encoded Readline version number. */ /* Hex-encoded Readline version number. */
#define RL_READLINE_VERSION 0x0500 /* Readline 5.0 */ #define RL_READLINE_VERSION 0x0502 /* Readline 5.2 */
#define RL_VERSION_MAJOR 5 #define RL_VERSION_MAJOR 5
#define RL_VERSION_MINOR 0 #define RL_VERSION_MINOR 2
/* Readline data structures. */ /* Readline data structures. */
...@@ -241,6 +241,7 @@ extern int rl_vi_column PARAMS((int, int)); ...@@ -241,6 +241,7 @@ extern int rl_vi_column PARAMS((int, int));
extern int rl_vi_delete_to PARAMS((int, int)); extern int rl_vi_delete_to PARAMS((int, int));
extern int rl_vi_change_to PARAMS((int, int)); extern int rl_vi_change_to PARAMS((int, int));
extern int rl_vi_yank_to PARAMS((int, int)); extern int rl_vi_yank_to PARAMS((int, int));
extern int rl_vi_rubout PARAMS((int, int));
extern int rl_vi_delete PARAMS((int, int)); extern int rl_vi_delete PARAMS((int, int));
extern int rl_vi_back_to_indent PARAMS((int, int)); extern int rl_vi_back_to_indent PARAMS((int, int));
extern int rl_vi_first_print PARAMS((int, int)); extern int rl_vi_first_print PARAMS((int, int));
...@@ -302,6 +303,8 @@ extern int rl_bind_keyseq_in_map PARAMS((const char *, rl_command_func_t *, Keym ...@@ -302,6 +303,8 @@ extern int rl_bind_keyseq_in_map PARAMS((const char *, rl_command_func_t *, Keym
extern int rl_bind_keyseq_if_unbound PARAMS((const char *, rl_command_func_t *)); extern int rl_bind_keyseq_if_unbound PARAMS((const char *, rl_command_func_t *));
extern int rl_bind_keyseq_if_unbound_in_map PARAMS((const char *, rl_command_func_t *, Keymap)); extern int rl_bind_keyseq_if_unbound_in_map PARAMS((const char *, rl_command_func_t *, Keymap));
extern int rl_generic_bind PARAMS((int, const char *, char *, Keymap)); extern int rl_generic_bind PARAMS((int, const char *, char *, Keymap));
extern char *rl_variable_value PARAMS((const char *));
extern int rl_variable_bind PARAMS((const char *, const char *)); extern int rl_variable_bind PARAMS((const char *, const char *));
/* Backwards compatibility, use rl_bind_keyseq_in_map instead. */ /* Backwards compatibility, use rl_bind_keyseq_in_map instead. */
...@@ -401,6 +404,7 @@ extern int rl_reset_terminal PARAMS((const char *)); ...@@ -401,6 +404,7 @@ extern int rl_reset_terminal PARAMS((const char *));
extern void rl_resize_terminal PARAMS((void)); extern void rl_resize_terminal PARAMS((void));
extern void rl_set_screen_size PARAMS((int, int)); extern void rl_set_screen_size PARAMS((int, int));
extern void rl_get_screen_size PARAMS((int *, int *)); extern void rl_get_screen_size PARAMS((int *, int *));
extern void rl_reset_screen_size PARAMS((void));
extern char *rl_get_termcap PARAMS((const char *)); extern char *rl_get_termcap PARAMS((const char *));
...@@ -528,6 +532,11 @@ extern const char *rl_terminal_name; ...@@ -528,6 +532,11 @@ extern const char *rl_terminal_name;
extern FILE *rl_instream; extern FILE *rl_instream;
extern FILE *rl_outstream; extern FILE *rl_outstream;
/* If non-zero, Readline gives values of LINES and COLUMNS from the environment
greater precedence than values fetched from the kernel when computing the
screen dimensions. */
extern int rl_prefer_env_winsize;
/* If non-zero, then this is the address of a function to call just /* If non-zero, then this is the address of a function to call just
before readline_internal () prints the first prompt. */ before readline_internal () prints the first prompt. */
extern rl_hook_func_t *rl_startup_hook; extern rl_hook_func_t *rl_startup_hook;
...@@ -748,6 +757,10 @@ extern int rl_ignore_completion_duplicates; ...@@ -748,6 +757,10 @@ extern int rl_ignore_completion_duplicates;
completion character will be inserted as any other. */ completion character will be inserted as any other. */
extern int rl_inhibit_completion; extern int rl_inhibit_completion;
/* Input error; can be returned by (*rl_getc_function) if readline is reading
a top-level command (RL_ISSTATE (RL_STATE_READCMD)). */
#define READERR (-2)
/* Definitions available for use by readline clients. */ /* Definitions available for use by readline clients. */
#define RL_PROMPT_START_IGNORE '\001' #define RL_PROMPT_START_IGNORE '\001'
#define RL_PROMPT_END_IGNORE '\002' #define RL_PROMPT_END_IGNORE '\002'
...@@ -759,29 +772,33 @@ extern int rl_inhibit_completion; ...@@ -759,29 +772,33 @@ extern int rl_inhibit_completion;
#define MULT_MATCH 2 #define MULT_MATCH 2
/* Possible state values for rl_readline_state */ /* Possible state values for rl_readline_state */
#define RL_STATE_NONE 0x00000 /* no state; before first call */ #define RL_STATE_NONE 0x000000 /* no state; before first call */
#define RL_STATE_INITIALIZING 0x00001 /* initializing */ #define RL_STATE_INITIALIZING 0x000001 /* initializing */
#define RL_STATE_INITIALIZED 0x00002 /* initialization done */ #define RL_STATE_INITIALIZED 0x000002 /* initialization done */
#define RL_STATE_TERMPREPPED 0x00004 /* terminal is prepped */ #define RL_STATE_TERMPREPPED 0x000004 /* terminal is prepped */
#define RL_STATE_READCMD 0x00008 /* reading a command key */ #define RL_STATE_READCMD 0x000008 /* reading a command key */
#define RL_STATE_METANEXT 0x00010 /* reading input after ESC */ #define RL_STATE_METANEXT 0x000010 /* reading input after ESC */
#define RL_STATE_DISPATCHING 0x00020 /* dispatching to a command */ #define RL_STATE_DISPATCHING 0x000020 /* dispatching to a command */
#define RL_STATE_MOREINPUT 0x00040 /* reading more input in a command function */ #define RL_STATE_MOREINPUT 0x000040 /* reading more input in a command function */
#define RL_STATE_ISEARCH 0x00080 /* doing incremental search */ #define RL_STATE_ISEARCH 0x000080 /* doing incremental search */
#define RL_STATE_NSEARCH 0x00100 /* doing non-inc search */ #define RL_STATE_NSEARCH 0x000100 /* doing non-inc search */
#define RL_STATE_SEARCH 0x00200 /* doing a history search */ #define RL_STATE_SEARCH 0x000200 /* doing a history search */
#define RL_STATE_NUMERICARG 0x00400 /* reading numeric argument */ #define RL_STATE_NUMERICARG 0x000400 /* reading numeric argument */
#define RL_STATE_MACROINPUT 0x00800 /* getting input from a macro */ #define RL_STATE_MACROINPUT 0x000800 /* getting input from a macro */
#define RL_STATE_MACRODEF 0x01000 /* defining keyboard macro */ #define RL_STATE_MACRODEF 0x001000 /* defining keyboard macro */
#define RL_STATE_OVERWRITE 0x02000 /* overwrite mode */ #define RL_STATE_OVERWRITE 0x002000 /* overwrite mode */
#define RL_STATE_COMPLETING 0x04000 /* doing completion */ #define RL_STATE_COMPLETING 0x004000 /* doing completion */
#define RL_STATE_SIGHANDLER 0x08000 /* in readline sighandler */ #define RL_STATE_SIGHANDLER 0x008000 /* in readline sighandler */
#define RL_STATE_UNDOING 0x10000 /* doing an undo */ #define RL_STATE_UNDOING 0x010000 /* doing an undo */
#define RL_STATE_INPUTPENDING 0x20000 /* rl_execute_next called */ #define RL_STATE_INPUTPENDING 0x020000 /* rl_execute_next called */
#define RL_STATE_TTYCSAVED 0x40000 /* tty special chars saved */ #define RL_STATE_TTYCSAVED 0x040000 /* tty special chars saved */
#define RL_STATE_CALLBACK 0x080000 /* using the callback interface */
#define RL_STATE_DONE 0x80000 /* done; accepted line */ #define RL_STATE_VIMOTION 0x100000 /* reading vi motion arg */
#define RL_STATE_MULTIKEY 0x200000 /* reading multiple-key command */
#define RL_STATE_VICMDONCE 0x400000 /* entered vi command mode at least once */
#define RL_STATE_DONE 0x800000 /* done; accepted line */
#define RL_SETSTATE(x) (rl_readline_state |= (x)) #define RL_SETSTATE(x) (rl_readline_state |= (x))
#define RL_UNSETSTATE(x) (rl_readline_state &= ~(x)) #define RL_UNSETSTATE(x) (rl_readline_state &= ~(x))
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
59 Temple Place, Suite 330, Boston, MA 02111 USA. */ 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
#define READLINE_LIBRARY #define READLINE_LIBRARY
#include "config_readline.h" #include <config.h>
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
# include <string.h> # include <string.h>
#endif #endif
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment