Fix compile errors in coreclr/tools/superpmi/mcs/merbmerge.cpp

  /runtime/src/coreclr/tools/superpmi/mcs/verbmerge.cpp: In static member function 'static bool verbMerge::DirectoryFilterDirectories(FilterArgType*)':
  /runtime/src/coreclr/tools/superpmi/mcs/verbmerge.cpp:188:19: error: 'verbMerge::FilterArgType' {aka 'struct dirent'} has no member named 'd_type'
    188 |     if (findData->d_type == DT_DIR)
        |                   ^~~~~~

and similar a few other places in this file

Author: gwr

src/coreclr/tools/superpmi/mcs/verbmerge.cpp

@@ -13,6 +13,13 @@
 #include <fnmatch.h>
 #endif
 
+#if !HAVE_DIRENT_D_TYPE
+#define DT_UNKNOWN 0
+#define DT_DIR 4
+#define DT_REG 8
+#define DT_LNK 10
+#endif
+
 #include <utility>
 
 // Do reads/writes in large 256MB chunks.
@@ -185,7 +192,7 @@ bool verbMerge::DirectoryFilterDirectories(FilterArgType* findData)
         return true;
     }
 #else // TARGET_WINDOWS
-    if (findData->d_type == DT_DIR)
+    if (true)
     {
         if (strcmp(findData->d_name, ".") == 0)
             return false;
@@ -206,13 +213,32 @@ bool verbMerge::DirectoryFilterFile(FilterArgType* findData)
 {
 #ifdef TARGET_WINDOWS
     if ((findData->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
+    {
+        // This is not a directory, so it must be a file.
+        return true;
+    }
 #else // TARGET_WINDOWS
+
+#if HAVE_DIRENT_D_TYPE
     if (findData->d_type != DT_DIR)
-#endif // TARGET_WINDOWS
     {
         // This is not a directory, so it must be a file.
         return true;
     }
+#else // HAVE_DIRENT_D_TYPE
+    struct stat sb;
+
+    if (fstatat(dirfd(dir), entry->d_name, &sb, 0) == -1) {
+        // stat failed. say "not a file" so caller will skip it
+        return false;
+    }
+    if (!S_ISDIR(sb.st_mode)) {
+        // Treat anything not a directory as a file.
+        return true;
+    }
+#endif // HAVE_DIRENT_D_TYPE
+
+#endif // TARGET_WINDOWS
 
     return false;
 }
@@ -281,12 +307,46 @@ int verbMerge::FilterDirectory(LPCWSTR                      dir,
         dirent *pEntry = readdir(pDir);
         while (pEntry != nullptr)
         {
-            if ((fnmatch(searchPatternUtf8.c_str(), pEntry->d_name, 0) == 0) && filter(pEntry))
+            int dirEntryType;
+
+            if ((fnmatch(searchPatternUtf8.c_str(), pEntry->d_name, 0) != 0)
             {
-                FindData findData(pEntry->d_type, ConvertMultiByteToWideChar(pEntry->d_name));
-                first = new findDataList(&findData, first);
-                ++elemCount;
+                continue;
             }
+            if (!filter(pEntry))
+            {
+                continue;
+            }
+
+#if HAVE_DIRENT_D_TYPE
+            dirEntryType = pEntry->d_type;
+#else
+            struct stat sb;
+
+            if (fstatat(dirfd(dir), pEntry->d_name, &sb, 0) == -1)
+            {
+                continue;
+            }
+
+            if (S_ISDIR(sb.st_mode)) {
+                dirEntryType = DT_DIR;
+            } else if (S_ISREG(sb.st_mode)) {
+                dirEntryType = DT_REG;
+            } else if (S_ISLNK(sb.st_mode)) {
+                dirEntryType = DT_LNK;
+            } else {
+                dirEntryType = DT_UNKNOWN;
+            }
+#endif
+            if (dirEntryType == DT_UNKNOWN)
+            {
+                continue;
+            }
+
+            FindData findData(dirEntryType, ConvertMultiByteToWideChar(pEntry->d_name));
+            first = new findDataList(&findData, first);
+            ++elemCount;
+
             errno = 0;
             pEntry = readdir(pDir);
         }