Ticket #3803: filezilla-03-dirent-to-stat.diff

filezilla-3.1.3/src/engine/local_filesys.cpp

@@ -363 +363 @@
 
     const wxCharBuffer p = path.fn_str();
     const int len = strlen(p);
-    m_raw_path = new char[len + NAME_MAX + 2];
+    m_raw_path = new char[len + _POSIX_NAME_MAX + 2];
     strcpy(m_raw_path, p);
     if (len > 1)
     {
@@ -427 +427 @@
         return false;
 
     struct dirent* entry;
+    struct stat statbuf;
     while ((entry = readdir(m_dir)))
     {
         if (!entry->d_name[0] ||
@@ -436 +437 @@
 
         if (m_dirs_only)
         {
-            if (entry->d_type == DT_LNK)
+            if (stat(entry->d_name, &statbuf) == -1)
+                continue;
+            if (S_ISLNK(statbuf.st_mode))
             {
                 bool wasLink;
                 strcpy(m_file_part, entry->d_name);
                 if (GetFileInfo(m_raw_path, wasLink, 0, 0, 0) != dir)
                     continue;
             }
-            else if (entry->d_type != DT_DIR)
+            else if (!S_ISDIR(statbuf.st_mode))
                 continue;
         }
 
@@ -505 +508 @@
         return false;
 
     struct dirent* entry;
+    struct stat statbuf;
     while ((entry = readdir(m_dir)))
     {
         if (!entry->d_name[0] ||
@@ -514 +518 @@
 
         if (m_dirs_only)
         {
-            if (entry->d_type == DT_LNK)
+            if (stat(entry->d_name, &statbuf) == -1)
+                continue;
+            if (S_ISLNK(statbuf.st_mode))
             {
                 strcpy(m_file_part, entry->d_name);
                 enum local_fileType type = GetFileInfo(m_raw_path, isLink, size, modificationTime, mode);
@@ -525 +531 @@
                 is_dir = type == dir;
                 return true;
             }
-            else if (entry->d_type != DT_DIR)
+            else if (!S_ISDIR(statbuf.st_mode))
                 continue;
         }