ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HostFS: Improve Hle_SetElfPath method

This commit is contained in:
Francisco Javier Trujillo Mata 2021-04-22 12:07:30 +02:00 committed by refractionpcsx2
parent e9b3b89620
commit 6902ce007a
1 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pcsx2/IopBios.cpp
View File

@ -52,46 +52,14 @@ typedef struct
unsigned int unknown; unsigned int unknown;
} fio_dirent_t; } fio_dirent_t;
static char HostRoot[1024]; static std::string hostRoot;
void Hle_SetElfPath(const char* elfFileName) void Hle_SetElfPath(const char* elfFileName)
{ {
DevCon.WriteLn("HLE Host: Will load ELF: %s\n", elfFileName); DevCon.WriteLn("HLE Host: Will load ELF: %s\n", elfFileName);
ghc::filesystem::path elf_path{elfFileName};
const char* pos1 = strrchr(elfFileName, '/'); hostRoot = elf_path.parent_path().concat("/");
const char* pos2 = strrchr(elfFileName, '\\'); Console.WriteLn("HLE Host: Set 'host:' root path to: %s\n", hostRoot.c_str());
if (pos2 > pos1) // we want the LAST path separator
pos1 = pos2;
if (!pos1) // if pos1 is NULL, then pos2 was not > pos1, so it must also be NULL
{
Console.WriteLn("HLE Notice: ELF does not have a path.\n");
// use %CD%/host/
char* cwd = getcwd(HostRoot, 1000); // save the other 23 chars to append /host/ :P
HostRoot[1000] = 0; // Be Safe.
if (cwd == nullptr)
{
Console.Error("Hle_SetElfPath: getcwd: buffer is too small");
return;
}
char* last = HostRoot + strlen(HostRoot) - 1;
if ((*last != '/') && (*last != '\\')) // PathAppend()-ish
last++;
strcpy(last, "/host/");
return;
}
int len = pos1 - elfFileName + 1;
memcpy(HostRoot, elfFileName, len); // include the / (or \\)
HostRoot[len] = 0;
Console.WriteLn("HLE Host: Set 'host:' root path to: %s\n", HostRoot);
} }
namespace R3000A namespace R3000A
@ -121,7 +89,7 @@ namespace R3000A
static std::string host_path(const std::string path) static std::string host_path(const std::string path)
{ {
ghc::filesystem::path hostRootPath{HostRoot}; ghc::filesystem::path hostRootPath{hostRoot};
ghc::filesystem::path currentPath{path}; ghc::filesystem::path currentPath{path};
// We are NOT allowing to use the root of the host unit. // We are NOT allowing to use the root of the host unit.