diff options
| author | Aaron Merey <amerey@redhat.com> | 2021-11-29 14:58:38 -0500 |
|---|---|---|
| committer | Aaron Merey <amerey@redhat.com> | 2021-11-29 14:58:38 -0500 |
| commit | b9db26b4c44245c0b0148ef9e711677d4e664f9f (patch) | |
| tree | f44b27bc7358f0131dffd9d29bf25024c6ed2f6e /gdb/debuginfod-support.c | |
| parent | 584294c4066d0101161e4e04744a46cce7a7863e (diff) | |
| download | binutils-gdb-b9db26b4c44245c0b0148ef9e711677d4e664f9f.tar.gz | |
[PR gdb/27026] CTRL-C is ignored when debug info is downloaded
During debuginfod downloads, ctrl-c should result in the download
being cancelled and skipped. However in some cases, ctrl-c fails to
get delivered to gdb during downloading. This can result in downloads
being unskippable.
Fix this by ensuring that target_terminal::ours is in effect for the
duration of each download.
Co-authored-by: Tom de Vries <tdevries@suse.de>
https://sourceware.org/bugzilla/show_bug.cgi?id=27026#c3
Diffstat (limited to 'gdb/debuginfod-support.c')
| -rw-r--r-- | gdb/debuginfod-support.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c index 2e1837da949..1f160e29714 100644 --- a/gdb/debuginfod-support.c +++ b/gdb/debuginfod-support.c @@ -23,6 +23,7 @@ #include "gdbsupport/gdb_optional.h" #include "cli/cli-cmds.h" #include "cli/cli-style.h" +#include "target.h" /* Set/show debuginfod commands. */ static cmd_list_element *set_debuginfod_prefix_list; @@ -204,6 +205,13 @@ debuginfod_source_query (const unsigned char *build_id, user_data data ("source file", srcpath); debuginfod_set_user_data (c, &data); + gdb::optional<target_terminal::scoped_restore_terminal_state> term_state; + if (target_supports_terminal_ours ()) + { + term_state.emplace (); + target_terminal::ours (); + } + scoped_fd fd (debuginfod_find_source (c, build_id, build_id_len, @@ -242,6 +250,13 @@ debuginfod_debuginfo_query (const unsigned char *build_id, user_data data ("separate debug info for", filename); debuginfod_set_user_data (c, &data); + gdb::optional<target_terminal::scoped_restore_terminal_state> term_state; + if (target_supports_terminal_ours ()) + { + term_state.emplace (); + target_terminal::ours (); + } + scoped_fd fd (debuginfod_find_debuginfo (c, build_id, build_id_len, &dname)); debuginfod_set_user_data (c, nullptr); |