OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add function execute_command_to_ui_file 

2019-05-31  Philippe Waroquiers  <philippe.waroquiers@skynet.be>

	* gdbcmd.h (execute_command_to_ui_file): New declaration.
	top.c (execute_command_to_ui_file): New function, mostly a copy
	of execute_command_to_string.
	(execute_command_to_string): Implement by calling
	execute_command_to_ui_file.
This commit is contained in:
Philippe Waroquiers 2019-04-26 20:52:16 +02:00
parent 68bb5386b8
commit b8fd091888
3 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2019-05-31 Philippe Waroquiers <philippe.waroquiers@skynet.be>
* gdbcmd.h (execute_command_to_ui_file): New declaration.
top.c (execute_command_to_ui_file): New function, mostly a copy
of execute_command_to_string.
(execute_command_to_string): Implement by calling
execute_command_to_ui_file.
2019-05-31 Philippe Waroquiers <philippe.waroquiers@skynet.be>
* top.h (saved_command_line): Remove declaration.

2
gdb/gdbcmd.h
View File

@ -139,6 +139,8 @@ extern void execute_command (const char *, int);
as cli_styling. */
extern std::string execute_command_to_string (const char *p, int from_tty,
bool term_out);
extern void execute_command_to_ui_file (struct ui_file *file,
const char *p, int from_tty);
extern void print_command_line (struct command_line *, unsigned int,
struct ui_file *);

57
gdb/top.c
View File

@ -665,6 +665,38 @@ execute_command (const char *p, int from_tty)
cleanup_if_error.release ();
}
/* Run execute_command for P and FROM_TTY. Sends its output to FILE,
do not display it to the screen. BATCH_FLAG will be
temporarily set to true. */
void
execute_command_to_ui_file (struct ui_file *file, const char *p, int from_tty)
{
/* GDB_STDOUT should be better already restored during these
restoration callbacks. */
set_batch_flag_and_restore_page_info save_page_info;
scoped_restore save_async = make_scoped_restore (&current_ui->async, 0);
{
current_uiout->redirect (file);
ui_out_redirect_pop redirect_popper (current_uiout);
scoped_restore save_stdout
= make_scoped_restore (&gdb_stdout, file);
scoped_restore save_stderr
= make_scoped_restore (&gdb_stderr, file);
scoped_restore save_stdlog
= make_scoped_restore (&gdb_stdlog, file);
scoped_restore save_stdtarg
= make_scoped_restore (&gdb_stdtarg, file);
scoped_restore save_stdtargerr
= make_scoped_restore (&gdb_stdtargerr, file);
execute_command (p, from_tty);
}
}
/* Run execute_command for P and FROM_TTY. Capture its output into the
returned string, do not display it to the screen. BATCH_FLAG will be
temporarily set to true. */
@ -673,32 +705,9 @@ std::string
execute_command_to_string (const char *p, int from_tty,
bool term_out)
{
/* GDB_STDOUT should be better already restored during these
restoration callbacks. */
set_batch_flag_and_restore_page_info save_page_info;
scoped_restore save_async = make_scoped_restore (&current_ui->async, 0);
string_file str_file (term_out);
{
current_uiout->redirect (&str_file);
ui_out_redirect_pop redirect_popper (current_uiout);
scoped_restore save_stdout
= make_scoped_restore (&gdb_stdout, &str_file);
scoped_restore save_stderr
= make_scoped_restore (&gdb_stderr, &str_file);
scoped_restore save_stdlog
= make_scoped_restore (&gdb_stdlog, &str_file);
scoped_restore save_stdtarg
= make_scoped_restore (&gdb_stdtarg, &str_file);
scoped_restore save_stdtargerr
= make_scoped_restore (&gdb_stdtargerr, &str_file);
execute_command (p, from_tty);
}
execute_command_to_ui_file (&str_file, p, from_tty);
return std::move (str_file.string ());
}