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

glob matching fixes

master
Daniel Kolesa 2017-06-10 18:21:11 +02:00
parent 75b70e7227
commit 5396f6b2a5
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ostd/filesystem.hh
View File

@ -113,13 +113,18 @@ namespace detail {
typename filesystem::path::value_type const *wname
) {
/* skip any matching prefix if present */
while (*wname && (*wname != '*')) {
/* wildcard/other escapes */
if ((*wname == '\\') && !*++wname) {
break;
}
if (!*fname || (*fname++ != *wname++)) {
return false;
if (*wname && (*wname != '*')) {
for (;;) {
/* wildcard/other escapes */
if (*wname == '\\') {
++wname;
}
if (!*wname || (*wname == '*')) {
break;
}
if (*fname++ != *wname++) {
return false;
}
}
}
/* skip wildcards; a wildcard matches 0 or more */
@ -136,6 +141,10 @@ namespace detail {
if (!*fname) {
return true;
}
/* empty pattern and non-empty filename */
if (!*wname) {
return false;
}
/* keep incrementing filename until it matches */
while (*fname) {
if (glob_matches_filename(fname, wname)) {
@ -175,7 +184,7 @@ namespace detail {
if (*(cs + 1) == '*') {
filesystem::recursive_directory_iterator it{ip};
for (auto &de: it) {
auto p = de.path();
auto p = de.path().filename();
if (
!glob_matches_filename(p.c_str(), cur.c_str())
) {
@ -186,7 +195,7 @@ namespace detail {
} else {
filesystem::directory_iterator it{ip};
for (auto &de: it) {
auto p = de.path();
auto p = de.path().filename();
if (
!glob_matches_filename(p.c_str(), cur.c_str())
) {