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

avoid bad path formatting in a very ugly way

master
Daniel Kolesa 2017-06-10 21:17:58 +02:00
parent 7ff454140a
commit 054f292393
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ostd/filesystem.hh
View File

@ -190,7 +190,23 @@ namespace detail {
continue;
}
/* otherwise also match files */
glob_match_impl(out, beg, end, dp);
if (pre.empty()) {
/* avoid ugly formatting, sadly we have to do
* with experimental fs api so no better way...
*/
auto dpb = dp.begin(), dpe = dp.end();
if (*dpb == ".") {
++dpb;
}
filesystem::path ap;
while (dpb != dpe) {
ap /= *dpb;
++dpb;
}
glob_match_impl(out, beg, end, ap);
} else {
glob_match_impl(out, beg, end, dp);
}
}
return;
}
@ -203,12 +219,11 @@ namespace detail {
}
filesystem::directory_iterator it{ip};
for (auto &de: it) {
auto dp = de.path();
auto p = dp.filename();
auto p = de.path().filename();
if (!glob_match_filename(p, cur)) {
continue;
}
glob_match_impl(out, beg, end, dp);
glob_match_impl(out, beg, end, pre / p);
}
return;
}