fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

intel/mda: Allow more toplevel directory names inside mda.tar files

Browse source 
Will allow generate anv.tar with unique "first directory name" instead
of always "mda/", avoiding overlaps if user untars the files.  The name
still must end with "mda/".

Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29146>
This commit is contained in:
Caio Oliveira 2025-06-24 21:46:08 -07:00
parent a1d66c18c9
commit 3ff37e97a0
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/intel/mda/mda.c
View file

@ -44,6 +44,7 @@ typedef struct mesa_archive {
object *objects;
const char *info;
slice detected_mda_prefix;
} mesa_archive;
enum diff_mode {
@ -190,6 +191,7 @@ parse_mesa_archive(void *mem_ctx, const char *filename)
tar_reader_entry entry = {0};
bool found_mesa_txt = false;
ma->detected_mda_prefix = (slice){};
while (tar_reader_next(&tr, &entry)) {
slice fullpath;
if (!slice_is_empty(entry.prefix)) {
@ -202,10 +204,16 @@ parse_mesa_archive(void *mem_ctx, const char *filename)
}
slice mda_mesa_txt = slice_from_cstr("mda/mesa.txt");
if (slice_equal(fullpath, mda_mesa_txt)) {
ma->info = slice_to_cstr(ma, entry.contents);
found_mesa_txt = true;
break;
if (slice_ends_with(fullpath, mda_mesa_txt)) {
slice_cut_result cut = slice_cut(fullpath, '/');
if (cut.found && slice_equal_cstr(cut.after, "mesa.txt")) {
/* Cut was succesful, so can extend to include the separator. */
ma->detected_mda_prefix = (slice){ cut.before.data, cut.before.len+1 };
ma->info = slice_to_cstr(ma, entry.contents);
found_mesa_txt = true;
break;
}
}
}
@ -234,13 +242,24 @@ parse_mesa_archive(void *mem_ctx, const char *filename)
if (slice_is_empty(entry.contents))
continue;
/* Already processed this before. */
if (slice_equal_cstr(fullpath, "mda/mesa.txt"))
if (!slice_starts_with(fullpath, ma->detected_mda_prefix)) {
fprintf(stderr, "mda: ignoring unexpected file with wrong prefix: %.*s\n", SLICE_FMT(fullpath));
continue;
}
/* Normalize path: strip leading "mda/" if present */
slice mda_prefix = slice_from_cstr("mda/");
fullpath = slice_strip_prefix(fullpath, mda_prefix);
/* Remove the detected prefix from paths. We'll use the filename later
* on since is more visible to the user. Most of the time is going to
* be the same.
*/
{
slice_cut_result cut = slice_cut(fullpath, '/');
assert(cut.found);
fullpath = cut.after;
}
/* Already processed this before. */
if (slice_equal_cstr(fullpath, "mesa.txt"))
continue;
slice_cut_result first_cut = slice_cut(fullpath, '/');
if (!first_cut.found)