OctaForge
/
libostd
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

more glob fixes, also properly treat ** separately

master
Daniel Kolesa 2017-06-10 18:57:58 +02:00
parent 5396f6b2a5
commit 009f36ba9f
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
ostd/filesystem.hh
View File

@ -174,35 +174,44 @@ namespace detail {
}
continue;
}
/* either * or ** */
auto ip = pre;
if (ip.empty()) {
ip = ".";
}
/* ** as a name does recursive expansion */
if ((c == '*') && (*(cs + 1) == '*') && !*(cs + 2)) {
++beg;
filesystem::recursive_directory_iterator it{ip};
for (auto &de: it) {
/* followed by more path, only consider dirs */
auto dp = de.path();
if ((beg != end) && !filesystem::is_directory(dp)) {
continue;
}
/* otherwise also match files */
auto p = dp.filename();
if (
!glob_matches_filename(p.c_str(), cur.c_str())
) {
continue;
}
glob_match_impl(out, beg, end, dp);
}
return;
}
/* a regular * wildcard */
if (c == '*') {
++beg;
auto ip = pre;
if (ip.empty()) {
ip = ".";
}
if (*(cs + 1) == '*') {
filesystem::recursive_directory_iterator it{ip};
for (auto &de: it) {
auto p = de.path().filename();
if (
!glob_matches_filename(p.c_str(), cur.c_str())
) {
continue;
}
glob_match_impl(out, beg, end, p);
}
} else {
filesystem::directory_iterator it{ip};
for (auto &de: it) {
auto p = de.path().filename();
if (
!glob_matches_filename(p.c_str(), cur.c_str())
) {
continue;
}
glob_match_impl(out, beg, end, p);
filesystem::directory_iterator it{ip};
for (auto &de: it) {
auto dp = de.path();
auto p = dp.filename();
if (
!glob_matches_filename(p.c_str(), cur.c_str())
) {
continue;
}
glob_match_impl(out, beg, end, dp);
}
return;
}