FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify execute_control_commands_to_string

Browse source 
execute_control_commands_to_string can be rewritten in terms of
execute_fn_to_string, which consolidates some knowledge about which
streams to redirect.

Regression tested on x86-64 Fedora 34.
This commit is contained in:
Tom Tromey 2021-12-24 22:05:38 -07:00
parent ffcc2b69d1
commit 63a8c05f09
1 changed files with 7 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

30
gdb/cli/cli-script.c
View file

@ -29,6 +29,7 @@
#include "cli/cli-decode.h"
#include "cli/cli-script.h"
#include "cli/cli-style.h"
#include "gdbcmd.h"
#include "extension.h"
#include "interps.h"
@ -423,31 +424,14 @@ std::string
execute_control_commands_to_string (struct command_line *commands,
int from_tty)
{
/* GDB_STDOUT should be better already restored during these
restoration callbacks. */
set_batch_flag_and_restore_page_info save_page_info;
std::string result;
string_file str_file;
execute_fn_to_string (result, [&] ()
{
execute_control_commands (commands, from_tty);
}, false);
{
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_control_commands (commands, from_tty);
}
return std::move (str_file.string ());
return result;
}
void