diff options
| author | Jules Blok <jules.blok@gmail.com> | 2015-06-25 15:20:16 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2015-06-25 15:20:16 +0200 |
| commit | da7ec7535053f853fb5056d697604dbc73f6ad6e (patch) | |
| tree | 7759450dd0d61cf0c9f0796e9780a2c7657d4a34 /Source/Core/Common/FileSearch.cpp | |
| parent | 75006056f61c4e2ed53a12a4e846230b12919a9d (diff) | |
| parent | acd6cb79a4418ac0f0d5c6e70f210363aafa62f4 (diff) | |
Merge pull request #2643 from comex/fix-do-file-search
Fix DoFileSearch returning the passed-in directories themselves.
Diffstat (limited to 'Source/Core/Common/FileSearch.cpp')
| -rw-r--r-- | Source/Core/Common/FileSearch.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp index 13e99fe88a..b5395cf21c 100644 --- a/Source/Core/Common/FileSearch.cpp +++ b/Source/Core/Common/FileSearch.cpp @@ -28,7 +28,8 @@ static std::vector<std::string> FileSearchWithTest(const std::vector<std::string for (auto& child : entry.children) DoEntry(child); }; - DoEntry(top); + for (auto& child : top.children) + DoEntry(child); } // remove duplicates std::sort(result.begin(), result.end()); @@ -53,6 +54,7 @@ std::vector<std::string> DoFileSearch(const std::vector<std::string>& globs, con }); } +// Result includes the passed directories themselves as well as their subdirectories. std::vector<std::string> FindSubdirectories(const std::vector<std::string>& directories, bool recursive) { return FileSearchWithTest(directories, true, [&](const File::FSTEntry& entry) { |