From 20d9c431cea0554f5366bfbed569b310105835f6 Mon Sep 17 00:00:00 2001 From: Shannon Booth Date: Sat, 15 Feb 2020 13:31:19 +1300 Subject: [PATCH] Shell: Use SkipParentAndBaseDir flag in DirIterator --- Shell/main.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Shell/main.cpp b/Shell/main.cpp index a9ff6c3776..d7d17ad6ff 100644 --- a/Shell/main.cpp +++ b/Shell/main.cpp @@ -574,7 +574,7 @@ static Vector expand_globs(const StringView& path, const StringView& bas StringView new_base_v = new_base; if (new_base_v.is_empty()) new_base_v = "."; - Core::DirIterator di(new_base_v, Core::DirIterator::NoFlags); + Core::DirIterator di(new_base_v, Core::DirIterator::SkipParentAndBaseDir); if (di.has_error()) { return res; @@ -587,10 +587,6 @@ static Vector expand_globs(const StringView& path, const StringView& bas if (name[0] == '.' && part[0] != '.') continue; - // And even if they are, skip . and .. - if (name == "." || name == "..") - continue; - if (name.matches(part, String::CaseSensitivity::CaseSensitive)) { StringBuilder nested_base;