From bc177f49982e128d89fee03d9ab8ae7ac92a5cd8 Mon Sep 17 00:00:00 2001 From: w3irDv <170813473+w3irDv@users.noreply.github.com> Date: Sun, 26 May 2024 13:07:57 +0200 Subject: [PATCH] fix shared content installation flow --- source/wad/wad.cpp | 14 ++++++++++++-- source/wad/wad.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/source/wad/wad.cpp b/source/wad/wad.cpp index 06a1ed96..92343894 100644 --- a/source/wad/wad.cpp +++ b/source/wad/wad.cpp @@ -322,7 +322,7 @@ bool Wad::InstallContents(const char *installpath) // Install content if(content->type == 0x8001) { // shared content - int result = CheckContentMap(installpath, content, filepath); + int result = UpdateContentMap(installpath, content, filepath); if(result == 1) // exists already, skip file continue; @@ -448,6 +448,16 @@ int Wad::CheckContentMap(const char *installpath, tmd_content *content, char *fi return 1; // content exists already } + // Content does not exists + return 0; +} + +int Wad::UpdateContentMap(const char *installpath, tmd_content *content, char *filepath) +{ + int result = CheckContentMap(installpath,content,filepath); + if ( result != 0 ) + return result; // content already exists or error + // Content does not exists, append it. u32 next_entry = content_map_size; u8 *tmp = (u8 *) realloc(content_map, (next_entry + 1) * sizeof(map_entry_t)); @@ -461,7 +471,7 @@ int Wad::CheckContentMap(const char *installpath, tmd_content *content, char *fi content_map = tmp; content_map_size++; - map = (map_entry_t *) content_map; + map_entry_t *map = (map_entry_t *) content_map; char name[9]; sprintf(name, "%08x", (unsigned int)next_entry); memcpy(map[next_entry].name, name, 8); diff --git a/source/wad/wad.h b/source/wad/wad.h index dab23006..740efa51 100644 --- a/source/wad/wad.h +++ b/source/wad/wad.h @@ -49,6 +49,7 @@ public: private: bool InstallContents(const char *installpath); int CheckContentMap(const char *installpath, tmd_content *content, char *filepath); + int UpdateContentMap(const char *installpath, tmd_content *content, char *filepath); bool WriteFile(const char *filepath, u8 *buffer, u32 len); bool SetTitleUID(const char *intallpath, const u64 &tid);