Changeset 5447:f72fce68ca19

Timestamp:

2008-07-02 09:26:17 (8 weeks ago)

Author:

Vladimir Marek <Vladimir.Marek@…>

Branch:

HEAD

Message:

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

Files:

• ChangeLog (modified) (1 diff)
• lib.c (modified) (3 diffs)

ChangeLog

@@ +1 @@
+2008-07-02 18:23 +0200  Rocco Rutte  <pdmef@gmx.net>  (7783502a04c7)
+
+        * curs_main.c: Calculate menu->max after a possible resort in index
+        (maybe changing number of messages). Closes #3088.
+
+2008-07-02 18:08 +0200  Rocco Rutte  <pdmef@gmx.net>  (f41ba27be46f)
+
+        * ChangeLog, curs_lib.c: Fix casts for progress update to prevent
+        -ftrapv aborts to trigger. Closes #3018.
+
 2008-07-02 08:56 -0700  Brendan Cully  <brendan@kublai.com>  (c51c16db46cc)
 

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