aboutsummaryrefslogtreecommitdiff
path: root/gdb/utils.c
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2012-05-20 20:35:19 +0000
committerJan Kratochvil <jan.kratochvil@redhat.com>2012-05-20 20:35:19 +0000
commit1564a2618d1766c3ea3a27dfa2ae77fe4ef51ef3 (patch)
tree848502bb4367788354501fb1ed6936a930398128 /gdb/utils.c
parenta3ec0bb1c41e2827147c6533295d1f88746e534e (diff)
downloadgdb-1564a2618d1766c3ea3a27dfa2ae77fe4ef51ef3.zip
gdb-1564a2618d1766c3ea3a27dfa2ae77fe4ef51ef3.tar.gz
gdb-1564a2618d1766c3ea3a27dfa2ae77fe4ef51ef3.tar.bz2
gdb/
* NEWS (--with-auto-load-dir): Prepend $debugdir to the default path. Describe it. * auto-load.c (auto_load_expand_dir_vars): New function. (auto_load_safe_path_vec_update): Use it, remove the substitute_path_component call thanks to it. (auto_load_objfile_script): Remove the debug_file_directory processing. Use auto_load_expand_dir_vars, remove the substitute_path_component call thanks to it. * configure: Regenerate. * configure.ac (--with-auto-load-dir): Prepend $debugdir to the default path. Escape $ also for $debugdir. (--with_auto_load_safe_path): Escape $ also for $debugdir. * utils.c (substitute_path_component): Accept also DIRNAME_SEPARATOR. gdb/doc/ * gdb.texinfo (Separate Debug Files): New anchor debug-file-directory. Mention also --with-separate-debug-dir. (Auto-loading): Prepend $debugdir in the sample output. (Auto-loading safe path): Likewise. Mention also $debugdir for the auto-load safe-path variable. (objfile-gdb.py file): Remove the extra debug-file-directory paragraph. Mention also $debugdir for 'set auto-load scripts-directory'.
Diffstat (limited to 'gdb/utils.c')
-rw-r--r--gdb/utils.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/gdb/utils.c b/gdb/utils.c
index 15956b7..2d607ef 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -3726,8 +3726,8 @@ dirnames_to_char_ptr_vec (const char *dirnames)
/* Substitute all occurences of string FROM by string TO in *STRINGP. *STRINGP
must come from xrealloc-compatible allocator and it may be updated. FROM
- needs to be delimited by IS_DIR_SEPARATOR (or be located at the start or
- end of *STRINGP. */
+ needs to be delimited by IS_DIR_SEPARATOR or DIRNAME_SEPARATOR (or be
+ located at the start or end of *STRINGP. */
void
substitute_path_component (char **stringp, const char *from, const char *to)
@@ -3742,8 +3742,10 @@ substitute_path_component (char **stringp, const char *from, const char *to)
if (s == NULL)
break;
- if ((s == string || IS_DIR_SEPARATOR (s[-1]))
- && (s[from_len] == '\0' || IS_DIR_SEPARATOR (s[from_len])))
+ if ((s == string || IS_DIR_SEPARATOR (s[-1])
+ || s[-1] == DIRNAME_SEPARATOR)
+ && (s[from_len] == '\0' || IS_DIR_SEPARATOR (s[from_len])
+ || s[from_len] == DIRNAME_SEPARATOR))
{
char *string_new;