forked from Imagelibrary/binutils-gdb
Import readline 8.0
This imports readline 8.0. readline/ChangeLog.gdb 2019-08-12 Tom Tromey <tom@tromey.com> * Imported readline 8.0.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/* util.c -- readline utility functions */
|
||||
|
||||
/* Copyright (C) 1987-2015 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1987-2017 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.
|
||||
@@ -70,8 +70,7 @@ int _rl_allow_pathname_alphabetic_chars = 0;
|
||||
static const char * const pathname_alphabetic_chars = "/-_=~.#$";
|
||||
|
||||
int
|
||||
rl_alphabetic (c)
|
||||
int c;
|
||||
rl_alphabetic (int c)
|
||||
{
|
||||
if (ALPHABETIC (c))
|
||||
return (1);
|
||||
@@ -97,7 +96,7 @@ _rl_walphabetic (wchar_t wc)
|
||||
|
||||
/* How to abort things. */
|
||||
int
|
||||
_rl_abort_internal ()
|
||||
_rl_abort_internal (void)
|
||||
{
|
||||
rl_ding ();
|
||||
rl_clear_message ();
|
||||
@@ -117,22 +116,19 @@ _rl_abort_internal ()
|
||||
}
|
||||
|
||||
int
|
||||
rl_abort (count, key)
|
||||
int count, key;
|
||||
rl_abort (int count, int key)
|
||||
{
|
||||
return (_rl_abort_internal ());
|
||||
}
|
||||
|
||||
int
|
||||
_rl_null_function (count, key)
|
||||
int count, key;
|
||||
_rl_null_function (int count, int key)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
rl_tty_status (count, key)
|
||||
int count, key;
|
||||
rl_tty_status (int count, int key)
|
||||
{
|
||||
#if defined (TIOCSTAT)
|
||||
ioctl (1, TIOCSTAT, (char *)0);
|
||||
@@ -146,8 +142,7 @@ rl_tty_status (count, key)
|
||||
/* Return a copy of the string between FROM and TO.
|
||||
FROM is inclusive, TO is not. */
|
||||
char *
|
||||
rl_copy_text (from, to)
|
||||
int from, to;
|
||||
rl_copy_text (int from, int to)
|
||||
{
|
||||
register int length;
|
||||
char *copy;
|
||||
@@ -166,8 +161,7 @@ rl_copy_text (from, to)
|
||||
/* Increase the size of RL_LINE_BUFFER until it has enough space to hold
|
||||
LEN characters. */
|
||||
void
|
||||
rl_extend_line_buffer (len)
|
||||
int len;
|
||||
rl_extend_line_buffer (int len)
|
||||
{
|
||||
while (len >= rl_line_buffer_len)
|
||||
{
|
||||
@@ -181,8 +175,7 @@ rl_extend_line_buffer (len)
|
||||
|
||||
/* A function for simple tilde expansion. */
|
||||
int
|
||||
rl_tilde_expand (ignore, key)
|
||||
int ignore, key;
|
||||
rl_tilde_expand (int ignore, int key)
|
||||
{
|
||||
register int start, end;
|
||||
char *homedir, *temp;
|
||||
@@ -200,7 +193,7 @@ rl_tilde_expand (ignore, key)
|
||||
}
|
||||
else if (start >= 0 && rl_line_buffer[start] != '~')
|
||||
{
|
||||
for (; !whitespace (rl_line_buffer[start]) && start >= 0; start--)
|
||||
for (; start >= 0 && !whitespace (rl_line_buffer[start]); start--)
|
||||
;
|
||||
start++;
|
||||
}
|
||||
@@ -324,8 +317,7 @@ _rl_errmsg (format, arg1, arg2)
|
||||
/* Determine if s2 occurs in s1. If so, return a pointer to the
|
||||
match in s1. The compare is case insensitive. */
|
||||
char *
|
||||
_rl_strindex (s1, s2)
|
||||
register const char *s1, *s2;
|
||||
_rl_strindex (const char *s1, const char *s2)
|
||||
{
|
||||
register int i, l, len;
|
||||
|
||||
@@ -339,8 +331,7 @@ _rl_strindex (s1, s2)
|
||||
/* Find the first occurrence in STRING1 of any character from STRING2.
|
||||
Return a pointer to the character in STRING1. */
|
||||
char *
|
||||
_rl_strpbrk (string1, string2)
|
||||
const char *string1, *string2;
|
||||
_rl_strpbrk (const char *string1, const char *string2)
|
||||
{
|
||||
register const char *scan;
|
||||
#if defined (HANDLE_MULTIBYTE)
|
||||
@@ -374,10 +365,7 @@ _rl_strpbrk (string1, string2)
|
||||
/* Compare at most COUNT characters from string1 to string2. Case
|
||||
doesn't matter (strncasecmp). */
|
||||
int
|
||||
_rl_strnicmp (string1, string2, count)
|
||||
const char *string1;
|
||||
const char *string2;
|
||||
int count;
|
||||
_rl_strnicmp (const char *string1, const char *string2, int count)
|
||||
{
|
||||
register const char *s1;
|
||||
register const char *s2;
|
||||
@@ -404,9 +392,7 @@ _rl_strnicmp (string1, string2, count)
|
||||
|
||||
/* strcmp (), but caseless (strcasecmp). */
|
||||
int
|
||||
_rl_stricmp (string1, string2)
|
||||
const char *string1;
|
||||
const char *string2;
|
||||
_rl_stricmp (const char *string1, const char *string2)
|
||||
{
|
||||
register const char *s1;
|
||||
register const char *s2;
|
||||
@@ -431,8 +417,7 @@ _rl_stricmp (string1, string2)
|
||||
|
||||
/* Stupid comparison routine for qsort () ing strings. */
|
||||
int
|
||||
_rl_qsort_string_compare (s1, s2)
|
||||
char **s1, **s2;
|
||||
_rl_qsort_string_compare (char **s1, char **s2)
|
||||
{
|
||||
#if defined (HAVE_STRCOLL)
|
||||
return (strcoll (*s1, *s2));
|
||||
@@ -448,7 +433,7 @@ _rl_qsort_string_compare (s1, s2)
|
||||
}
|
||||
|
||||
/* Function equivalents for the macros defined in chardefs.h. */
|
||||
#define FUNCTION_FOR_MACRO(f) int (f) (c) int c; { return f (c); }
|
||||
#define FUNCTION_FOR_MACRO(f) int (f) (int c) { return f (c); }
|
||||
|
||||
FUNCTION_FOR_MACRO (_rl_digit_p)
|
||||
FUNCTION_FOR_MACRO (_rl_digit_value)
|
||||
@@ -461,8 +446,7 @@ FUNCTION_FOR_MACRO (_rl_uppercase_p)
|
||||
/* A convenience function, to force memory deallocation to be performed
|
||||
by readline. DLLs on Windows apparently require this. */
|
||||
void
|
||||
rl_free (mem)
|
||||
void *mem;
|
||||
rl_free (void *mem)
|
||||
{
|
||||
if (mem)
|
||||
free (mem);
|
||||
@@ -472,8 +456,7 @@ rl_free (mem)
|
||||
all `public' readline header files. */
|
||||
#undef _rl_savestring
|
||||
char *
|
||||
_rl_savestring (s)
|
||||
const char *s;
|
||||
_rl_savestring (const char *s)
|
||||
{
|
||||
return (strcpy ((char *)xmalloc (1 + (int)strlen (s)), (s)));
|
||||
}
|
||||
@@ -512,7 +495,7 @@ _rl_trace (va_alist)
|
||||
}
|
||||
|
||||
int
|
||||
_rl_tropen ()
|
||||
_rl_tropen (void)
|
||||
{
|
||||
char fnbuf[128], *x;
|
||||
|
||||
@@ -521,7 +504,7 @@ _rl_tropen ()
|
||||
#if defined (_WIN32) && !defined (__CYGWIN__)
|
||||
/* Windows doesn't have /var/tmp, so open the trace file in the
|
||||
user's temporary directory instead. */
|
||||
sprintf (fnbuf, "%s/rltrace.%ld",
|
||||
snprintf (fnbuf, sizeof (fnbuf), "%s/rltrace.%ld",
|
||||
(sh_get_env_value ("TEMP")
|
||||
? sh_get_env_value ("TEMP")
|
||||
: "."),
|
||||
@@ -535,7 +518,7 @@ _rl_tropen ()
|
||||
}
|
||||
|
||||
int
|
||||
_rl_trclose ()
|
||||
_rl_trclose (void)
|
||||
{
|
||||
int r;
|
||||
|
||||
@@ -545,8 +528,7 @@ _rl_trclose ()
|
||||
}
|
||||
|
||||
void
|
||||
_rl_settracefp (fp)
|
||||
FILE *fp;
|
||||
_rl_settracefp (FILE *fp)
|
||||
{
|
||||
_rl_tracefp = fp;
|
||||
}
|
||||
@@ -562,8 +544,7 @@ _rl_settracefp (fp)
|
||||
|
||||
/* Report STRING to the audit system. */
|
||||
void
|
||||
_rl_audit_tty (string)
|
||||
char *string;
|
||||
_rl_audit_tty (char *string)
|
||||
{
|
||||
struct audit_message req;
|
||||
struct sockaddr_nl addr;
|
||||
|
||||
Reference in New Issue
Block a user