Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- see if this fixes loading issue on windows

Browse Source
This commit is contained in:
Mark Vejvoda 2013-02-01 00:30:32 +00:00
parent 864ef8acec
commit bf71461d78
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -546,8 +546,36 @@ void trimPathWithStartingSlash(string &path) {
} }
void updatePathClimbingParts(string &path) { void updatePathClimbingParts(string &path) {
// Update paths with /./
string::size_type pos = path.find("/./");
if(pos != string::npos && pos != 0) {
string orig = path;
path.erase(pos,2);
pos--;
pos = path.find("/./");
if(pos != string::npos && pos != 0) {
updatePathClimbingParts(path);
}
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("CHANGED relative path from [%s] to [%s]\n",orig.c_str(),path.c_str());
}
pos = path.find("\\.\\");
if(pos != string::npos && pos != 0) {
string orig = path;
path.erase(pos,2);
pos--;
pos = path.find("\\.\\");
if(pos != string::npos && pos != 0) {
updatePathClimbingParts(path);
}
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("CHANGED relative path from [%s] to [%s]\n",orig.c_str(),path.c_str());
}
// Update paths with .. // Update paths with ..
string::size_type pos = path.find(".."); pos = path.find("..");
if(pos != string::npos && pos != 0) { if(pos != string::npos && pos != 0) {
string orig = path; string orig = path;
path.erase(pos,2); path.erase(pos,2);
@ -572,21 +600,6 @@ void updatePathClimbingParts(string &path) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("CHANGED relative path from [%s] to [%s]\n",orig.c_str(),path.c_str()); if(SystemFlags::VERBOSE_MODE_ENABLED) printf("CHANGED relative path from [%s] to [%s]\n",orig.c_str(),path.c_str());
} }
// Update paths with /./
pos = path.find("/./");
if(pos != string::npos && pos != 0) {
string orig = path;
path.erase(pos,2);
pos--;
pos = path.find("/./");
if(pos != string::npos && pos != 0) {
updatePathClimbingParts(path);
}
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("CHANGED relative path from [%s] to [%s]\n",orig.c_str(),path.c_str());
}
/* /*
string::size_type pos = path.rfind(".."); string::size_type pos = path.rfind("..");
if(pos != string::npos && pos != 0) { if(pos != string::npos && pos != 0) {