4a11f20659
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".
307 lines
7.3 KiB
C
307 lines
7.3 KiB
C
/* macro.c -- keyboard macros for readline. */
|
|
|
|
/* Copyright (C) 1994-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> /* for _POSIX_VERSION */
|
|
#endif /* HAVE_UNISTD_H */
|
|
|
|
#if defined (HAVE_STDLIB_H)
|
|
# include <stdlib.h>
|
|
#else
|
|
# include "ansi_stdlib.h"
|
|
#endif /* HAVE_STDLIB_H */
|
|
|
|
#include <stdio.h>
|
|
|
|
/* System-specific feature definitions and include files. */
|
|
#include "rldefs.h"
|
|
|
|
/* Some standard library routines. */
|
|
#include "readline.h"
|
|
#include "history.h"
|
|
|
|
#include "rlprivate.h"
|
|
#include "xmalloc.h"
|
|
|
|
/* **************************************************************** */
|
|
/* */
|
|
/* Hacking Keyboard Macros */
|
|
/* */
|
|
/* **************************************************************** */
|
|
|
|
/* The currently executing macro string. If this is non-zero,
|
|
then it is a malloc ()'ed string where input is coming from. */
|
|
char *rl_executing_macro = (char *)NULL;
|
|
|
|
/* The offset in the above string to the next character to be read. */
|
|
static int executing_macro_index;
|
|
|
|
/* The current macro string being built. Characters get stuffed
|
|
in here by add_macro_char (). */
|
|
static char *current_macro = (char *)NULL;
|
|
|
|
/* The size of the buffer allocated to current_macro. */
|
|
static int current_macro_size;
|
|
|
|
/* The index at which characters are being added to current_macro. */
|
|
static int current_macro_index;
|
|
|
|
/* A structure used to save nested macro strings.
|
|
It is a linked list of string/index for each saved macro. */
|
|
struct saved_macro {
|
|
struct saved_macro *next;
|
|
char *string;
|
|
int sindex;
|
|
};
|
|
|
|
/* The list of saved macros. */
|
|
static struct saved_macro *macro_list = (struct saved_macro *)NULL;
|
|
|
|
/* Set up to read subsequent input from STRING.
|
|
STRING is free ()'ed when we are done with it. */
|
|
void
|
|
_rl_with_macro_input (string)
|
|
char *string;
|
|
{
|
|
_rl_push_executing_macro ();
|
|
rl_executing_macro = string;
|
|
executing_macro_index = 0;
|
|
RL_SETSTATE(RL_STATE_MACROINPUT);
|
|
}
|
|
|
|
/* Return the next character available from a macro, or 0 if
|
|
there are no macro characters. */
|
|
int
|
|
_rl_next_macro_key ()
|
|
{
|
|
int c;
|
|
|
|
if (rl_executing_macro == 0)
|
|
return (0);
|
|
|
|
if (rl_executing_macro[executing_macro_index] == 0)
|
|
{
|
|
_rl_pop_executing_macro ();
|
|
return (_rl_next_macro_key ());
|
|
}
|
|
|
|
#if defined (READLINE_CALLBACKS)
|
|
c = rl_executing_macro[executing_macro_index++];
|
|
if (RL_ISSTATE (RL_STATE_CALLBACK) && RL_ISSTATE (RL_STATE_READCMD|RL_STATE_MOREINPUT) && rl_executing_macro[executing_macro_index] == 0)
|
|
_rl_pop_executing_macro ();
|
|
return c;
|
|
#else
|
|
return (rl_executing_macro[executing_macro_index++]);
|
|
#endif
|
|
}
|
|
|
|
int
|
|
_rl_prev_macro_key ()
|
|
{
|
|
if (rl_executing_macro == 0)
|
|
return (0);
|
|
|
|
if (executing_macro_index == 0)
|
|
return (0);
|
|
|
|
executing_macro_index--;
|
|
return (rl_executing_macro[executing_macro_index]);
|
|
}
|
|
|
|
/* Save the currently executing macro on a stack of saved macros. */
|
|
void
|
|
_rl_push_executing_macro ()
|
|
{
|
|
struct saved_macro *saver;
|
|
|
|
saver = (struct saved_macro *)xmalloc (sizeof (struct saved_macro));
|
|
saver->next = macro_list;
|
|
saver->sindex = executing_macro_index;
|
|
saver->string = rl_executing_macro;
|
|
|
|
macro_list = saver;
|
|
}
|
|
|
|
/* Discard the current macro, replacing it with the one
|
|
on the top of the stack of saved macros. */
|
|
void
|
|
_rl_pop_executing_macro ()
|
|
{
|
|
struct saved_macro *macro;
|
|
|
|
FREE (rl_executing_macro);
|
|
rl_executing_macro = (char *)NULL;
|
|
executing_macro_index = 0;
|
|
|
|
if (macro_list)
|
|
{
|
|
macro = macro_list;
|
|
rl_executing_macro = macro_list->string;
|
|
executing_macro_index = macro_list->sindex;
|
|
macro_list = macro_list->next;
|
|
xfree (macro);
|
|
}
|
|
|
|
if (rl_executing_macro == 0)
|
|
RL_UNSETSTATE(RL_STATE_MACROINPUT);
|
|
}
|
|
|
|
/* Add a character to the macro being built. */
|
|
void
|
|
_rl_add_macro_char (c)
|
|
int c;
|
|
{
|
|
if (current_macro_index + 1 >= current_macro_size)
|
|
{
|
|
if (current_macro == 0)
|
|
current_macro = (char *)xmalloc (current_macro_size = 25);
|
|
else
|
|
current_macro = (char *)xrealloc (current_macro, current_macro_size += 25);
|
|
}
|
|
|
|
current_macro[current_macro_index++] = c;
|
|
current_macro[current_macro_index] = '\0';
|
|
}
|
|
|
|
void
|
|
_rl_kill_kbd_macro ()
|
|
{
|
|
if (current_macro)
|
|
{
|
|
xfree (current_macro);
|
|
current_macro = (char *) NULL;
|
|
}
|
|
current_macro_size = current_macro_index = 0;
|
|
|
|
FREE (rl_executing_macro);
|
|
rl_executing_macro = (char *) NULL;
|
|
executing_macro_index = 0;
|
|
|
|
RL_UNSETSTATE(RL_STATE_MACRODEF);
|
|
}
|
|
|
|
/* Begin defining a keyboard macro.
|
|
Keystrokes are recorded as they are executed.
|
|
End the definition with rl_end_kbd_macro ().
|
|
If a numeric argument was explicitly typed, then append this
|
|
definition to the end of the existing macro, and start by
|
|
re-executing the existing macro. */
|
|
int
|
|
rl_start_kbd_macro (ignore1, ignore2)
|
|
int ignore1, ignore2;
|
|
{
|
|
if (RL_ISSTATE (RL_STATE_MACRODEF))
|
|
{
|
|
_rl_abort_internal ();
|
|
return 1;
|
|
}
|
|
|
|
if (rl_explicit_arg)
|
|
{
|
|
if (current_macro)
|
|
_rl_with_macro_input (savestring (current_macro));
|
|
}
|
|
else
|
|
current_macro_index = 0;
|
|
|
|
RL_SETSTATE(RL_STATE_MACRODEF);
|
|
return 0;
|
|
}
|
|
|
|
/* Stop defining a keyboard macro.
|
|
A numeric argument says to execute the macro right now,
|
|
that many times, counting the definition as the first time. */
|
|
int
|
|
rl_end_kbd_macro (count, ignore)
|
|
int count, ignore;
|
|
{
|
|
if (RL_ISSTATE (RL_STATE_MACRODEF) == 0)
|
|
{
|
|
_rl_abort_internal ();
|
|
return 1;
|
|
}
|
|
|
|
current_macro_index -= rl_key_sequence_length;
|
|
current_macro[current_macro_index] = '\0';
|
|
|
|
RL_UNSETSTATE(RL_STATE_MACRODEF);
|
|
|
|
return (rl_call_last_kbd_macro (--count, 0));
|
|
}
|
|
|
|
/* Execute the most recently defined keyboard macro.
|
|
COUNT says how many times to execute it. */
|
|
int
|
|
rl_call_last_kbd_macro (count, ignore)
|
|
int count, ignore;
|
|
{
|
|
if (current_macro == 0)
|
|
_rl_abort_internal ();
|
|
|
|
if (RL_ISSTATE (RL_STATE_MACRODEF))
|
|
{
|
|
rl_ding (); /* no recursive macros */
|
|
current_macro[--current_macro_index] = '\0'; /* erase this char */
|
|
return 0;
|
|
}
|
|
|
|
while (count--)
|
|
_rl_with_macro_input (savestring (current_macro));
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
rl_print_last_kbd_macro (count, ignore)
|
|
int count, ignore;
|
|
{
|
|
char *m;
|
|
|
|
if (current_macro == 0)
|
|
{
|
|
rl_ding ();
|
|
return 0;
|
|
}
|
|
m = _rl_untranslate_macro_value (current_macro, 1);
|
|
rl_crlf ();
|
|
printf ("%s", m);
|
|
fflush (stdout);
|
|
rl_crlf ();
|
|
FREE (m);
|
|
rl_forced_update_display ();
|
|
rl_display_fixed = 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
rl_push_macro_input (macro)
|
|
char *macro;
|
|
{
|
|
_rl_with_macro_input (macro);
|
|
}
|