PCSX2/archived-pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-01-31 01:15:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

StringUtil: Replace StartsWith/EndsWith with C++20 equivalents

Browse Source
This commit is contained in:
Stenzek
2023-12-22 19:22:33 +10:00
committed by Connor McLaughlin
parent d73d698fd5
commit 76f36b780c
14 changed files with 72 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/IopBios.cpp
View File

@@ -169,7 +169,7 @@ namespace R3000A
// For now it just supports relative folders from the location of the elf
std::string native_path(Path::Canonicalize(path));
std::string new_path;
if (!hostRoot.empty() && StringUtil::StartsWith(native_path, hostRoot))
if (!hostRoot.empty() && native_path.starts_with(hostRoot))
new_path = std::move(native_path);
else if (!hostRoot.empty()) // relative paths
new_path = Path::Combine(hostRoot, native_path);
@@ -195,7 +195,7 @@ namespace R3000A
{
// Only allow descendants of the hostfs directory.
if (canonicalized_path.length() <= hostRoot.length() || // Length has to be equal or longer,
!StringUtil::StartsWith(canonicalized_path, hostRoot) || // and start with the host root,
!canonicalized_path.starts_with(hostRoot) || // and start with the host root,
canonicalized_path[hostRoot.length()] != FS_OSPATH_SEPARATOR_CHARACTER) // and we can't access a sibling.
{
Console.Error(fmt::format(