RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-10-11 22:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ISO device paths

Browse Source
This commit is contained in:
digant73
2026-09-27 15:10:08 +03:00
committed by Elad
parent dad97b9a96
commit 205a4481f3
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Loader/ISO.cpp
+21 -8
View File
@@ -10,7 +10,6 @@
#include <codecvt>
#include <algorithm>
#include <cmath>
#include <filesystem>
#include <stack>
#include <span>
#include <cstdlib>
@@ -1151,14 +1150,13 @@ iso_archive::iso_archive(const std::string& path)
}
}
iso_fs_node* iso_archive::retrieve(const std::string& passed_path)
iso_fs_node* iso_archive::retrieve(const std::string& path)
{
if (passed_path.empty() || !is_valid())
if (path.empty() || !is_valid())
{
return nullptr;
}
const std::string path = std::filesystem::path(passed_path).string();
const std::string_view path_sv = path;
usz start = 0;
@@ -1619,9 +1617,24 @@ void iso_dir::rewind()
m_pos = 0;
}
// Cuts the device prefix off a path the virtual file system handed down, leaving the part that names a node of
// the image
static std::string strip_device_prefix(std::string_view path, std::string_view fs_prefix)
{
if (path.starts_with(fs_prefix))
{
path.remove_prefix(fs_prefix.size());
}
path = fmt::trim_sv(path, fs::delim);
// The prefix on its own is the root of the image, the node retrieve() reaches through "."
return path.empty() ? "."s : std::string{path};
}
bool iso_device::stat(const std::string& path, fs::stat_t& info)
{
const auto relative_path = std::filesystem::relative(std::filesystem::path(path), std::filesystem::path(fs_prefix)).string();
const std::string relative_path = strip_device_prefix(path, fs_prefix);
const auto node = m_archive.retrieve(relative_path);
@@ -1649,7 +1662,7 @@ bool iso_device::stat(const std::string& path, fs::stat_t& info)
bool iso_device::statfs(const std::string& path, fs::device_stat& info)
{
const auto relative_path = std::filesystem::relative(std::filesystem::path(path), std::filesystem::path(fs_prefix)).string();
const std::string relative_path = strip_device_prefix(path, fs_prefix);
const auto node = m_archive.retrieve(relative_path);
@@ -1674,7 +1687,7 @@ bool iso_device::statfs(const std::string& path, fs::device_stat& info)
std::unique_ptr<fs::file_base> iso_device::open(const std::string& path, bs_t<fs::open_mode> mode)
{
const auto relative_path = std::filesystem::relative(std::filesystem::path(path), std::filesystem::path(fs_prefix)).string();
const std::string relative_path = strip_device_prefix(path, fs_prefix);
const auto node = m_archive.retrieve(relative_path);
@@ -1695,7 +1708,7 @@ std::unique_ptr<fs::file_base> iso_device::open(const std::string& path, bs_t<fs
std::unique_ptr<fs::dir_base> iso_device::open_dir(const std::string& path)
{
const auto relative_path = std::filesystem::relative(std::filesystem::path(path), std::filesystem::path(fs_prefix)).string();
const std::string relative_path = strip_device_prefix(path, fs_prefix);
const auto node = m_archive.retrieve(relative_path);