mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
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".
338 lines
6.4 KiB
C
338 lines
6.4 KiB
C
/*
|
|
*
|
|
* Another test harness for the readline callback interface.
|
|
*
|
|
* Author: Bob Rossi <bob@brasko.net>
|
|
*/
|
|
|
|
#if defined (HAVE_CONFIG_H)
|
|
#include <config.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
#include <errno.h>
|
|
#include <curses.h>
|
|
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
|
|
#include <signal.h>
|
|
|
|
#if 1 /* LINUX */
|
|
#include <pty.h>
|
|
#else
|
|
#include <util.h>
|
|
#endif
|
|
|
|
#ifdef READLINE_LIBRARY
|
|
# include "readline.h"
|
|
#else
|
|
# include <readline/readline.h>
|
|
#endif
|
|
|
|
/**
|
|
* Master/Slave PTY used to keep readline off of stdin/stdout.
|
|
*/
|
|
static int masterfd = -1;
|
|
static int slavefd;
|
|
|
|
void
|
|
sigint (s)
|
|
int s;
|
|
{
|
|
tty_reset (STDIN_FILENO);
|
|
close (masterfd);
|
|
close (slavefd);
|
|
printf ("\n");
|
|
exit (0);
|
|
}
|
|
|
|
static int
|
|
user_input()
|
|
{
|
|
int size;
|
|
const int MAX = 1024;
|
|
char *buf = (char *)malloc(MAX+1);
|
|
|
|
size = read (STDIN_FILENO, buf, MAX);
|
|
if (size == -1)
|
|
return -1;
|
|
|
|
size = write (masterfd, buf, size);
|
|
if (size == -1)
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
readline_input()
|
|
{
|
|
const int MAX = 1024;
|
|
char *buf = (char *)malloc(MAX+1);
|
|
int size;
|
|
|
|
size = read (masterfd, buf, MAX);
|
|
if (size == -1)
|
|
{
|
|
free( buf );
|
|
buf = NULL;
|
|
return -1;
|
|
}
|
|
|
|
buf[size] = 0;
|
|
|
|
/* Display output from readline */
|
|
if ( size > 0 )
|
|
fprintf(stderr, "%s", buf);
|
|
|
|
free( buf );
|
|
buf = NULL;
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
rlctx_send_user_command(char *line)
|
|
{
|
|
/* This happens when rl_callback_read_char gets EOF */
|
|
if ( line == NULL )
|
|
return;
|
|
|
|
if (strcmp (line, "exit") == 0) {
|
|
tty_reset (STDIN_FILENO);
|
|
close (masterfd);
|
|
close (slavefd);
|
|
printf ("\n");
|
|
exit (0);
|
|
}
|
|
|
|
/* Don't add the enter command */
|
|
if ( line && *line != '\0' )
|
|
add_history(line);
|
|
}
|
|
|
|
static void
|
|
custom_deprep_term_function ()
|
|
{
|
|
}
|
|
|
|
static int
|
|
init_readline (int inputfd, int outputfd)
|
|
{
|
|
FILE *inputFILE, *outputFILE;
|
|
|
|
inputFILE = fdopen (inputfd, "r");
|
|
if (!inputFILE)
|
|
return -1;
|
|
|
|
outputFILE = fdopen (outputfd, "w");
|
|
if (!outputFILE)
|
|
return -1;
|
|
|
|
rl_instream = inputFILE;
|
|
rl_outstream = outputFILE;
|
|
|
|
/* Tell readline what the prompt is if it needs to put it back */
|
|
rl_callback_handler_install("(rltest): ", rlctx_send_user_command);
|
|
|
|
/* Set the terminal type to dumb so the output of readline can be
|
|
* understood by tgdb */
|
|
if ( rl_reset_terminal("dumb") == -1 )
|
|
return -1;
|
|
|
|
/* For some reason, readline can not deprep the terminal.
|
|
* However, it doesn't matter because no other application is working on
|
|
* the terminal besides readline */
|
|
rl_deprep_term_function = custom_deprep_term_function;
|
|
|
|
using_history();
|
|
read_history(".history");
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
main_loop(void)
|
|
{
|
|
fd_set rset;
|
|
int max;
|
|
|
|
max = (masterfd > STDIN_FILENO) ? masterfd : STDIN_FILENO;
|
|
max = (max > slavefd) ? max : slavefd;
|
|
|
|
for (;;)
|
|
{
|
|
/* Reset the fd_set, and watch for input from GDB or stdin */
|
|
FD_ZERO(&rset);
|
|
|
|
FD_SET(STDIN_FILENO, &rset);
|
|
FD_SET(slavefd, &rset);
|
|
FD_SET(masterfd, &rset);
|
|
|
|
/* Wait for input */
|
|
if (select(max + 1, &rset, NULL, NULL, NULL) == -1)
|
|
{
|
|
if (errno == EINTR)
|
|
continue;
|
|
else
|
|
return -1;
|
|
}
|
|
|
|
/* Input received through the pty: Handle it
|
|
* Wrote to masterfd, slave fd has that input, alert readline to read it.
|
|
*/
|
|
if (FD_ISSET(slavefd, &rset))
|
|
rl_callback_read_char();
|
|
|
|
/* Input received through the pty.
|
|
* Readline read from slavefd, and it wrote to the masterfd.
|
|
*/
|
|
if (FD_ISSET(masterfd, &rset))
|
|
if ( readline_input() == -1 )
|
|
return -1;
|
|
|
|
/* Input received: Handle it, write to masterfd (input to readline) */
|
|
if (FD_ISSET(STDIN_FILENO, &rset))
|
|
if ( user_input() == -1 )
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* The terminal attributes before calling tty_cbreak */
|
|
static struct termios save_termios;
|
|
static struct winsize size;
|
|
static enum { RESET, TCBREAK } ttystate = RESET;
|
|
|
|
/* tty_cbreak: Sets terminal to cbreak mode. Also known as noncanonical mode.
|
|
* 1. Signal handling is still turned on, so the user can still type those.
|
|
* 2. echo is off
|
|
* 3. Read in one char at a time.
|
|
*
|
|
* fd - The file descriptor of the terminal
|
|
*
|
|
* Returns: 0 on sucess, -1 on error
|
|
*/
|
|
int tty_cbreak(int fd){
|
|
struct termios buf;
|
|
int ttysavefd = -1;
|
|
|
|
if(tcgetattr(fd, &save_termios) < 0)
|
|
return -1;
|
|
|
|
buf = save_termios;
|
|
buf.c_lflag &= ~(ECHO | ICANON);
|
|
buf.c_iflag &= ~(ICRNL | INLCR);
|
|
buf.c_cc[VMIN] = 1;
|
|
buf.c_cc[VTIME] = 0;
|
|
|
|
#if defined (VLNEXT) && defined (_POSIX_VDISABLE)
|
|
buf.c_cc[VLNEXT] = _POSIX_VDISABLE;
|
|
#endif
|
|
|
|
#if defined (VDSUSP) && defined (_POSIX_VDISABLE)
|
|
buf.c_cc[VDSUSP] = _POSIX_VDISABLE;
|
|
#endif
|
|
|
|
/* enable flow control; only stty start char can restart output */
|
|
#if 0
|
|
buf.c_iflag |= (IXON|IXOFF);
|
|
#ifdef IXANY
|
|
buf.c_iflag &= ~IXANY;
|
|
#endif
|
|
#endif
|
|
|
|
/* disable flow control; let ^S and ^Q through to pty */
|
|
buf.c_iflag &= ~(IXON|IXOFF);
|
|
#ifdef IXANY
|
|
buf.c_iflag &= ~IXANY;
|
|
#endif
|
|
|
|
if(tcsetattr(fd, TCSAFLUSH, &buf) < 0)
|
|
return -1;
|
|
|
|
ttystate = TCBREAK;
|
|
ttysavefd = fd;
|
|
|
|
/* set size */
|
|
if(ioctl(fd, TIOCGWINSZ, (char *)&size) < 0)
|
|
return -1;
|
|
|
|
#ifdef DEBUG
|
|
err_msg("%d rows and %d cols\n", size.ws_row, size.ws_col);
|
|
#endif
|
|
|
|
return (0);
|
|
}
|
|
|
|
int
|
|
tty_off_xon_xoff (int fd)
|
|
{
|
|
struct termios buf;
|
|
int ttysavefd = -1;
|
|
|
|
if(tcgetattr(fd, &buf) < 0)
|
|
return -1;
|
|
|
|
buf.c_iflag &= ~(IXON|IXOFF);
|
|
|
|
if(tcsetattr(fd, TCSAFLUSH, &buf) < 0)
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* tty_reset: Sets the terminal attributes back to their previous state.
|
|
* PRE: tty_cbreak must have already been called.
|
|
*
|
|
* fd - The file descrioptor of the terminal to reset.
|
|
*
|
|
* Returns: 0 on success, -1 on error
|
|
*/
|
|
int tty_reset(int fd)
|
|
{
|
|
if(ttystate != TCBREAK)
|
|
return (0);
|
|
|
|
if(tcsetattr(fd, TCSAFLUSH, &save_termios) < 0)
|
|
return (-1);
|
|
|
|
ttystate = RESET;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
main()
|
|
{
|
|
int val;
|
|
val = openpty (&masterfd, &slavefd, NULL, NULL, NULL);
|
|
if (val == -1)
|
|
return -1;
|
|
|
|
val = tty_off_xon_xoff (masterfd);
|
|
if (val == -1)
|
|
return -1;
|
|
|
|
signal (SIGINT, sigint);
|
|
|
|
val = init_readline (slavefd, slavefd);
|
|
if (val == -1)
|
|
return -1;
|
|
|
|
val = tty_cbreak (STDIN_FILENO);
|
|
if (val == -1)
|
|
return -1;
|
|
|
|
val = main_loop ();
|
|
|
|
tty_reset (STDIN_FILENO);
|
|
|
|
if (val == -1)
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|