diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/remote.c | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ddef913..9fb261a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2012-02-03 Philippe Waroquiers <philippe.waroquiers@skynet.be> + + * remote.c (remote_rcmd): Use getpkt_sane to detect timeout + and continue the loop. Add QUIT statement. + 2012-02-03 Tom Tromey <tromey@redhat.com> PR gdb/13596: diff --git a/gdb/remote.c b/gdb/remote.c index 1c37b69..3187ac0 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -8590,8 +8590,17 @@ remote_rcmd (char *command, char *buf; /* XXX - see also remote_get_noisy_reply(). */ + QUIT; /* Allow user to bail out with ^C. */ rs->buf[0] = '\0'; - getpkt (&rs->buf, &rs->buf_size, 0); + if (getpkt_sane (&rs->buf, &rs->buf_size, 0) == -1) + { + /* Timeout. Continue to (try to) read responses. + This is better than stopping with an error, assuming the stub + is still executing the (long) monitor command. + If needed, the user can interrupt gdb using C-c, obtaining + an effect similar to stop on timeout. */ + continue; + } buf = rs->buf; if (buf[0] == '\0') error (_("Target does not support this command.")); |