diff options
author | Benjamin Kramer <benny.kra@googlemail.com> | 2016-10-17 13:28:21 +0000 |
---|---|---|
committer | Benjamin Kramer <benny.kra@googlemail.com> | 2016-10-17 13:28:21 +0000 |
commit | 937dd7af2d262af1e3deaddd11906484d7ad8b76 (patch) | |
tree | 07052d294842830e0ebe484d71ae183cae3ddb9a /llvm/lib/Support/Path.cpp | |
parent | cdcd403bc2223e6ed71323fe2b36030e9a7bc674 (diff) | |
download | bcm5719-llvm-937dd7af2d262af1e3deaddd11906484d7ad8b76.tar.gz bcm5719-llvm-937dd7af2d262af1e3deaddd11906484d7ad8b76.zip |
[Support] remove_dots: Remove .. from absolute paths.
/../foo is still a proper path after removing the dotdot. This should
now finally match https://9p.io/sys/doc/lexnames.html [Cleaning names].
llvm-svn: 284384
Diffstat (limited to 'llvm/lib/Support/Path.cpp')
-rw-r--r-- | llvm/lib/Support/Path.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/llvm/lib/Support/Path.cpp b/llvm/lib/Support/Path.cpp index 4374cba4988..b2d645779b0 100644 --- a/llvm/lib/Support/Path.cpp +++ b/llvm/lib/Support/Path.cpp @@ -707,11 +707,14 @@ static SmallString<256> remove_dots(StringRef path, bool remove_dot_dot) { for (StringRef C : llvm::make_range(path::begin(rel), path::end(rel))) { if (C == ".") continue; - // Leading ".." will remain in the path. - if (remove_dot_dot && C == ".." && !components.empty() && - components.back() != "..") { - components.pop_back(); - continue; + // Leading ".." will remain in the path unless it's at the root. + if (remove_dot_dot && C == "..") { + if (!components.empty() && components.back() != "..") { + components.pop_back(); + continue; + } + if (path::is_absolute(path)) + continue; } components.push_back(C); } |