archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 23:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change GetDeviceLocal device selection

Browse source 
For `GetDeviceLocal` only consider a device if the full path to the device
matches the first part of the path to match.

The issue was that putting in a file that was not in a sub-path of an existing
mounted device failed. So if the rpcs3 devices are in
D:\DEV\rpcs3\bin and you open D:\DEV\ps3autotests\tests\rsx\primitives\primitives.ppu.elf
it would return
/dev_usb000/ps3autotests\tests\rsx\primitives\primitives.ppu.elf
which resolves to
D:/DEV/rpcs3/bin/dev_usb000/ps3autotests/tests/rsx/primitives/primitives.ppu.elf
and is wrong.

Correct are either /dev_usb000/../../../ps3autotests\tests\rsx\primitives\primitives.ppu.elf
or /hostfs/D:\DEV\ps3autotests\tests\rsx\primitives\primitives.ppu.elf

I chose to resolve without the ".." beyond root, since that just seems wrong
(so it will now return the hostfs version).

Fixes #1090
This commit is contained in:
Peter Tissen 2015-05-21 10:45:40 +02:00
parent 46302084e7
commit 0b0c8723eb
2 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
rpcs3/Emu/FS/VFS.cpp
View file

@ -386,30 +386,30 @@ vfsDevice* VFS::GetDevice(const std::string& ps3_path, std::string& path) const
vfsDevice* VFS::GetDeviceLocal(const std::string& local_path, std::string& path) const vfsDevice* VFS::GetDeviceLocal(const std::string& local_path, std::string& path) const
{ {
size_t max_eq = 0; int max_eq = -1;
int max_i = -1; int max_i = -1;
std::vector<std::string> local_path_blocks = simplify_path_blocks(local_path); std::vector<std::string> local_path_blocks = simplify_path_blocks(local_path);
for (u32 i = 0; i < m_devices.size(); ++i) for (u32 i = 0; i < m_devices.size(); ++i)
{ {
std::vector<std::string> dev_local_path_blocks_blocks = simplify_path_blocks(m_devices[i]->GetLocalPath()); std::vector<std::string> dev_local_path_blocks = simplify_path_blocks(m_devices[i]->GetLocalPath());
if (local_path_blocks.size() < dev_local_path_blocks_blocks.size()) if (local_path_blocks.size() < dev_local_path_blocks.size())
continue; continue;
size_t eq = 0; int dev_blocks = dev_local_path_blocks.size();
for (; eq < dev_local_path_blocks_blocks.size(); ++eq)
{
if (strcmp(local_path_blocks[eq].c_str(), dev_local_path_blocks_blocks[eq].c_str()))
{
break;
}
}
if (eq > max_eq) bool prefix_equal = std::equal(
std::begin(dev_local_path_blocks),
std::end(dev_local_path_blocks),
std::begin(local_path_blocks),
[](const std::string& a, const std::string& b){ return strcmp(a.c_str(), b.c_str()) == 0; }
);
if (prefix_equal && dev_blocks > max_eq)
{ {
max_eq = eq; max_eq = dev_blocks;
max_i = i; max_i = i;
} }
} }

5
rpcs3/Emu/System.cpp
View file

@ -265,10 +265,7 @@ void Emulator::Load()
if (m_elf_path.empty()) if (m_elf_path.empty())
{ {
if (!GetVFS().GetDeviceLocal(m_path, m_elf_path)) GetVFS().GetDeviceLocal(m_path, m_elf_path);
{
m_elf_path = "/host_root/" + m_path; // should be probably app_home
}
LOG_NOTICE(LOADER, "Elf path: %s", m_elf_path); LOG_NOTICE(LOADER, "Elf path: %s", m_elf_path);
} }