diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2019-02-12 13:56:16 -0800 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2019-02-12 13:56:16 -0800 |
| commit | cd4b78483c3b0e4bd7737b67ed5074b7c252faa4 (patch) | |
| tree | d27ed3d4255ec14b7fc0846bb74ae16609d2a36f | |
| parent | efac4bfe0b2bdd21a27c94ca3464046e9c23f0e4 (diff) | |
| download | gdb-cd4b78483c3b0e4bd7737b67ed5074b7c252faa4.zip gdb-cd4b78483c3b0e4bd7737b67ed5074b7c252faa4.tar.gz gdb-cd4b78483c3b0e4bd7737b67ed5074b7c252faa4.tar.bz2 | |
Use child_path to determine if an object file is under a sysroot.
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.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/symfile.c | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2357a40..de88a21 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2019-02-12 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-02-12 John Baldwin <jhb@FreeBSD.org> + * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add unittests/child-path-selftests.c. * common/pathstuff.c (child_path): New function. diff --git a/gdb/symfile.c b/gdb/symfile.c index b5802e2..ffcba1a 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; |