diff options
| author | JosJuice <josjuice@gmail.com> | 2016-11-29 18:34:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 18:34:22 +0100 |
| commit | 3cfc49a613a0f8e137c251694c97f0f3589f3216 (patch) | |
| tree | 158c4deb49e146888d1c1c0c8dd2252a7a8d7a01 /Source/Core/Common/StringUtil.h | |
| parent | 97ebb02a07dcbaf9efaab3f084cb8cb917b53ef5 (diff) | |
| parent | 0c6fd47460cb59c1b58c8870a4d2f05c23d8f357 (diff) | |
Merge pull request #4472 from JosJuice/revert-absolute-path
IOS HLE: Replace broken path traversal prevention
Diffstat (limited to 'Source/Core/Common/StringUtil.h')
| -rw-r--r-- | Source/Core/Common/StringUtil.h | 1 |
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, |