espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-05 23:26:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Only compute realpath when basenames_may_differ is set

Browse Source 
A user noted that, when sources are symlinked, gdb annotations will
print the real path, rather than the name of the symlink.

It seems to me that it is better to print the name of the file that
was actually used in the build, unless there is some reason not to.

This patch implements this, with the caveat that it will not work when
basenames-may-differ is enabled.  The way this mode is currently
implemented, returning the symbolic (not real) path is not possible.

While I think it would be good to redo the source file name cache and
perhaps integrate it with class source_cache, I haven't done so here.

Regression tested on x86-64 Fedora 29.

gdb/ChangeLog
2019-06-14  Tom Tromey  <tromey@adacore.com>

	* source.c (find_and_open_source): Respect basenames_may_differ.

gdb/testsuite/ChangeLog
2019-06-14  Tom Tromey  <tromey@adacore.com>

	* gdb.base/annotate-symlink.exp: New file.
This commit is contained in:
Tom Tromey
2019-05-30 10:59:03 -06:00
parent 7c39e397aa
commit a0c1ffedcf
4 changed files with 68 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gdb/source.c
View File

@ -987,7 +987,10 @@ find_and_open_source (const char *filename,
result = gdb_open_cloexec (fullname->get (), OPEN_MODE, 0);
if (result >= 0)
{
*fullname = gdb_realpath (fullname->get ());
if (basenames_may_differ)
*fullname = gdb_realpath (fullname->get ());
else
*fullname = gdb_abspath (fullname->get ());
return scoped_fd (result);
}
@ -1031,15 +1034,16 @@ find_and_open_source (const char *filename,
if (rewritten_filename != NULL)
filename = rewritten_filename.get ();
result = openp (path, OPF_SEARCH_IN_PATH | OPF_RETURN_REALPATH, filename,
OPEN_MODE, fullname);
openp_flags flags = OPF_SEARCH_IN_PATH;
if (basenames_may_differ)
flags |= OPF_RETURN_REALPATH;
result = openp (path, flags, filename, OPEN_MODE, fullname);
if (result < 0)
{
/* Didn't work. Try using just the basename. */
p = lbasename (filename);
if (p != filename)
result = openp (path, OPF_SEARCH_IN_PATH | OPF_RETURN_REALPATH, p,
OPEN_MODE, fullname);
result = openp (path, flags, p, OPEN_MODE, fullname);
}
return scoped_fd (result);