Rename feature name from gdt_checksum to uninit_groups

[tools/e2fsprogs.git] / lib / e2p / iod.c

diff --git a/lib/e2p/iod.c b/lib/e2p/iod.c
index c5d34cd..84c9709 100644 (file)
--- a/lib/e2p/iod.c
+++ b/lib/e2p/iod.c
@@ -18,6 +18,8 @@
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include <stdlib.h>
+#include <string.h>
 
 int iterate_on_dir (const char * dir_name,
                    int (*func) (const char *, struct dirent *, void *),
@@ -25,7 +27,7 @@ int iterate_on_dir (const char * dir_name,
 {
        DIR * dir;
        struct dirent *de, *dep;
-       int     max_len = -1, len;
+       int     max_len = -1, len, ret = 0;
 
 #if HAVE_PATHCONF && defined(_PC_NAME_MAX) 
        max_len = pathconf(dir_name, _PC_NAME_MAX);
@@ -54,15 +56,18 @@ int iterate_on_dir (const char * dir_name,
                return -1;
        }
        while ((dep = readdir (dir))) {
-               len = dep->d_reclen;
-               if (len < (sizeof(struct dirent)))
-                       len = sizeof(struct dirent);
+               len = sizeof(struct dirent);
+#ifdef HAVE_RECLEN_DIRENT
+               if (len < dep->d_reclen)
+                       len = dep->d_reclen;
                if (len > max_len)
                        len = max_len;
+#endif
                memcpy(de, dep, len);
-               (*func) (dir_name, de, private);
+               if ((*func)(dir_name, de, private))
+                       ret++;
        }
        free(de);
        closedir(dir);
-       return 0;
+       return ret;
 }