From: Andrew Burgess <aburgess@redhat.com>
To: gdb-patches@sourceware.org
Cc: Andrew Burgess <aburgess@redhat.com>
Subject: [PATCH 1/2] gdb: add overloads of gdb_abspath
Date: Thu, 20 Jun 2024 14:33:06 +0100 [thread overview]
Message-ID: <099e02ffda437da096f82d3d4d4926df71939dcd.1718890187.git.aburgess@redhat.com> (raw)
In-Reply-To: <cover.1718890187.git.aburgess@redhat.com>
Add two overloads of gdb_abspath, one which takes std::string and one
which takes gdb::unique_xmalloc_ptr<char>, then make use of these
overloads throughout GDB and gdbserver.
There should be no user visible changes after this commit.
---
gdb/bsd-kvm.c | 2 +-
gdb/corelow.c | 2 +-
gdb/dwarf2/index-cache.c | 2 +-
gdb/main.c | 2 +-
gdb/top.c | 2 +-
gdb/tracefile-tfile.c | 2 +-
gdbserver/server.cc | 2 +-
gdbsupport/pathstuff.h | 16 ++++++++++++++++
8 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c
index 7ef8c349a6e..19353eb97dc 100644
--- a/gdb/bsd-kvm.c
+++ b/gdb/bsd-kvm.c
@@ -117,7 +117,7 @@ bsd_kvm_target_open (const char *arg, int from_tty)
{
filename = gdb_tilde_expand (arg);
if (!IS_ABSOLUTE_PATH (filename))
- filename = gdb_abspath (filename.c_str ());
+ filename = gdb_abspath (filename);
}
const char *execfile = current_program_space->exec_filename ();
diff --git a/gdb/corelow.c b/gdb/corelow.c
index 49da9be07ef..2b7a3550fc1 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -626,7 +626,7 @@ core_target_open (const char *arg, int from_tty)
gdb::unique_xmalloc_ptr<char> filename (tilde_expand (arg));
if (strlen (filename.get ()) != 0
&& !IS_ABSOLUTE_PATH (filename.get ()))
- filename = make_unique_xstrdup (gdb_abspath (filename.get ()).c_str ());
+ filename = make_unique_xstrdup (gdb_abspath (filename).c_str ());
flags = O_BINARY | O_LARGEFILE;
if (write_files)
diff --git a/gdb/dwarf2/index-cache.c b/gdb/dwarf2/index-cache.c
index 1720e925ee6..c11b0164aa4 100644
--- a/gdb/dwarf2/index-cache.c
+++ b/gdb/dwarf2/index-cache.c
@@ -324,7 +324,7 @@ set_index_cache_directory_command (const char *arg, int from_tty,
cmd_list_element *element)
{
/* Make sure the index cache directory is absolute and tilde-expanded. */
- index_cache_directory = gdb_abspath (index_cache_directory.c_str ());
+ index_cache_directory = gdb_abspath (index_cache_directory);
global_index_cache.set_directory (index_cache_directory);
}
diff --git a/gdb/main.c b/gdb/main.c
index 4dd68f3d976..e4a40c51023 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -121,7 +121,7 @@ set_gdb_data_directory (const char *new_datadir)
"../foo" and "../foo" doesn't exist then we'll record $(pwd)/../foo which
isn't canonical, but that's ok. */
if (!IS_ABSOLUTE_PATH (gdb_datadir.c_str ()))
- gdb_datadir = gdb_abspath (gdb_datadir.c_str ());
+ gdb_datadir = gdb_abspath (gdb_datadir);
}
/* Relocate a file or directory. PROGNAME is the name by which gdb
diff --git a/gdb/top.c b/gdb/top.c
index 6239c190627..d6bf1d448d5 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -2097,7 +2097,7 @@ set_history_filename (const char *args,
that was read. */
if (!history_filename.empty ()
&& !IS_ABSOLUTE_PATH (history_filename.c_str ()))
- history_filename = gdb_abspath (history_filename.c_str ());
+ history_filename = gdb_abspath (history_filename);
}
/* Whether we're in quiet startup mode. */
diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c
index eb879c17970..4a4c4a2d32a 100644
--- a/gdb/tracefile-tfile.c
+++ b/gdb/tracefile-tfile.c
@@ -467,7 +467,7 @@ tfile_target_open (const char *arg, int from_tty)
gdb::unique_xmalloc_ptr<char> filename (tilde_expand (arg));
if (!IS_ABSOLUTE_PATH (filename.get ()))
- filename = make_unique_xstrdup (gdb_abspath (filename.get ()).c_str ());
+ filename = make_unique_xstrdup (gdb_abspath (filename).c_str ());
flags = O_BINARY | O_LARGEFILE;
flags |= O_RDONLY;
diff --git a/gdbserver/server.cc b/gdbserver/server.cc
index ab9a33f40fd..30d05177452 100644
--- a/gdbserver/server.cc
+++ b/gdbserver/server.cc
@@ -109,7 +109,7 @@ static struct {
its name with CURRENT_DIRECTORY. Otherwise, we leave the
name as-is because we'll try searching for it in $PATH. */
if (is_regular_file (m_path.c_str (), ®_file_errno))
- m_path = gdb_abspath (m_path.c_str ());
+ m_path = gdb_abspath (m_path);
}
}
diff --git a/gdbsupport/pathstuff.h b/gdbsupport/pathstuff.h
index 170a2c5e724..a61ce23efde 100644
--- a/gdbsupport/pathstuff.h
+++ b/gdbsupport/pathstuff.h
@@ -56,6 +56,22 @@ extern std::string gdb_realpath_keepfile (const char *filename);
extern std::string gdb_abspath (const char *path);
+/* Overload of gdb_abspath which takes std::string. */
+
+static inline std::string
+gdb_abspath (const std::string &path)
+{
+ return gdb_abspath (path.c_str ());
+}
+
+/* Overload of gdb_abspath which takes gdb::unique_xmalloc_ptr<char>. */
+
+static inline std::string
+gdb_abspath (const gdb::unique_xmalloc_ptr<char> &path)
+{
+ return gdb_abspath (path.get ());
+}
+
/* If the path in CHILD is a child of the path in PARENT, return a
pointer to the first component in the CHILD's pathname below the
PARENT. Otherwise, return NULL. */
--
2.25.4
next prev parent reply other threads:[~2024-06-20 13:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 13:33 [PATCH 0/2] string type overloads for some path manipulation functions Andrew Burgess
2024-06-20 13:33 ` Andrew Burgess [this message]
2024-06-20 13:33 ` [PATCH 2/2] gdb: add overloads of gdb_tilde_expand Andrew Burgess
2024-06-24 15:50 ` [PATCH 0/2] string type overloads for some path manipulation functions Tom Tromey
2024-06-27 14:22 ` 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=099e02ffda437da096f82d3d4d4926df71939dcd.1718890187.git.aburgess@redhat.com \
--to=aburgess@redhat.com \
--cc=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).