diff options
author | unknown <jimw@mysql.com> | 2005-07-18 17:22:38 -0700 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-07-18 17:22:38 -0700 |
commit | bb2fb2af223453682932201e92b56f275fd8f039 (patch) | |
tree | 8f787c005becfbba10a82a9f9d1fad6130b0b38f /cmd-line-utils/readline/util.c | |
parent | c68257043108de5e58b7a769089036c6692b8df3 (diff) | |
download | mariadb-git-bb2fb2af223453682932201e92b56f275fd8f039.tar.gz |
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
Diffstat (limited to 'cmd-line-utils/readline/util.c')
-rw-r--r-- | cmd-line-utils/readline/util.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cmd-line-utils/readline/util.c b/cmd-line-utils/readline/util.c index 403b3d544d9..a632d81129c 100644 --- a/cmd-line-utils/readline/util.c +++ b/cmd-line-utils/readline/util.c @@ -21,7 +21,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 <fcntl.h> @@ -96,14 +98,14 @@ _rl_abort_internal () int rl_abort (count, key) - int count __attribute__((unused)), key __attribute__((unused)); + int count, key; { return (_rl_abort_internal ()); } int rl_tty_status (count, key) - int count __attribute__((unused)), key __attribute__((unused)); + int count, key; { #if defined (TIOCSTAT) ioctl (1, TIOCSTAT, (char *)0); @@ -153,7 +155,7 @@ rl_extend_line_buffer (len) /* A function for simple tilde expansion. */ int rl_tilde_expand (ignore, key) - int ignore __attribute__((unused)), key __attribute__((unused)); + int ignore, key; { register int start, end; char *homedir, *temp; @@ -248,7 +250,7 @@ _rl_strpbrk (string1, string2) { v = _rl_get_char_len (string1, &ps); if (v > 1) - string += v - 1; /* -1 to account for auto-increment in loop */ + string1 += v - 1; /* -1 to account for auto-increment in loop */ } #endif } |