GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-08-14 09:25:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #68, better permission error handling for directory_iteratior with skip_permissions_denied

Browse Source
This commit is contained in:
Steffen Schuemann 2020-08-20 21:58:34 +02:00
parent 3f1c185ab4
commit 2ea00170e1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/ghc/filesystem.hpp
View File

@ -5195,13 +5195,19 @@ public:
void increment(std::error_code& ec) void increment(std::error_code& ec)
{ {
if (_dir) { if (_dir) {
bool skip;
do { do {
skip = false;
errno = 0; errno = 0;
_entry = readdir(_dir); _entry = ::readdir(_dir);
if (_entry) { if (_entry) {
_current = _base; _current = _base;
_current.append_name(_entry->d_name); _current.append_name(_entry->d_name);
_dir_entry = directory_entry(_current, ec); _dir_entry = directory_entry(_current, ec);
if(ec && (ec.value() == EACCES || ec.value() == EPERM) && (_options & directory_options::skip_permission_denied) == directory_options::skip_permission_denied) {
ec.clear();
skip = true;
}
} }
else { else {
::closedir(_dir); ::closedir(_dir);
@ -5212,7 +5218,7 @@ public:
} }
break; break;
} }
} while (std::strcmp(_entry->d_name, ".") == 0 || std::strcmp(_entry->d_name, "..") == 0); } while (skip || std::strcmp(_entry->d_name, ".") == 0 || std::strcmp(_entry->d_name, "..") == 0);
} }
} }
path _base; path _base;