Changeset 5447:f72fce68ca19 for lib.c

Timestamp:

2008-07-02 09:26:17 (5 months ago)

Author:

Vladimir Marek <Vladimir.Marek@…>

Branch:

HEAD

Message:

Use stat() instead of dirent->d_type to test for directory. Closes #3089.

Files:

• lib.c (modified) (3 diffs)

lib.c

@@ -42 +42 @@
 #include <fcntl.h>
 #include <pwd.h>
+#include <sys/types.h>
 #include <dirent.h>
 
@@ -584 +585 @@
   struct dirent* de;
   char cur[_POSIX_PATH_MAX];
+  struct stat statbuf;
   int rc = 0;
 
@@ -598 +600 @@
     snprintf (cur, sizeof (cur), "%s/%s", path, de->d_name);
     /* XXX make nonrecursive version */
-    if (de->d_type == DT_DIR)
+
+    if (stat(cur, &statbuf) == -1)
+    {
+      rc = 1;
+      continue;
+    }
+
+    if (S_ISDIR (statbuf.st_mode))
       rc |= mutt_rmtree (cur);
     else