mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-17 07:53:51 +08:00
PR gdb/27876 - debuginfod-downloaded source files don't pass proper fullname across mi / (gdb)info source
Source files downloaded from debuginfod currently use their original DWARF filename as their "fullname". This causes a mismatch between the fullname and the actual location of the source file in the debuginfod client cache. MI consumers such as VSCode will fail to open debuginfod-downloaded source files due to this. Also 'info source' will fail to include the true paths of these files. To fix this, use the debuginfod cache path as the fullname for debuginfod- downloaded source files.
This commit is contained in:
@ -202,6 +202,7 @@ debuginfod_source_query (const unsigned char *build_id,
|
|||||||
if (c == nullptr)
|
if (c == nullptr)
|
||||||
return scoped_fd (-ENOMEM);
|
return scoped_fd (-ENOMEM);
|
||||||
|
|
||||||
|
char *dname = nullptr;
|
||||||
user_data data ("source file", srcpath);
|
user_data data ("source file", srcpath);
|
||||||
|
|
||||||
debuginfod_set_user_data (c, &data);
|
debuginfod_set_user_data (c, &data);
|
||||||
@ -216,7 +217,7 @@ debuginfod_source_query (const unsigned char *build_id,
|
|||||||
build_id,
|
build_id,
|
||||||
build_id_len,
|
build_id_len,
|
||||||
srcpath,
|
srcpath,
|
||||||
nullptr));
|
&dname));
|
||||||
debuginfod_set_user_data (c, nullptr);
|
debuginfod_set_user_data (c, nullptr);
|
||||||
|
|
||||||
if (debuginfod_verbose > 0 && fd.get () < 0 && fd.get () != -ENOENT)
|
if (debuginfod_verbose > 0 && fd.get () < 0 && fd.get () != -ENOENT)
|
||||||
@ -225,7 +226,7 @@ debuginfod_source_query (const unsigned char *build_id,
|
|||||||
styled_string (file_name_style.style (), srcpath));
|
styled_string (file_name_style.style (), srcpath));
|
||||||
|
|
||||||
if (fd.get () >= 0)
|
if (fd.get () >= 0)
|
||||||
*destname = make_unique_xstrdup (srcpath);
|
destname->reset (dname);
|
||||||
|
|
||||||
return fd;
|
return fd;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user