libe2p, libext2fs: Update file copyright permission states to match COPYING

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

diff --git a/lib/e2p/iod.c b/lib/e2p/iod.c
index c5d34cd..c53aafe 100644 (file)
--- a/lib/e2p/iod.c
+++ b/lib/e2p/iod.c
@@ -5,8 +5,10 @@
  *                           Laboratoire MASI, Institut Blaise Pascal
  *                           Universite Pierre et Marie Curie (Paris VI)
  *
- * This file can be redistributed under the terms of the GNU Library General
- * Public License
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
+ * %End-Header%
  */
 
 /*
@@ -18,6 +20,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,9 +29,9 @@ 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) 
+#if HAVE_PATHCONF && defined(_PC_NAME_MAX)
        max_len = pathconf(dir_name, _PC_NAME_MAX);
 #endif
        if (max_len == -1) {
@@ -54,15 +58,18 @@ int iterate_on_dir (const char * dir_name,
                return -1;
        }
        while ((dep = readdir (dir))) {
+#ifdef HAVE_RECLEN_DIRENT
                len = dep->d_reclen;
-               if (len < (sizeof(struct dirent)))
-                       len = sizeof(struct dirent);
                if (len > max_len)
                        len = max_len;
+#else
+               len = sizeof(struct dirent);
+#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;
 }