From: John Baldwin <jhb@FreeBSD.org>
To: gdb-patches@sourceware.org
Subject: [PATCH v2 3/4] Use child_path to determine if an object file is under a sysroot.
Date: Mon, 28 Jan 2019 20:47:00 -0000 [thread overview]
Message-ID: <5d84ed6197e95adfe4be5c547c2e0b5dddb0d26e.1548707934.git.jhb@FreeBSD.org> (raw)
In-Reply-To: <cover.1548707934.git.jhb@FreeBSD.org>
This fixes the case where the sysroot happens to end in a trailing
'/'. Note that the path returned from child_path always skips over
the directory separator at the start of the base path, so a separator
must always be explicitly added before the base path.
gdb/ChangeLog:
* symfile.c (find_separate_debug_file): Use child_path to
determine if an object file is under a sysroot.
---
gdb/ChangeLog | 5 +++++
gdb/symfile.c | 12 +++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 93a2cebe1c..e65182d84d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-28 John Baldwin <jhb@FreeBSD.org>
+
+ * symfile.c (find_separate_debug_file): Use child_path to
+ determine if an object file is under a sysroot.
+
2019-01-28 John Baldwin <jhb@FreeBSD.org>
* Makefile.in (SUBDIR_UNITTESTS_SRCS): Add
diff --git a/gdb/symfile.c b/gdb/symfile.c
index b5802e20ad..ffcba1a090 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -57,6 +57,7 @@
#include "gdb_bfd.h"
#include "cli/cli-utils.h"
#include "common/byte-vector.h"
+#include "common/pathstuff.h"
#include "common/selftest.h"
#include "cli/cli-style.h"
#include "common/forward-scope-exit.h"
@@ -1452,16 +1453,16 @@ find_separate_debug_file (const char *dir,
if (separate_debug_file_exists (debugfile, crc32, objfile))
return debugfile;
+ const char *base_path;
if (canon_dir != NULL
- && filename_ncmp (canon_dir, gdb_sysroot,
- strlen (gdb_sysroot)) == 0
- && IS_DIR_SEPARATOR (canon_dir[strlen (gdb_sysroot)]))
+ && (base_path = child_path (gdb_sysroot, canon_dir)) != NULL)
{
/* If the file is in the sysroot, try using its base path in
the global debugfile directory. */
debugfile = target_prefix ? "target:" : "";
debugfile += debugdir.get ();
- debugfile += (canon_dir + strlen (gdb_sysroot));
+ debugfile += "/";
+ debugfile += base_path;
debugfile += "/";
debugfile += debuglink;
@@ -1473,7 +1474,8 @@ find_separate_debug_file (const char *dir,
debugfile = target_prefix ? "target:" : "";
debugfile += gdb_sysroot;
debugfile += debugdir.get ();
- debugfile += (canon_dir + strlen (gdb_sysroot));
+ debugfile += "/";
+ debugfile += base_path;
debugfile += "/";
debugfile += debuglink;
--
2.19.2
next prev parent reply other threads:[~2019-01-28 20:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-28 20:47 [PATCH v2 0/4] Some fixes for debug files and sysroots John Baldwin
2019-01-28 20:47 ` [PATCH v2 1/4] Look for separate debug files in debug directories under a sysroot John Baldwin
2019-01-28 20:47 ` John Baldwin [this message]
2019-01-28 20:47 ` [PATCH v2 2/4] Add a new function child_path John Baldwin
2019-02-12 2:43 ` Simon Marchi
2019-02-12 2:46 ` Simon Marchi
2019-02-12 16:52 ` John Baldwin
2019-02-12 16:56 ` Simon Marchi
2019-01-28 20:53 ` [PATCH v2 4/4] Try to use the canonical version of a sysroot for debug file links John Baldwin
2019-02-11 17:54 ` [PING] [PATCH v2 0/4] Some fixes for debug files and sysroots John Baldwin
2019-02-12 2:53 ` Simon Marchi
2019-02-12 21:59 ` John Baldwin
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=5d84ed6197e95adfe4be5c547c2e0b5dddb0d26e.1548707934.git.jhb@FreeBSD.org \
--to=jhb@freebsd.org \
--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).