From f38d3ad186f1820596743a04b7394b0749942501 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 21 Jun 2016 01:11:46 +0100 Subject: Make instream be per UI gdb/ChangeLog: 2016-06-21 Pedro Alves * cli/cli-script.c (execute_user_command, read_next_line) (read_next_line): Adjust to per-UI instream. * event-top.c (stdin_event_handler, command_handler) (handle_line_of_input, command_line_handler) (gdb_readline_no_editing_callback, async_sigterm_handler) (gdb_setup_readline): Likewise. * inflow.c: Include top.h. (gdb_has_a_terminal, child_terminal_init_with_pgrp) (gdb_save_tty_state, child_terminal_inferior) (child_terminal_ours_1, copy_terminal_info): Use the main UI. (initialize_stdin_serial): Adjust to per-UI instream. * main.c (captured_command_loop, captured_main): Adjust to per-UI instream. * mi/mi-interp.c (mi_execute_command_wrapper): Likewise. * python/python.c (python_interactive_command): Likewise. * terminal.h (struct ui): Forward declare. (initialize_stdin_serial): Add struct ui parameter. * top.c (instream): Delete. (do_restore_instream_cleanup, read_command_file, dont_repeat) (gdb_readline_no_editing, command_line_input) (input_from_terminal_p, gdb_init): Adjust to per-UI instream. * top.h (struct ui) : New field. (instream): Delete declaration. (quit): Adjust to per-UI instream. gdb/testsuite/ChangeLog: 2016-06-21 Pedro Alves * gdb.gdb/selftest.exp (do_steps_and_nexts): Add new regexp. --- gdb/python/python.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gdb/python/python.c') diff --git a/gdb/python/python.c b/gdb/python/python.c index 8a96828..c177efe 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -318,6 +318,7 @@ eval_python_command (const char *command) static void python_interactive_command (char *arg, int from_tty) { + struct ui *ui = current_ui; struct cleanup *cleanup; int err; @@ -341,7 +342,7 @@ python_interactive_command (char *arg, int from_tty) } else { - err = PyRun_InteractiveLoop (instream, ""); + err = PyRun_InteractiveLoop (ui->instream, ""); dont_repeat (); } -- cgit v1.1