From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
To: gdb-patches@sourceware.org
Cc: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Subject: [RFAv4 2/5] Add function execute_command_to_ui_file
Date: Thu, 30 May 2019 14:21:00 -0000 [thread overview]
Message-ID: <20190530142106.25487-3-philippe.waroquiers@skynet.be> (raw)
In-Reply-To: <20190530142106.25487-1-philippe.waroquiers@skynet.be>
2019-05-30 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.
---
gdb/gdbcmd.h | 2 ++
gdb/top.c | 35 ++++++++++++++++++++++-------------
2 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h
index 5d0e697d83..1b47719f18 100644
--- a/gdb/gdbcmd.h
+++ b/gdb/gdbcmd.h
@@ -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 *);
diff --git a/gdb/top.c b/gdb/top.c
index 518c5ebb5f..4f55d6af1e 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -665,13 +665,12 @@ execute_command (const char *p, int from_tty)
cleanup_if_error.release ();
}
-/* 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
+/* 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. */
-std::string
-execute_command_to_string (const char *p, int from_tty,
- bool term_out)
+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. */
@@ -679,26 +678,36 @@ execute_command_to_string (const char *p, int from_tty,
scoped_restore save_async = make_scoped_restore (¤t_ui->async, 0);
- string_file str_file (term_out);
-
{
- current_uiout->redirect (&str_file);
+ current_uiout->redirect (file);
ui_out_redirect_pop redirect_popper (current_uiout);
scoped_restore save_stdout
- = make_scoped_restore (&gdb_stdout, &str_file);
+ = make_scoped_restore (&gdb_stdout, file);
scoped_restore save_stderr
- = make_scoped_restore (&gdb_stderr, &str_file);
+ = make_scoped_restore (&gdb_stderr, file);
scoped_restore save_stdlog
- = make_scoped_restore (&gdb_stdlog, &str_file);
+ = make_scoped_restore (&gdb_stdlog, file);
scoped_restore save_stdtarg
- = make_scoped_restore (&gdb_stdtarg, &str_file);
+ = make_scoped_restore (&gdb_stdtarg, file);
scoped_restore save_stdtargerr
- = make_scoped_restore (&gdb_stdtargerr, &str_file);
+ = 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. */
+
+std::string
+execute_command_to_string (const char *p, int from_tty,
+ bool term_out)
+{
+ string_file str_file (term_out);
+ execute_command_to_ui_file (&str_file, p, from_tty);
return std::move (str_file.string ());
}
--
2.20.1
next prev parent reply other threads:[~2019-05-30 14:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-30 14:21 [RFAv4 0/5] Implement | (pipe) command Philippe Waroquiers
2019-05-30 14:21 ` [RFAv4 3/5] " Philippe Waroquiers
2019-05-30 14:21 ` [RFAv4 1/5] Add previous_saved_command_line to allow a command to repeat a previous command Philippe Waroquiers
2019-05-30 14:21 ` Philippe Waroquiers [this message]
2019-05-30 14:21 ` [RFAv4 5/5] NEWS and documentation for | (pipe) command Philippe Waroquiers
2019-05-30 15:02 ` Eli Zaretskii
2019-05-31 14:39 ` Pedro Alves
2019-05-30 14:21 ` [RFAv4 4/5] Test the " Philippe Waroquiers
2019-05-31 14:42 ` [RFAv4 0/5] Implement " Pedro Alves
2019-05-31 15:29 ` Philippe Waroquiers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190530142106.25487-3-philippe.waroquiers@skynet.be \
--to=philippe.waroquiers@skynet.be \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).