Introduce find_source_or_rewrite

The final bug fix in this series would duplicate the logic in
psymtab_to_fullname, so this patch extracts the body of this function
into a new function.
This commit is contained in:
Tom Tromey 2021-07-04 13:26:15 -06:00
parent d030267c9c
commit 4584f33d68
3 changed files with 37 additions and 19 deletions

View file

@ -1193,6 +1193,34 @@ open_source_file (struct symtab *s)
return fd;
}
/* See source.h. */
gdb::unique_xmalloc_ptr<char>
find_source_or_rewrite (const char *filename, const char *dirname)
{
gdb::unique_xmalloc_ptr<char> fullname;
scoped_fd fd = find_and_open_source (filename, dirname, &fullname);
if (fd.get () < 0)
{
/* rewrite_source_path would be applied by find_and_open_source, we
should report the pathname where GDB tried to find the file. */
if (dirname == nullptr || IS_ABSOLUTE_PATH (filename))
fullname.reset (xstrdup (filename));
else
fullname.reset (concat (dirname, SLASH_STRING,
filename, (char *) nullptr));
gdb::unique_xmalloc_ptr<char> rewritten
= rewrite_source_path (fullname.get ());
if (rewritten != nullptr)
fullname = std::move (rewritten);
}
return fullname;
}
/* Finds the fullname that a symtab represents.
This functions finds the fullname and saves it in s->fullname.