GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-06-04 11:13:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #33, fix for lexically_normal

Browse Source
This commit is contained in:
Steffen Schuemann 2019-10-23 23:08:15 +02:00
parent cf5188899b
commit 9db85faf14
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/ghc/filesystem.hpp
View File

@ -2621,6 +2621,7 @@ GHC_INLINE bool path::is_relative() const
GHC_INLINE path path::lexically_normal() const GHC_INLINE path path::lexically_normal() const
{ {
path dest; path dest;
bool lastDotDot = false;
for (const string_type& s : *this) { for (const string_type& s : *this) {
if (s == ".") { if (s == ".") {
dest /= ""; dest /= "";
@ -2639,17 +2640,14 @@ GHC_INLINE path path::lexically_normal() const
continue; continue;
} }
} }
dest /= s; if (!(s.empty() && lastDotDot)) {
dest /= s;
}
lastDotDot = s == "..";
} }
if (dest.empty()) { if (dest.empty()) {
dest = "."; dest = ".";
} }
else {
static const path suffix[2] = {"", ".."};
if(std::equal(std::reverse_iterator<path::const_iterator>(dest.end()), std::reverse_iterator<path::const_iterator>(dest.begin()), suffix)) {
dest._path.pop_back();
}
}
return dest; return dest;
} }