GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-06-04 11:13:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-104-posix-iterator-performance'

Browse Source
This commit is contained in:
Steffen Schuemann 2021-02-27 17:51:53 +01:00
commit f37cdd5af5
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/ghc/filesystem.hpp
View File

@ -2219,12 +2219,12 @@ GHC_INLINE file_status status_ex(const path& p, std::error_code& ec, file_status
if (result == 0) { if (result == 0) {
ec.clear(); ec.clear();
file_status fs = detail::file_status_from_st_mode(st.st_mode); file_status fs = detail::file_status_from_st_mode(st.st_mode);
if (fs.type() == file_type::symlink) {
result = ::stat(p.c_str(), &st);
if (result == 0) {
if (sls) { if (sls) {
*sls = fs; *sls = fs;
} }
if (fs.type() == file_type::symlink) {
result = ::stat(p.c_str(), &st);
if (result == 0) {
fs = detail::file_status_from_st_mode(st.st_mode); fs = detail::file_status_from_st_mode(st.st_mode);
} }
} }
@ -5480,7 +5480,7 @@ public:
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.assign(_current, ec);
if (ec && (ec.value() == EACCES || ec.value() == EPERM) && (_options & directory_options::skip_permission_denied) == directory_options::skip_permission_denied) { if (ec && (ec.value() == EACCES || ec.value() == EPERM) && (_options & directory_options::skip_permission_denied) == directory_options::skip_permission_denied) {
ec.clear(); ec.clear();
skip = true; skip = true;
@ -5723,13 +5723,10 @@ GHC_INLINE recursive_directory_iterator& recursive_directory_iterator::operator+
GHC_INLINE recursive_directory_iterator& recursive_directory_iterator::increment(std::error_code& ec) noexcept GHC_INLINE recursive_directory_iterator& recursive_directory_iterator::increment(std::error_code& ec) noexcept
{ {
auto status = (*this)->status(ec); bool isDir = (*this)->is_directory(ec);
if (ec) bool isSymLink = !ec && (*this)->is_symlink(ec);
return *this; if(!ec) {
auto symlink_status = (*this)->symlink_status(ec); if (recursion_pending() && isDir && (!isSymLink || (options() & directory_options::follow_directory_symlink) != directory_options::none)) {
if (ec)
return *this;
if (recursion_pending() && is_directory(status) && (!is_symlink(symlink_status) || (options() & directory_options::follow_directory_symlink) != directory_options::none)) {
_impl->_dir_iter_stack.push(directory_iterator((*this)->path(), _impl->_options, ec)); _impl->_dir_iter_stack.push(directory_iterator((*this)->path(), _impl->_options, ec));
} }
else { else {
@ -5745,6 +5742,7 @@ GHC_INLINE recursive_directory_iterator& recursive_directory_iterator::increment
_impl->_dir_iter_stack.pop(); _impl->_dir_iter_stack.pop();
} }
_impl->_recursion_pending = true; _impl->_recursion_pending = true;
}
return *this; return *this;
} }