From 82982e037dea53b334070699471e682fb023dc9e Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 12 Dec 2022 13:25:19 +0300
Subject: Support detecting inaccessible/dangling entries in dir_iterator,
 path_search()

---
 libbutl/filesystem.ixx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'libbutl/filesystem.ixx')

diff --git a/libbutl/filesystem.ixx b/libbutl/filesystem.ixx
index 763d311..193eae9 100644
--- a/libbutl/filesystem.ixx
+++ b/libbutl/filesystem.ixx
@@ -11,7 +11,7 @@ namespace butl
   {
     // @@ Could 0 size be a valid and faster way?
     //
-    return dir_iterator (d, false /* ignore_dangling */) == dir_iterator ();
+    return dir_iterator (d, dir_iterator::no_follow) == dir_iterator ();
   }
 
   inline bool
@@ -168,23 +168,23 @@ namespace butl
   inline entry_type dir_entry::
   ltype () const
   {
-    return t_ != entry_type::unknown ? t_ : (t_ = type (false));
+    return t_ ? *t_ : *(t_ = type (false /* follow_symlinks */));
   }
 
   inline entry_type dir_entry::
   type () const
   {
     entry_type t (ltype ());
-    return t != entry_type::symlink
-      ? t
-      : lt_ != entry_type::unknown ? lt_ : (lt_ = type (true));
+    return t != entry_type::symlink ? t    :
+           lt_                      ? *lt_ :
+           *(lt_ = type (true /* follow_symlinks */));
   }
 
   // dir_iterator
   //
   inline dir_iterator::
   dir_iterator (dir_iterator&& x) noexcept
-    : e_ (std::move (x.e_)), h_ (x.h_), ignore_dangling_ (x.ignore_dangling_)
+    : e_ (std::move (x.e_)), h_ (x.h_), mode_ (x.mode_)
   {
 #ifndef _WIN32
     x.h_ = nullptr;
-- 
cgit v1.1