forked from Imagelibrary/binutils-gdb
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
159 lines
3.1 KiB
C
159 lines
3.1 KiB
C
/*
|
|
* rl - command-line interface to read a line from the standard input
|
|
* (or another fd) using readline.
|
|
*
|
|
* usage: rl [-p prompt] [-u unit] [-d default] [-n nchars]
|
|
*/
|
|
|
|
/* Copyright (C) 1987-2009 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.
|
|
|
|
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 (HAVE_CONFIG_H)
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
# include <stdlib.h>
|
|
#else
|
|
extern void exit();
|
|
#endif
|
|
|
|
#if defined (READLINE_LIBRARY)
|
|
# include "posixstat.h"
|
|
# include "readline.h"
|
|
# include "history.h"
|
|
#else
|
|
# include <sys/stat.h>
|
|
# include <readline/readline.h>
|
|
# include <readline/history.h>
|
|
#endif
|
|
|
|
extern int optind;
|
|
extern char *optarg;
|
|
|
|
#if !defined (strchr) && !defined (__STDC__)
|
|
extern char *strrchr();
|
|
#endif
|
|
|
|
static char *progname;
|
|
static char *deftext;
|
|
|
|
static int
|
|
set_deftext ()
|
|
{
|
|
if (deftext)
|
|
{
|
|
rl_insert_text (deftext);
|
|
deftext = (char *)NULL;
|
|
rl_startup_hook = (rl_hook_func_t *)NULL;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
usage()
|
|
{
|
|
fprintf (stderr, "%s: usage: %s [-p prompt] [-u unit] [-d default] [-n nchars]\n",
|
|
progname, progname);
|
|
}
|
|
|
|
int
|
|
main (argc, argv)
|
|
int argc;
|
|
char **argv;
|
|
{
|
|
char *temp, *prompt;
|
|
struct stat sb;
|
|
int opt, fd, nch;
|
|
FILE *ifp;
|
|
|
|
progname = strrchr(argv[0], '/');
|
|
if (progname == 0)
|
|
progname = argv[0];
|
|
else
|
|
progname++;
|
|
|
|
/* defaults */
|
|
prompt = "readline$ ";
|
|
fd = nch = 0;
|
|
deftext = (char *)0;
|
|
|
|
while ((opt = getopt(argc, argv, "p:u:d:n:")) != EOF)
|
|
{
|
|
switch (opt)
|
|
{
|
|
case 'p':
|
|
prompt = optarg;
|
|
break;
|
|
case 'u':
|
|
fd = atoi(optarg);
|
|
if (fd < 0)
|
|
{
|
|
fprintf (stderr, "%s: bad file descriptor `%s'\n", progname, optarg);
|
|
exit (2);
|
|
}
|
|
break;
|
|
case 'd':
|
|
deftext = optarg;
|
|
break;
|
|
case 'n':
|
|
nch = atoi(optarg);
|
|
if (nch < 0)
|
|
{
|
|
fprintf (stderr, "%s: bad value for -n: `%s'\n", progname, optarg);
|
|
exit (2);
|
|
}
|
|
break;
|
|
default:
|
|
usage ();
|
|
exit (2);
|
|
}
|
|
}
|
|
|
|
if (fd != 0)
|
|
{
|
|
if (fstat (fd, &sb) < 0)
|
|
{
|
|
fprintf (stderr, "%s: %d: bad file descriptor\n", progname, fd);
|
|
exit (1);
|
|
}
|
|
ifp = fdopen (fd, "r");
|
|
rl_instream = ifp;
|
|
}
|
|
|
|
if (deftext && *deftext)
|
|
rl_startup_hook = set_deftext;
|
|
|
|
if (nch > 0)
|
|
rl_num_chars_to_read = nch;
|
|
|
|
temp = readline (prompt);
|
|
|
|
/* Test for EOF. */
|
|
if (temp == 0)
|
|
exit (1);
|
|
|
|
printf ("%s\n", temp);
|
|
exit (0);
|
|
}
|