aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2016-04-12 16:49:31 +0100
committerPedro Alves <palves@redhat.com>2016-04-12 16:58:35 +0100
commit481ac8c9bbbfc4b7506dfdb4a5b92b859d5c47d9 (patch)
treef73180369973fc3c9cf6ac8874a7777a299ae1c5 /gdb
parentc509f1e1e8187e0abd2321aadc37878402c87332 (diff)
downloadgdb-481ac8c9bbbfc4b7506dfdb4a5b92b859d5c47d9.zip
gdb-481ac8c9bbbfc4b7506dfdb4a5b92b859d5c47d9.tar.gz
gdb-481ac8c9bbbfc4b7506dfdb4a5b92b859d5c47d9.tar.bz2
Use target_terminal_ours_for_output in exceptions.c
We're only doing output here, so leave raw/cooked mode alone, as well as the SIGINT handler. Restore terminal settings after output, while at it. gdb/ChangeLog: 2016-04-12 Pedro Alves <palves@redhat.com> * exceptions.c (print_flush): Use target_terminal_ours_for_output instead of target_terminal_ours, and restore target terminal with a cleanup.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/exceptions.c8
2 files changed, 13 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cdaf648..857d5e5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2016-04-12 Pedro Alves <palves@redhat.com>
+ * exceptions.c (print_flush): Use target_terminal_ours_for_output
+ instead of target_terminal_ours, and restore target terminal with
+ a cleanup.
+
+2016-04-12 Pedro Alves <palves@redhat.com>
+
* cp-support.c (gdb_demangle): Use target_terminal_ours_for_output
instead of target_terminal_ours, and restore target terminal with
a cleanup.
diff --git a/gdb/exceptions.c b/gdb/exceptions.c
index b457838..ffdd1f3 100644
--- a/gdb/exceptions.c
+++ b/gdb/exceptions.c
@@ -37,12 +37,16 @@ static void
print_flush (void)
{
struct serial *gdb_stdout_serial;
+ struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
if (deprecated_error_begin_hook)
deprecated_error_begin_hook ();
if (target_supports_terminal_ours ())
- target_terminal_ours ();
+ {
+ make_cleanup_restore_target_terminal ();
+ target_terminal_ours_for_output ();
+ }
/* We want all output to appear now, before we print the error. We
have 3 levels of buffering we have to flush (it's possible that
@@ -66,6 +70,8 @@ print_flush (void)
}
annotate_error_begin ();
+
+ do_cleanups (old_chain);
}
static void