mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-12 12:16:04 +08:00
6999161a2a
readline turns out to be a bit of a stumbling block for the project to
move gdbsupport (and then gdbserver) to the top-level.
The issue is that readline headers are intended to be included with
names like "readline/readline.h". To support this, gdb effectively
adds a -I option pointing to the top-level source directory -- but,
importantly, this option is not used when the system readline is used.
For gdbsupport, a -I option like this would always be needed, but that
in turn would break the system readline case. This was PR build/17077,
fixed in commit a8a5dbcab8.
Previously, we had discussed this on the gdb-patches list in terms of
removing readline from the tree
https://sourceware.org/ml/gdb-patches/2019-09/msg00317.html
However, Eli expressed some concerns, and Joel did as well (off-list).
Given those concerns, and the fact that a patch-free local readline is
relatively new in gdb (it was locally patched for years), I changed my
mind and decided to handle this situation by moving the readline
sources down a level.
That is, upstream readline is now in readline/readline, and the
top-level readline directory just contains the minimal configury
needed to build that.
This fixes the problem because, when gdb unconditionally adds a
-I$(top_srcdir), this will not find readline headers. A separate -I
will be needed instead, which is exactly what's needed for
--with-system-readline.
gdb/ChangeLog
2019-10-23 Tom Tromey <tom@tromey.com>
* Makefile.in (READLINE_DIR): Update.
gdb/doc/ChangeLog
2019-10-23 Tom Tromey <tom@tromey.com>
* Makefile.in (READLINE_DIR): Update.
readline/ChangeLog
2019-10-23 Tom Tromey <tom@tromey.com>
Move old contents to readline/ subdirectory.
* aclocal.m4, configure, configure.ac, .gitignore, Makefile.am,
Makefile.in, README: New files.
Change-Id: Ice156a2ee09ea68722b48f64d97146d7428ea9e4
81 lines
3.0 KiB
C
81 lines
3.0 KiB
C
/* tilde.h: Externally available variables and function in libtilde.a. */
|
|
|
|
/* Copyright (C) 1992-2009 Free Software Foundation, Inc.
|
|
|
|
This file contains the Readline Library (Readline), a set of
|
|
routines for providing Emacs style line input to programs that ask
|
|
for it.
|
|
|
|
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 (_TILDE_H_)
|
|
# define _TILDE_H_
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* A function can be defined using prototypes and compile on both ANSI C
|
|
and traditional C compilers with something like this:
|
|
extern char *func PARAMS((char *, char *, int)); */
|
|
|
|
#if !defined (PARAMS)
|
|
# if defined (__STDC__) || defined (__GNUC__) || defined (__cplusplus)
|
|
# define PARAMS(protos) protos
|
|
# else
|
|
# define PARAMS(protos) ()
|
|
# endif
|
|
#endif
|
|
|
|
typedef char *tilde_hook_func_t PARAMS((char *));
|
|
|
|
/* If non-null, this contains the address of a function that the application
|
|
wants called before trying the standard tilde expansions. The function
|
|
is called with the text sans tilde, and returns a malloc()'ed string
|
|
which is the expansion, or a NULL pointer if the expansion fails. */
|
|
extern tilde_hook_func_t *tilde_expansion_preexpansion_hook;
|
|
|
|
/* If non-null, this contains the address of a function to call if the
|
|
standard meaning for expanding a tilde fails. The function is called
|
|
with the text (sans tilde, as in "foo"), and returns a malloc()'ed string
|
|
which is the expansion, or a NULL pointer if there is no expansion. */
|
|
extern tilde_hook_func_t *tilde_expansion_failure_hook;
|
|
|
|
/* When non-null, this is a NULL terminated array of strings which
|
|
are duplicates for a tilde prefix. Bash uses this to expand
|
|
`=~' and `:~'. */
|
|
extern char **tilde_additional_prefixes;
|
|
|
|
/* When non-null, this is a NULL terminated array of strings which match
|
|
the end of a username, instead of just "/". Bash sets this to
|
|
`:' and `=~'. */
|
|
extern char **tilde_additional_suffixes;
|
|
|
|
/* Return a new string which is the result of tilde expanding STRING. */
|
|
extern char *tilde_expand PARAMS((const char *));
|
|
|
|
/* Do the work of tilde expansion on FILENAME. FILENAME starts with a
|
|
tilde. If there is no expansion, call tilde_expansion_failure_hook. */
|
|
extern char *tilde_expand_word PARAMS((const char *));
|
|
|
|
/* Find the portion of the string beginning with ~ that should be expanded. */
|
|
extern char *tilde_find_word PARAMS((const char *, int, int *));
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* _TILDE_H_ */
|