From 324a66a104f43d6709258c552dd63428250f03c0 Mon Sep 17 00:00:00 2001
From: "Samuel D. Crow" <samuraileumas@yahoo.com>
Date: Fri, 6 Oct 2023 14:10:30 -0500
Subject: [PATCH] Improve POSIX compliance in CLI/FileUtils.cpp

---
 CLI/FileUtils.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/CLI/FileUtils.cpp b/CLI/FileUtils.cpp
index 71e536c7..8365e4c6 100644
--- a/CLI/FileUtils.cpp
+++ b/CLI/FileUtils.cpp
@@ -165,11 +165,14 @@ static bool traverseDirectoryRec(const std::string& path, const std::function<vo
         {
             joinPaths(buf, path.c_str(), data.d_name);
 
-            int type = data.d_type;
-            int mode = -1;
+#if defined(ATTOIF)
+            mode_t mode = ATTOIF(data.d_type);
+#else
+            mode_t mode = 0;
+#endif
 
-            // we need to stat DT_UNKNOWN to be able to tell the type
-            if (type == DT_UNKNOWN)
+            // we need to stat an UNKNOWN to be able to tell the type
+            if ((mode & S_IFMT) == 0)
             {
                 struct stat st = {};
 #ifdef _ATFILE_SOURCE
@@ -181,15 +184,15 @@ static bool traverseDirectoryRec(const std::string& path, const std::function<vo
                 mode = st.st_mode;
             }
 
-            if (type == DT_DIR || mode == S_IFDIR)
+            if (mode & S_IFDIR)
             {
                 traverseDirectoryRec(buf, callback);
             }
-            else if (type == DT_REG || mode == S_IFREG)
+            else if (mode & S_IFREG)
             {
                 callback(buf);
             }
-            else if (type == DT_LNK || mode == S_IFLNK)
+            else if (mode & S_IFLNK)
             {
                 // Skip symbolic links to avoid handling cycles
             }