To: gdb-patches@sourceware.org
Subject: [PATCH v2] remote.c: Allow inferior to reply with an error
Date: Fri, 13 Jan 2023 12:59:10 +0100 [thread overview]
Message-ID: <20230113115910.3215524-1-ahajkova@redhat.com> (raw)
From: Alexandra Hájková <ahajkova@redhat.com>
When gdb communicates with some kind of gdbserver or gdbserver
stub over the remote protocol, the only possible response to
the QSetWorkingDir packet is "OK". If the remote will reply
with anything else, gdb will complain about the unexpected reply.
[remote] Sending packet: $QSetWorkingDir:2f746d70#bb
[remote] Packet received: E00
Remote replied unexpectedly while setting the inferior's working
directory: E00
(gdb)
Allow remote to send an error message over as a QSetWorkingDir
packet reply.
[remote] Sending packet: $QSetWorkingDir:2f746d70#bb
[remote] Packet received: E.directory does not exist
Remote failed to set working directory: directory does not exist.
---
V2 does not change the behaviour of gdb in a case it wasn't possible to
set the inferior's working directory. It just allows to pass the error
message to gdb.
gdb/doc/gdb.texinfo | 3 +++
gdb/remote.c | 12 +++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 9c0018ea5c1..5df9a5a9178 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -42517,6 +42517,9 @@ Reply:
@table @samp
@item OK
The request succeeded.
+
+@item E.errtext
+An error occurred. Reply with an error message.
@end table
@item qfThreadInfo
diff --git a/gdb/remote.c b/gdb/remote.c
index 218bca30d04..ea89759e85a 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -10397,8 +10397,10 @@ remote_target::extended_remote_set_inferior_cwd ()
if (packet_support (PACKET_QSetWorkingDir) != PACKET_DISABLE)
{
const std::string &inferior_cwd = current_inferior ()->cwd ();
+ char *buf;
remote_state *rs = get_remote_state ();
+ buf = rs->buf.data ();
if (!inferior_cwd.empty ())
{
std::string hexpath
@@ -10420,11 +10422,15 @@ remote_target::extended_remote_set_inferior_cwd ()
getpkt (&rs->buf, 0);
if (packet_ok (rs->buf,
&remote_protocol_packets[PACKET_QSetWorkingDir])
- != PACKET_OK)
- error (_("\
+ != PACKET_OK) {
+ if (buf[0] == 'E' && buf[1] == '.')
+ error (_("Remote failed to set working directory: %s"), buf + 2);
+ else
+ error (_("\
Remote replied unexpectedly while setting the inferior's working\n\
-directory: %s"),
+directory: %s."),
rs->buf.data ());
+ }
}
}
--
2.39.0
next reply other threads:[~2023-01-13 11:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 11:59 [this message]
2023-01-13 13:16 ` Eli Zaretskii
2023-01-17 16:30 ` Andrew Burgess
2023-01-18 9:48 ` Mark Wielaard
2023-01-18 18:10 ` Andrew Burgess
2023-01-18 13:37 ` Alexandra Petlanova Hajkova
2023-01-18 18:19 ` Andrew Burgess
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=20230113115910.3215524-1-ahajkova@redhat.com \
--to=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).