From f0a4b570b43765effcf5b4a1b12c47b9aab1b16f Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sun, 13 Jan 2013 18:52:45 +0000 Subject: gdb/ * source.c (symtab_to_fullname): Apply rewrite_source_path also for non-existing files. gdb/testsuite/ * gdb.mi/mi-fullname-deleted.exp: Set srcfileabssubst and initdir. (set substitute-path): New test. (fullname present): Remove content. (substituted fullname): New test. --- gdb/source.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'gdb/source.c') diff --git a/gdb/source.c b/gdb/source.c index 6e12896..ca6b4f3 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1094,10 +1094,25 @@ symtab_to_fullname (struct symtab *s) if (fd >= 0) close (fd); - else if (s->dirname == NULL) - s->fullname = xstrdup (s->filename); else - s->fullname = concat (s->dirname, SLASH_STRING, s->filename, NULL); + { + char *fullname; + struct cleanup *back_to; + + /* rewrite_source_path would be applied by find_and_open_source, we + should report the pathname where GDB tried to find the file. */ + + if (s->dirname == NULL) + fullname = xstrdup (s->filename); + else + fullname = concat (s->dirname, SLASH_STRING, s->filename, NULL); + + back_to = make_cleanup (xfree, fullname); + s->fullname = rewrite_source_path (fullname); + if (s->fullname == NULL) + s->fullname = xstrdup (fullname); + do_cleanups (back_to); + } } return s->fullname; -- cgit v1.1