generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-23 13:32:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #369 from RangelReale/globbasepath

Browse Source 
* Glob from start path, for platforms where it is not possible to transverse from root (Android)
This commit is contained in:
Aleksandar Fabijanic
2014-01-21 17:56:41 -08:00
parent 70c467c56c 12c2b3d290
commit 3ac44359dd
3 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Foundation/include/Poco/Glob.h
View File

@@ -139,6 +139,18 @@ public:
/// Directories that for whatever reason cannot be traversed are
/// ignored.
static void glob(const Path& pathPattern, const Path& basePath, std::set<std::string>& files, int options = 0);
/// Creates a set of files that match the given pathPattern, starting from basePath.
///
/// The pattern may contain wildcard expressions even in intermediate
/// directory names (e.g. /usr/include/*/*.h).
///
/// Note that, for obvious reasons, escaping characters in a pattern
/// with a backslash does not work in Windows-style paths.
///
/// Directories that for whatever reason cannot be traversed are
/// ignored.
protected:
bool match(TextIterator& itp, const TextIterator& endp, TextIterator& its, const TextIterator& ends);
bool matchAfterAsterisk(TextIterator itp, const TextIterator& endp, TextIterator its, const TextIterator& ends);

12
Foundation/src/Glob.cpp
View File

@@ -106,6 +106,18 @@ void Glob::glob(const Path& pathPattern, std::set<std::string>& files, int optio
}
void Glob::glob(const Path& pathPattern, const Path& basePath, std::set<std::string>& files, int options)
{
Path pattern(pathPattern);
pattern.makeDirectory(); // to simplify pattern handling later on
Path absBase(basePath);
absBase.makeAbsolute();
if (pathPattern.isDirectory())
options |= GLOB_DIRS_ONLY;
collect(pattern, absBase, basePath, pathPattern[basePath.depth()], files, options);
}
bool Glob::match(TextIterator& itp, const TextIterator& endp, TextIterator& its, const TextIterator& ends)
{
while (itp != endp)

8
Foundation/testsuite/src/GlobTest.cpp
View File

@@ -470,6 +470,14 @@ void GlobTest::testGlob()
assert (files.find("globtest/src/") != files.end());
assert (files.find("globtest/testsuite/") != files.end());
files.clear();
Glob::glob("globtest/testsuite/src/*", "globtest/testsuite/", files);
translatePaths(files);
assert (files.size() == 3);
assert (files.find("globtest/testsuite/src/test.h") != files.end());
assert (files.find("globtest/testsuite/src/test.c") != files.end());
assert (files.find("globtest/testsuite/src/main.c") != files.end());
#if !defined(_WIN32_WCE)
// won't work if current directory is root dir
files.clear();