projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b00fb46
)
Revert "Use possibly cached directory entry values when performing recursive director...
author
Eric Fiselier
<eric@efcs.ca>
Mon, 23 Jul 2018 21:52:29 +0000
(21:52 +0000)
committer
Eric Fiselier
<eric@efcs.ca>
Mon, 23 Jul 2018 21:52:29 +0000
(21:52 +0000)
This reverts commit
04ce4aef00d3ee508327f6cf7bf1b1d200ab6238
.
llvm-svn: 337749
libcxx/src/experimental/filesystem/directory_iterator.cpp
patch
|
blob
|
history
diff --git
a/libcxx/src/experimental/filesystem/directory_iterator.cpp
b/libcxx/src/experimental/filesystem/directory_iterator.cpp
index
7b485b4
..
a6f10d0
100644
(file)
--- a/
libcxx/src/experimental/filesystem/directory_iterator.cpp
+++ b/
libcxx/src/experimental/filesystem/directory_iterator.cpp
@@
-359,13
+359,13
@@
bool recursive_directory_iterator::__try_recursion(error_code *ec) {
bool skip_rec = false;
error_code m_ec;
if (!rec_sym) {
- file_status st
(curr_it.__entry_.__get_sym_ft(&m_ec)
);
+ file_status st
= curr_it.__entry_.symlink_status(m_ec
);
if (m_ec && status_known(st))
m_ec.clear();
if (m_ec || is_symlink(st) || !is_directory(st))
skip_rec = true;
} else {
- file_status st
(curr_it.__entry_.__get_ft(&m_ec)
);
+ file_status st
= curr_it.__entry_.status(m_ec
);
if (m_ec && status_known(st))
m_ec.clear();
if (m_ec || !is_directory(st))