Ticket #468: zaz-1.0.0.patch

src/directorylister.cpp

@@ -19 +19 @@
 #include "directorylister.h"
 #ifndef WIN32
 
+#ifndef DT_DIR
+/* dirent.d_type is a BSD extension, not part of POSIX */
+#include <dirent.h>
 #include <sys/stat.h>
+#include <string.h>
+
+static int
+is_dir (const char *path, const char *name)
+{
+  int len1 = strlen(path);
+  int len2 = strlen(name);
+
+  char pathname[len1 + 1 + len2 + 1 + 13];
+  strcpy (pathname, path);
+
+  /* Avoid UNC-path "//name" on Cygwin.  */
+  if (len1 > 0 && pathname[len1 - 1] != '/')
+    strcat (pathname, "/");
+
+  strcat (pathname, name);
+
+  struct stat st;
+  if (stat (pathname, &st))
+    return 0;
+  return S_ISDIR (st.st_mode);
+}
+#endif
 
 vector<string> ListFiles(string dir, const string extension)
 {
@@ -34 +60 @@
     {
         bool isFile = false;
 
-        if (file->d_type == DT_REG)
+        if (is_dir (dir.c_str(), file->d_name))
             isFile = true;
 
         if (!isFile)