atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] correct windows file join 'c:/../' ==> 'c:/'

Browse Source
This commit is contained in:
Edouard DUPIN 2016-10-06 23:01:00 +02:00
parent bc4c8e2551
commit dd40b60744
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
etk/os/FSNode.cpp
View File

@ -113,12 +113,26 @@ std::string etk::simplifyPath(std::string _input) {
if (_input.size() == 0) { if (_input.size() == 0) {
_input = "/"; _input = "/";
} }
if ( _input == "/../" #ifdef __TARGET_OS__Windows
|| _input == "/.." std::string base;
|| _input == "/./" base += _input[0];
|| _input == "/.") { base += ":";
_input = "/"; if ( _input == base + "/../"
} || _input == base + "/.."
|| _input == base + "/./"
|| _input == base + "/."
|| _input == "/") {
_input = base + "/";
}
#else
if ( _input == "/../"
|| _input == "/.."
|| _input == "/./"
|| _input == "/.") {
_input = "/";
}
#endif
TK_DEBUG("Simplify(end) : '" << _input << "'"); TK_DEBUG("Simplify(end) : '" << _input << "'");
return _input; return _input;
} }