This is an archive of the discontinued LLVM Phabricator instance.

Differential D25561

Do not delete leading ../ in remove_dots.
ClosedPublic

Authored by ioeric on Oct 13 2016, 7:59 AM.

Details

Reviewers
bkramer
Commits
rGaf5a28fe879e: Do not delete leading ../ in remove_dots.
rL284129: Do not delete leading ../ in remove_dots.

Diff Detail

Repository
rL LLVM

Event Timeline

ioeric updated this revision to Diff 74515.Oct 13 2016, 7:59 AM
ioeric retitled this revision from to Do not delete leading ../ in remove_dots..
ioeric updated this object.
ioeric added a reviewer: bkramer.
ioeric added a subscriber: llvm-commits.
bkramer accepted this revision.Oct 13 2016, 8:01 AM
bkramer edited edge metadata.

lgtm

This revision is now accepted and ready to land.Oct 13 2016, 8:01 AM
ioeric updated this revision to Diff 74521.Oct 13 2016, 8:09 AM
ioeric edited edge metadata.
  • Fixed a bug when there are mutliple leading ../ and added a test case.
Closed by commit rL284129: Do not delete leading ../ in remove_dots. (authored by ioeric). · Explain WhyOct 13 2016, 8:16 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
include/
llvm/
Support/
3 lines
lib/
Support/
11 lines
unittests/
Support/
4 lines

Diff 74523

llvm/trunk/include/llvm/Support/Path.h

Show First 20 Lines • Show All 439 Lines • ▼ Show 20 Lines
/// ///
/// @param path Input path. /// @param path Input path.
/// @result The cleaned-up \a path. /// @result The cleaned-up \a path.
StringRef remove_leading_dotslash(StringRef path); StringRef remove_leading_dotslash(StringRef path);
/// @brief In-place remove any './' and optionally '../' components from a path. /// @brief In-place remove any './' and optionally '../' components from a path.
/// ///
/// @param path processed path /// @param path processed path
/// @param remove_dot_dot specify if '../' should be removed /// @param remove_dot_dot specify if '../' (except for leading "../") should be
/// removed
/// @result True if path was changed /// @result True if path was changed
bool remove_dots(SmallVectorImpl<char> &path, bool remove_dot_dot = false); bool remove_dots(SmallVectorImpl<char> &path, bool remove_dot_dot = false);
} // end namespace path } // end namespace path
} // end namespace sys } // end namespace sys
} // end namespace llvm } // end namespace llvm
#endif #endif

llvm/trunk/lib/Support/Path.cpp

Show First 20 Lines • Show All 701 Lines • ▼ Show 20 Lines
static SmallString<256> remove_dots(StringRef path, bool remove_dot_dot) { static SmallString<256> remove_dots(StringRef path, bool remove_dot_dot) {
SmallVector<StringRef, 16> components; SmallVector<StringRef, 16> components;
// Skip the root path, then look for traversal in the components. // Skip the root path, then look for traversal in the components.
StringRef rel = path::relative_path(path); StringRef rel = path::relative_path(path);
for (StringRef C : llvm::make_range(path::begin(rel), path::end(rel))) { for (StringRef C : llvm::make_range(path::begin(rel), path::end(rel))) {
if (C == ".") if (C == ".")
continue; continue;
if (remove_dot_dot) { // Leading ".." will remain in the path.
if (C == "..") { if (remove_dot_dot && C == ".." && !components.empty() &&
if (!components.empty()) components.back() != "..") {
components.pop_back(); components.pop_back();
continue; continue;
} }
}
components.push_back(C); components.push_back(C);
} }
SmallString<256> buffer = path::root_path(path); SmallString<256> buffer = path::root_path(path);
for (StringRef C : components) for (StringRef C : components)
path::append(buffer, C); path::append(buffer, C);
return buffer; return buffer;
} }
▲ Show 20 Lines • Show All 464 Lines • Show Last 20 Lines

llvm/trunk/unittests/Support/Path.cpp

Show First 20 Lines • Show All 959 Lines • ▼ Show 20 Lines
TEST(Support, RemoveDots) { TEST(Support, RemoveDots) {
#if defined(LLVM_ON_WIN32) #if defined(LLVM_ON_WIN32)
EXPECT_EQ("foolz\\wat", remove_dots(".\\.\\\\foolz\\wat", false)); EXPECT_EQ("foolz\\wat", remove_dots(".\\.\\\\foolz\\wat", false));
EXPECT_EQ("", remove_dots(".\\\\\\\\\\", false)); EXPECT_EQ("", remove_dots(".\\\\\\\\\\", false));
EXPECT_EQ("a\\..\\b\\c", remove_dots(".\\a\\..\\b\\c", false)); EXPECT_EQ("a\\..\\b\\c", remove_dots(".\\a\\..\\b\\c", false));
EXPECT_EQ("b\\c", remove_dots(".\\a\\..\\b\\c", true)); EXPECT_EQ("b\\c", remove_dots(".\\a\\..\\b\\c", true));
EXPECT_EQ("c", remove_dots(".\\.\\c", true)); EXPECT_EQ("c", remove_dots(".\\.\\c", true));
EXPECT_EQ("..\\a\\c", remove_dots("..\\a\\b\\..\\c", true));
EXPECT_EQ("..\\..\\a\\c", remove_dots("..\\..\\a\\b\\..\\c", true));
SmallString<64> Path1(".\\.\\c"); SmallString<64> Path1(".\\.\\c");
EXPECT_TRUE(path::remove_dots(Path1, true)); EXPECT_TRUE(path::remove_dots(Path1, true));
EXPECT_EQ("c", Path1); EXPECT_EQ("c", Path1);
#else #else
EXPECT_EQ("foolz/wat", remove_dots("././/foolz/wat", false)); EXPECT_EQ("foolz/wat", remove_dots("././/foolz/wat", false));
EXPECT_EQ("", remove_dots("./////", false)); EXPECT_EQ("", remove_dots("./////", false));
EXPECT_EQ("a/../b/c", remove_dots("./a/../b/c", false)); EXPECT_EQ("a/../b/c", remove_dots("./a/../b/c", false));
EXPECT_EQ("b/c", remove_dots("./a/../b/c", true)); EXPECT_EQ("b/c", remove_dots("./a/../b/c", true));
EXPECT_EQ("c", remove_dots("././c", true)); EXPECT_EQ("c", remove_dots("././c", true));
EXPECT_EQ("../a/c", remove_dots("../a/b/../c", true));
EXPECT_EQ("../../a/c", remove_dots("../../a/b/../c", true));
SmallString<64> Path1("././c"); SmallString<64> Path1("././c");
EXPECT_TRUE(path::remove_dots(Path1, true)); EXPECT_TRUE(path::remove_dots(Path1, true));
EXPECT_EQ("c", Path1); EXPECT_EQ("c", Path1);
#endif #endif
} }
TEST(Support, ReplacePathPrefix) { TEST(Support, ReplacePathPrefix) {
▲ Show 20 Lines • Show All 144 Lines • Show Last 20 Lines