AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Win32 unicode-escape fix (all paths now sanitized with '/')

This commit is contained in:
Jack Andersen 2015-11-10 17:40:13 -10:00
parent cbb0951c09
commit 1f3ac3805e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hecl/lib/HECL.cpp
View File

@ -7,24 +7,36 @@ LogVisor::LogModule LogModule("HECL");
void SanitizePath(std::string& path) void SanitizePath(std::string& path)
{ {
if (path.empty())
return;
path.erase(std::remove(path.begin(), path.end(), '\n'), path.end()); path.erase(std::remove(path.begin(), path.end(), '\n'), path.end());
path.erase(std::remove(path.begin(), path.end(), '\r'), path.end()); path.erase(std::remove(path.begin(), path.end(), '\r'), path.end());
std::transform(path.begin(), path.end(), path.begin(), [](const char a) -> char { std::string::iterator p1 = path.begin();
std::transform(path.begin(), path.end(), path.begin(), [&](const char a) -> char {
++p1;
static const std::string illegals {"<>?*\"|"}; static const std::string illegals {"<>?*\"|"};
if (illegals.find_first_of(a) != std::string::npos) if (illegals.find_first_of(a) != std::string::npos)
return '_'; return '_';
if (a == '\\' && (p1 == path.end() || *p1 != '\\'))
return '/';
return a; return a;
}); });
} }
void SanitizePath(std::wstring& path) void SanitizePath(std::wstring& path)
{ {
if (path.empty())
return;
path.erase(std::remove(path.begin(), path.end(), L'\n'), path.end()); path.erase(std::remove(path.begin(), path.end(), L'\n'), path.end());
path.erase(std::remove(path.begin(), path.end(), L'\r'), path.end()); path.erase(std::remove(path.begin(), path.end(), L'\r'), path.end());
std::transform(path.begin(), path.end(), path.begin(), [](const wchar_t a) -> wchar_t { std::wstring::iterator p1 = path.begin();
std::transform(path.begin(), path.end(), path.begin(), [&](const wchar_t a) -> wchar_t {
++p1;
static const std::wstring illegals {L"<>?*\"|"}; static const std::wstring illegals {L"<>?*\"|"};
if (illegals.find_first_of(a) != std::wstring::npos) if (illegals.find_first_of(a) != std::wstring::npos)
return L'_'; return L'_';
if (a == L'\\' && (p1 == path.end() || *p1 != L'\\'))
return L'/';
return a; return a;
}); });
} }