compat UPDATE check for dirent.d_type

Author: Roytak

CMakeModules/UseCompat.cmake

@@ -18,6 +18,7 @@ include(CheckSymbolExists)
 include(CheckFunctionExists)
 include(CheckIncludeFile)
 include(TestBigEndian)
+include(CheckStructHasMember)
 if(POLICY CMP0075)
     cmake_policy(SET CMP0075 NEW)
 endif()
@@ -63,6 +64,8 @@ macro(USE_COMPAT)
 
     check_include_file("byteswap.h" HAVE_BYTESWAP_H)
 
+    check_struct_has_member("struct dirent" d_type "dirent.h" HAVE_DIRENT_D_TYPE)
+
     list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D_POSIX_C_SOURCE=200809L)
     list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
     list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D__BSD_VISIBLE=1)

compat/compat.h.in

@@ -86,6 +86,7 @@
 #cmakedefine HAVE_MMAP
 #cmakedefine HAVE_STRCASECMP
 #cmakedefine HAVE_SETENV
+#cmakedefine HAVE_DIRENT_D_TYPE
 
 #ifndef bswap64
 #define bswap64(val) \

src/tree_schema.c

@@ -2349,13 +2349,28 @@ lys_search_localfile_file_type(const struct dirent *file, const char *wd, struct
 {
     LY_ERR rc = LY_SUCCESS;
     char *str = NULL;
-    ly_bool is_dir = 0, is_reg = 0;
+    ly_bool is_dir = 0, is_reg = 0, need_stat = 1;
     struct stat st;
 
     *skip = 0;
 
-    if ((file->d_type == DT_UNKNOWN) || (file->d_type == DT_LNK)) {
-        /* FS does not support this field or its a symbolic link, need to call stat */
+#ifdef HAVE_DIRENT_D_TYPE
+    if (file->d_type == DT_DIR) {
+        /* dirent - dir */
+        is_dir = 1;
+        need_stat = 0;
+    } else if (file->d_type == DT_REG) {
+        /* dirent - file */
+        is_reg = 1;
+        need_stat = 0;
+    } else if ((file->d_type != DT_UNKNOWN) && (file->d_type != DT_LNK)) {
+        /* it is a known type, but not dir or regular file, so trust d_type and just skip it */
+        need_stat = 0;
+    }
+#endif // HAVE_DIRENT_D_TYPE
+
+    if (need_stat) {
+        /* need to use stat to determine the file type */
         if (asprintf(&str, "%s/%s", wd, file->d_name) == -1) {
             LOGMEM(NULL);
             rc = LY_EMEM;
@@ -2371,12 +2386,6 @@ lys_search_localfile_file_type(const struct dirent *file, const char *wd, struct
             /* stat - file */
             is_reg = 1;
         }
-    } else if (file->d_type == DT_DIR) {
-        /* dirent - dir */
-        is_dir = 1;
-    } else if (file->d_type == DT_REG) {
-        /* dirent - file */
-        is_reg = 1;
     }
 
     if (is_dir && (dirs->count || !implicit_cwd)) {