mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-12 03:14:00 +02:00
Code Issues Projects Releases Wiki Activity

Trying to fix bug again

Browse Source
This commit is contained in:
mathusummut
2019-04-05 00:59:05 +02:00
parent 6612918b0f
commit e8b52942f5
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/shared_lib/include/platform/common/platform_common.h
View File

@@ -240,7 +240,8 @@ namespace Shared {
bool StartsWith(const std::string &str, const std::string &key); bool StartsWith(const std::string &str, const std::string &key);
bool EndsWith(const string &str, const string& key); bool EndsWith(const string &str, const string& key);
string endPathWithSlash(string &path, bool requireOSSlash = false); string endPathWithSlash(string& path, bool requireOSSlash = false);
string endPathWithSlash(string&& path, bool requireOSSlash = false);
string trimPathWithStartingSlash(string &path); string trimPathWithStartingSlash(string &path);
string updatePathClimbingParts(string &path, bool processPreviousDirTokenCheck = true); string updatePathClimbingParts(string &path, bool processPreviousDirTokenCheck = true);
string formatPath(string path); string formatPath(string path);

13
source/shared_lib/sources/platform/common/platform_common.cpp
View File

@@ -552,6 +552,19 @@ namespace Shared {
return result; return result;
} }
string endPathWithSlash(string&& path, bool requireOSSlash) {
if (EndsWith(path, "/") == false && EndsWith(path, "\\") == false) {
string seperator = "/";
if (requireOSSlash == true) {
#if defined(WIN32)
seperator = "\\";
#endif
}
path += seperator;
}
return path;
}
string endPathWithSlash(string &path, bool requireOSSlash) { string endPathWithSlash(string &path, bool requireOSSlash) {
if (EndsWith(path, "/") == false && EndsWith(path, "\\") == false) { if (EndsWith(path, "/") == false && EndsWith(path, "\\") == false) {
string seperator = "/"; string seperator = "/";