summaryrefslogtreecommitdiff
path: root/Source/Core/Common/StringUtil.h
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2016-11-26 15:39:00 +0100
committerJosJuice <josjuice@gmail.com>2016-11-26 22:49:46 +0100
commitc74c317ab574779524fe2e20136aed03044d6b3a (patch)
tree4dbdae28e97498d6d246f7aed5f5602d50c261f0 /Source/Core/Common/StringUtil.h
parentde355a8521d47e8c86dffab0470a8acead1af746 (diff)
IOS HLE: More robust escaping of NAND paths
Prevents path traversal without needing an absolute path function, and also improves accuracy (character sequences like ../ appear to have no special meaning in IOS). This removes the creation and usage of /sys/replace, because the new escapes are too complicated to all be representable in its format and because no other NAND handling software seems to use /sys/replace.
Diffstat (limited to 'Source/Core/Common/StringUtil.h')
-rw-r--r--Source/Core/Common/StringUtil.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Core/Common/StringUtil.h b/Source/Core/Common/StringUtil.h
index 7e4c598d0d..fcc8c34483 100644
--- a/Source/Core/Common/StringUtil.h
+++ b/Source/Core/Common/StringUtil.h
@@ -106,6 +106,7 @@ bool AsciiToHex(const std::string& _szValue, u32& result);
std::string TabsToSpaces(int tab_size, const std::string& in);
void SplitString(const std::string& str, char delim, std::vector<std::string>& output);
+std::string JoinStrings(const std::vector<std::string>& strings, const std::string& delimiter);
// "C:/Windows/winhelp.exe" to "C:/Windows/", "winhelp", ".exe"
bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _pFilename,