Mirror-bot/AnyPS5
1
0 Fork 0
mirror of https://github.com/boykopovar/AnyPS5.git synced 2026-11-04 13:07:32 +00:00
Code Issues Projects Releases Activity

fix(relinker): warn on skipped SELF modules

Browse Source 
Co-authored-by: Copilot <[email protected]>
This commit is contained in:
Avijit SinghandCopilot committed 2026-10-13 18:04:49 +05:30
1 parent 0f2683cb7d
commit 82f24e44a2
1 file changed
+7 -2
Download Patch File Download Diff File Expand all files Collapse all files
core/relinker/cli/src/NativeModules.cpp
+7 -2
View File
@@ -37,7 +37,7 @@ NativeModules ReadModules(const std::filesystem::path& inputPath, const std::fil
}
std::vector<std::filesystem::path> paths;
std::set<std::string> unmatchedExclusions = excludedModules;
const auto isElf = [](const std::filesystem::path& path) {
const auto isElf = [](const std::filesystem::path& path, bool& self) {
std::ifstream stream(path, std::ios::binary);
if (!stream) throw Domain::RelinkerException("Cannot read guest candidate: " + Io::Utf8Path(path));
char magic[4]{};
@@ -45,6 +45,7 @@ NativeModules ReadModules(const std::filesystem::path& inputPath, const std::fil
if (stream.bad()) throw Domain::RelinkerException("Cannot read guest candidate magic: " + Io::Utf8Path(path));
if (stream.gcount() != 4) return false;
const auto byte = [&](const std::size_t index) { return static_cast<unsigned char>(magic[index]); };
self = (byte(0) == 0x4f && byte(1) == 0x15 && byte(2) == 0x3d && byte(3) == 0x1d) || (byte(0) == 0x54 && byte(1) == 0x14 && byte(2) == 0xf5 && byte(3) == 0xee);
return byte(0) == 0x7f && magic[1] == 'E' && magic[2] == 'L' && magic[3] == 'F';
};
for (const auto& directory : directories) {
@@ -57,7 +58,11 @@ NativeModules ReadModules(const std::filesystem::path& inputPath, const std::fil
}
if (!entry.is_regular_file()) continue;
if (std::filesystem::equivalent(entry.path(), inputPath)) continue;
if (isElf(entry.path())) paths.push_back(entry.path());
bool self = false;
if (isElf(entry.path(), self)) paths.push_back(entry.path());
else if (self)
std::cout << "Skipping SELF container: " << entry.path().lexically_relative(root).generic_string()
<< " (unwrap it before relinking)\n";
}
}
if (!unmatchedExclusions.empty()) throw Domain::RelinkerException("Excluded guest module file not found: " + *unmatchedExclusions.begin());