diff options
| author | Pedro Alves <palves@redhat.com> | 2016-06-21 01:11:46 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-06-21 01:11:46 +0100 |
| commit | f38d3ad186f1820596743a04b7394b0749942501 (patch) | |
| tree | ce355366594f63fa67ffa6354a9f37602e6a5865 /gdb/top.h | |
| parent | 7c36c34e4c5c9438f17373a72773d741a17dc7b3 (diff) | |
| download | binutils-gdb-f38d3ad186f1820596743a04b7394b0749942501.tar.gz | |
Make instream be per UI
gdb/ChangeLog:
2016-06-21 Pedro Alves <palves@redhat.com>
* 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) <instream>: New field.
(instream): Delete declaration.
(quit): Adjust to per-UI instream.
gdb/testsuite/ChangeLog:
2016-06-21 Pedro Alves <palves@redhat.com>
* gdb.gdb/selftest.exp (do_steps_and_nexts): Add new regexp.
Diffstat (limited to 'gdb/top.h')
| -rw-r--r-- | gdb/top.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gdb/top.h b/gdb/top.h index a76abaf2b3c..1e00acb7437 100644 --- a/gdb/top.h +++ b/gdb/top.h @@ -68,6 +68,12 @@ struct ui "start" -ex "next"') are processed. */ int async; + /* stdio stream that command input is being read from. Set to stdin + normally. Set by source_command to the file we are sourcing. + Set to NULL if we are executing a user-defined command or + interacting via a GUI. */ + FILE *instream; + /* The fields below that start with "m_" are "private". They're meant to be accessed through wrapper macros that make them look like globals. */ @@ -121,7 +127,6 @@ extern void switch_thru_all_uis_next (struct switch_thru_all_uis *state); /* From top.c. */ extern char *saved_command_line; -extern FILE *instream; extern int in_user_command; extern int confirm; extern char gdb_dirbuf[1024]; |