FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(openp): Use xfullpath in place of gdb_realpath to avoid resolving the

Browse source 
basename part of filenames when the associated file is a symbolic link.
This fixes a potential inconsistency between the filenames known to GDB
and the filenames it prints in the annotations.
This commit is contained in:
Joel Brobecker 2002-04-05 16:40:45 +00:00
parent 08b204d1d1
commit a89f66e45b
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gdb/source.c
View file

@ -514,7 +514,7 @@ source_info (char *ignore, int from_tty)
get that particular version of foo or an error message).
If FILENAME_OPENED is non-null, set it to a newly allocated string naming
the actual file opened (this string will always start with a "/". We
the actual file opened (this string will always start with a "/"). We
have to take special pains to avoid doubling the "/" between the directory
and the file, sigh! Emacs gets confuzzed by this when we print the
source file name!!!
@ -609,10 +609,15 @@ openp (const char *path, int try_cwd_first, const char *string,
done:
if (filename_opened)
{
/* If a file was opened, canonicalize its filename. Use xfullpath
rather than gdb_realpath to avoid resolving the basename part
of filenames when the associated file is a symbolic link. This
fixes a potential inconsistency between the filenames known to
GDB and the filenames it prints in the annotations. */
if (fd < 0)
*filename_opened = NULL;
else if (IS_ABSOLUTE_PATH (filename))
*filename_opened = gdb_realpath (filename);
*filename_opened = xfullpath (filename);
else
{
/* Beware the // my son, the Emacs barfs, the botch that catch... */
@ -621,7 +626,7 @@ done:
IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1])
? "" : SLASH_STRING,
filename, NULL);
*filename_opened = gdb_realpath (f);
*filename_opened = xfullpath (f);
xfree (f);
}
}