mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2026-08-27 00:26:02 -04:00
This patch syncs our upstream copy of readline from version 6.2 to the latest version, 7.0 alpha (released July 10 2015). I essentially copied what was done the last time readline was synced, when Jan updated to readline 6.2 in 2011: http://sourceware.org/ml/gdb-patches/2011-05/msg00003.html Procedure: 1. I extracted the readline-7.0-alpha tarball on top of readline/. 2. I deleted all the new files under doc/ that were deliberately omitted before. 3. I regenerated readline/configure and readline/examples/rlfe/configure using autoconf 2.64. No other configure files need regenerating. 4. I updated the function gdb_printable_part in completer.c with a trivial change made to the readline function it is based off of, printable_part in readline/complete.c. There is more work to be done in completer.c to sync it with readline/complete.c, but it is non-trivial and should probably be done separately anyway. Local patches that had to be reapplied: None. readline 7.0 alpha contains all of our local readline patches. New files in readline/: colors.{c,h} examples/{hist_erasedups,hist_purgecmd,rl-callbacktest,rlbasic}.c parse-colors.{c,h} readline.pc.in configure.ac Deleted files in readline/: configure.in Regressions: After the sync there is one testsuite regression, the test "signal SIGINT" in gdb.gdb/selftest.exp which now FAILs. Previously, the readline 6.2 SIGINT handler would temporarily reinstall the underlying application's SIGINT handler and immediately re-raise SIGINT so that the orginal handler gets invoked. But now (since readline 6.3) its SIGINT handler does not re-raise SIGINT or directly invoke the original handler; it now sets a flag marking that SIGINT was raised, and waits until readline explicitly has control to call the application's SIGINT handler. Anyway, because SIGINT is no longer re-raised from within readline's SIGINT handler, doing "signal SIGINT" with a stopped inferior gdb process will no longer resume and then immediately stop the process (since there is no 2nd SIGINT to immediately catch). Instead, the inferior gdb process will now just print "Quit" and continue to run. So with this commit, this particular test case is adjusted to reflect this change in behavior (we now have to send a 2nd SIGINT manually to stop it). Aside from this one testsuite regression, I personally noticed no regression in user-visible behavior. Though I only tested on x86_64 and on i686 Debian Stretch. Getting this kind of change in at the start of the GDB 7.11 development cycle will allow us to get a lot of passive testing from developers and from bleeding-edge users. readline/ChangeLog.gdb: Import readline 7.0 alpha * configure: Regenerate. * examples/rlfe/configure: Regenerate. gdb/ChangeLog: * completer.c (gdb_printable_part): Sync with readline function it is based off of. gdb/testsuite/ChangeLog: * gdb.gdb/selftest.exp (test_with_self): Update test to now expect the GDB inferior to no longer immediately stop after being resumed with "signal SIGINT".
218 lines
4.7 KiB
C
218 lines
4.7 KiB
C
/* shell.c -- readline utility functions that are normally provided by
|
|
bash when readline is linked as part of the shell. */
|
|
|
|
/* Copyright (C) 1997-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/>.
|
|
*/
|
|
|
|
#define READLINE_LIBRARY
|
|
|
|
#if defined (HAVE_CONFIG_H)
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <sys/types.h>
|
|
|
|
#if defined (HAVE_UNISTD_H)
|
|
# include <unistd.h>
|
|
#endif /* HAVE_UNISTD_H */
|
|
|
|
#if defined (HAVE_STDLIB_H)
|
|
# include <stdlib.h>
|
|
#else
|
|
# include "ansi_stdlib.h"
|
|
#endif /* HAVE_STDLIB_H */
|
|
|
|
#if defined (HAVE_STRING_H)
|
|
# include <string.h>
|
|
#else
|
|
# include <strings.h>
|
|
#endif /* !HAVE_STRING_H */
|
|
|
|
#if defined (HAVE_LIMITS_H)
|
|
# include <limits.h>
|
|
#endif
|
|
|
|
#if defined (HAVE_FCNTL_H)
|
|
#include <fcntl.h>
|
|
#endif
|
|
#if defined (HAVE_PWD_H)
|
|
#include <pwd.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "rlstdc.h"
|
|
#include "rlshell.h"
|
|
#include "rldefs.h"
|
|
|
|
#include "xmalloc.h"
|
|
|
|
#if defined (HAVE_GETPWUID) && !defined (HAVE_GETPW_DECLS)
|
|
extern struct passwd *getpwuid PARAMS((uid_t));
|
|
#endif /* HAVE_GETPWUID && !HAVE_GETPW_DECLS */
|
|
|
|
#ifndef NULL
|
|
# define NULL 0
|
|
#endif
|
|
|
|
#ifndef CHAR_BIT
|
|
# define CHAR_BIT 8
|
|
#endif
|
|
|
|
/* Nonzero if the integer type T is signed. */
|
|
#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
|
|
|
|
/* Bound on length of the string representing an integer value of type T.
|
|
Subtract one for the sign bit if T is signed;
|
|
302 / 1000 is log10 (2) rounded up;
|
|
add one for integer division truncation;
|
|
add one more for a minus sign if t is signed. */
|
|
#define INT_STRLEN_BOUND(t) \
|
|
((sizeof (t) * CHAR_BIT - TYPE_SIGNED (t)) * 302 / 1000 \
|
|
+ 1 + TYPE_SIGNED (t))
|
|
|
|
/* All of these functions are resolved from bash if we are linking readline
|
|
as part of bash. */
|
|
|
|
/* Does shell-like quoting using single quotes. */
|
|
char *
|
|
sh_single_quote (string)
|
|
char *string;
|
|
{
|
|
register int c;
|
|
char *result, *r, *s;
|
|
|
|
result = (char *)xmalloc (3 + (4 * strlen (string)));
|
|
r = result;
|
|
*r++ = '\'';
|
|
|
|
for (s = string; s && (c = *s); s++)
|
|
{
|
|
*r++ = c;
|
|
|
|
if (c == '\'')
|
|
{
|
|
*r++ = '\\'; /* insert escaped single quote */
|
|
*r++ = '\'';
|
|
*r++ = '\''; /* start new quoted string */
|
|
}
|
|
}
|
|
|
|
*r++ = '\'';
|
|
*r = '\0';
|
|
|
|
return (result);
|
|
}
|
|
|
|
/* Set the environment variables LINES and COLUMNS to lines and cols,
|
|
respectively. */
|
|
static char setenv_buf[INT_STRLEN_BOUND (int) + 1];
|
|
static char putenv_buf1[INT_STRLEN_BOUND (int) + 6 + 1]; /* sizeof("LINES=") == 6 */
|
|
static char putenv_buf2[INT_STRLEN_BOUND (int) + 8 + 1]; /* sizeof("COLUMNS=") == 8 */
|
|
|
|
void
|
|
sh_set_lines_and_columns (lines, cols)
|
|
int lines, cols;
|
|
{
|
|
#if defined (HAVE_SETENV)
|
|
sprintf (setenv_buf, "%d", lines);
|
|
setenv ("LINES", setenv_buf, 1);
|
|
|
|
sprintf (setenv_buf, "%d", cols);
|
|
setenv ("COLUMNS", setenv_buf, 1);
|
|
#else /* !HAVE_SETENV */
|
|
# if defined (HAVE_PUTENV)
|
|
sprintf (putenv_buf1, "LINES=%d", lines);
|
|
putenv (putenv_buf1);
|
|
|
|
sprintf (putenv_buf2, "COLUMNS=%d", cols);
|
|
putenv (putenv_buf2);
|
|
# endif /* HAVE_PUTENV */
|
|
#endif /* !HAVE_SETENV */
|
|
}
|
|
|
|
char *
|
|
sh_get_env_value (varname)
|
|
const char *varname;
|
|
{
|
|
return ((char *)getenv (varname));
|
|
}
|
|
|
|
char *
|
|
sh_get_home_dir ()
|
|
{
|
|
static char *home_dir = (char *)NULL;
|
|
struct passwd *entry;
|
|
|
|
if (home_dir)
|
|
return (home_dir);
|
|
|
|
home_dir = (char *)NULL;
|
|
#if defined (HAVE_GETPWUID)
|
|
# if defined (__TANDEM)
|
|
entry = getpwnam (getlogin ());
|
|
# else
|
|
entry = getpwuid (getuid ());
|
|
# endif
|
|
if (entry)
|
|
home_dir = savestring (entry->pw_dir);
|
|
#endif
|
|
|
|
#if defined (HAVE_GETPWENT)
|
|
endpwent (); /* some systems need this */
|
|
#endif
|
|
|
|
return (home_dir);
|
|
}
|
|
|
|
#if !defined (O_NDELAY)
|
|
# if defined (FNDELAY)
|
|
# define O_NDELAY FNDELAY
|
|
# endif
|
|
#endif
|
|
|
|
int
|
|
sh_unset_nodelay_mode (fd)
|
|
int fd;
|
|
{
|
|
#if defined (HAVE_FCNTL)
|
|
int flags, bflags;
|
|
|
|
if ((flags = fcntl (fd, F_GETFL, 0)) < 0)
|
|
return -1;
|
|
|
|
bflags = 0;
|
|
|
|
#ifdef O_NONBLOCK
|
|
bflags |= O_NONBLOCK;
|
|
#endif
|
|
|
|
#ifdef O_NDELAY
|
|
bflags |= O_NDELAY;
|
|
#endif
|
|
|
|
if (flags & bflags)
|
|
{
|
|
flags &= ~bflags;
|
|
return (fcntl (fd, F_SETFL, flags));
|
|
}
|
|
#endif
|
|
|
|
return 0;
|
|
}
|