summaryrefslogtreecommitdiff
path: root/gdb/remote-fileio.c
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2016-08-05 19:54:11 +0100
committerPedro Alves <palves@redhat.com>2016-08-05 19:54:11 +0100
commit3906a8fc773a405b511faed030e4630ecbd4b8a9 (patch)
tree306cebc2289ced37c29c638bbd0185ed4a462c4e /gdb/remote-fileio.c
parent69ffd7f270c8a3f1b577848d2536b93ed01287de (diff)
downloadbinutils-gdb-3906a8fc773a405b511faed030e4630ecbd4b8a9.tar.gz
Fix PR remote/20398: File-IO write always outputs "Quit"
Commit bb7c96deb1a1 ("gdb/remote-fileio.c: Eliminate custom SIGINT signal handler") regressed the File-IO support. Failed output: (gdb) target remote :8888 Remote debugging using :8888 0x00008098 in _start () (gdb) c Continuing. Quit Quit Quit Quit Quit Quit Quit Quit Quit Quit Quit [Inferior 1 (Remote target) exited normally] Expected output: (gdb) target remote :8888 Remote debugging using :8888 0x00008098 in _start () (gdb) c Continuing. i: 0 i: 1 i: 2 i: 3 i: 4 i: 5 i: 6 i: 7 i: 8 i: 9 [Inferior 1 (Remote target) exited normally] The problem that the new File-IO quit handler forgets to check the quit flag before calling throwing a quit. gdb/ChangeLog: 2016-08-05 Pedro Alves <palves@redhat.com> PR remote/20398 * remote-fileio.c (remote_fileio_quit_handler): Check the quit flag before calling quit.
Diffstat (limited to 'gdb/remote-fileio.c')
-rw-r--r--gdb/remote-fileio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index 93121aaa42b..e35bd5b66af 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -308,7 +308,8 @@ static quit_handler_ftype *remote_fileio_o_quit_handler;
static void
remote_fileio_quit_handler (void)
{
- quit ();
+ if (check_quit_flag ())
+ quit ();
}
static void