[PATCH 2/2] Trim trailing directory separators from new sysroots.

John Baldwin
2019-01-23T01:04:17Z

The separate debugfile logic assumes that the sysroot does not include
a trailing separator (all of the sysroot logic in
find_separate_debug_file requires the next character after the sysroot
in a object file path to be a directory separator). However, normal
filename completion will result in setting a sysroot with a trailing
directory separator. If the directory portion of a new sysroot ends
with a directory separator and is not specifying the root directory,
trim the trailing separator. This permits the sysroot logic to work
the same if a sysroot of "/myroot/" is specified instead of "/myroot".

Note that the sysroot displayed by 'show sysroot' will reflect the
trimmed sysroot.

gdb/ChangeLog:

* solib.c (gdb_sysroot_changed): Trim trailing directory separator
from new sysroot.
---
gdb/ChangeLog | 5 +++++
gdb/solib.c | 8 ++++++++
2 files changed, 13 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a401cfc784..c9f2d049bc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-22 John Baldwin <jhb@FreeBSD.org>
+
+ * solib.c (gdb_sysroot_changed): Trim trailing directory separator
+ from new sysroot.
+
2019-01-22 John Baldwin <jhb@FreeBSD.org>

* symfile.c (find_separate_debug_file): Look for separate debug
diff --git a/gdb/solib.c b/gdb/solib.c
index 3a6db5e12d..a837f27c73 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -1433,6 +1433,14 @@ gdb_sysroot_changed (const char *ignored, int from_tty,
}
}

+ /* Trim trailing directory separator. */
+ char *sysroot_dir = gdb_sysroot;
+ if (startswith (gdb_sysroot, TARGET_SYSROOT_PREFIX))
+ sysroot_dir += strlen (TARGET_SYSROOT_PREFIX);
+ size_t len = strlen (sysroot_dir);
+ if (len > 1 && IS_DIR_SEPARATOR (sysroot_dir[len - 1]))
+ sysroot_dir[len - 1] = '\0';
+
reload_shared_libraries (ignored, from_tty, e);
}

--
2.19.2