libext2fs: Fix ext2fs_iblk_{add,sub}_blocks() when the i_blocks_hi is non-zero

[tools/e2fsprogs.git] / lib / ext2fs / dblist_dir.c

diff --git a/lib/ext2fs/dblist_dir.c b/lib/ext2fs/dblist_dir.c
index 131f965..07ed8af 100644 (file)
--- a/lib/ext2fs/dblist_dir.c
+++ b/lib/ext2fs/dblist_dir.c
@@ -2,41 +2,37 @@
  * dblist_dir.c --- iterate by directory entry
  *
  * Copyright 1997 by Theodore Ts'o
- * 
+ *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
- * 
  */
 
 #include <stdio.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include <linux/ext2_fs.h>
-
+#include "ext2_fs.h"
 #include "ext2fsP.h"
 
-static int db_dir_proc(ext2_filsys fs, struct ext2_db_entry *db_info,
-                      void *private);
+static int db_dir_proc(ext2_filsys fs, struct ext2_db_entry2 *db_info,
+                      void *priv_data);
 
-extern errcode_t
-       ext2fs_dblist_dir_iterate(ext2_dblist dblist,
-                                 int   flags,
-                                 char  *block_buf,
-                                 int (*func)(ino_t     dir,
-                                             int       entry,
-                                             struct ext2_dir_entry *dirent,
-                                             int       offset,
-                                             int       blocksize,
-                                             char      *buf,
-                                             void      *private),
-                                 void *private)
+errcode_t ext2fs_dblist_dir_iterate(ext2_dblist dblist,
+                                   int flags,
+                                   char        *block_buf,
+                                   int (*func)(ext2_ino_t dir,
+                                               int     entry,
+                                               struct ext2_dir_entry *dirent,
+                                               int     offset,
+                                               int     blocksize,
+                                               char    *buf,
+                                               void    *priv_data),
+                                   void *priv_data)
 {
        errcode_t               retval;
        struct dir_context      ctx;
@@ -48,31 +44,36 @@ extern errcode_t
        if (block_buf)
                ctx.buf = block_buf;
        else {
-               ctx.buf = malloc(dblist->fs->blocksize);
-               if (!ctx.buf)
-                       return EXT2_NO_MEMORY;
+               retval = ext2fs_get_mem(dblist->fs->blocksize, &ctx.buf);
+               if (retval)
+                       return retval;
        }
-       ctx.func = 0;
-       ctx.func2 = func;
-       ctx.private = private;
+       ctx.func = func;
+       ctx.priv_data = priv_data;
        ctx.errcode = 0;
 
-       retval = ext2fs_dblist_iterate(dblist, db_dir_proc, &ctx);
-       
+       retval = ext2fs_dblist_iterate2(dblist, db_dir_proc, &ctx);
+
        if (!block_buf)
-               free(ctx.buf);
+               ext2fs_free_mem(&ctx.buf);
        if (retval)
                return retval;
        return ctx.errcode;
 }
 
-static int db_dir_proc(ext2_filsys fs, struct ext2_db_entry *db_info,
-                      void *private)
+static int db_dir_proc(ext2_filsys fs, struct ext2_db_entry2 *db_info,
+                      void *priv_data)
 {
-       struct dir_context      *ctx = private;
+       struct dir_context      *ctx;
+       int                     ret;
 
+       ctx = (struct dir_context *) priv_data;
        ctx->dir = db_info->ino;
-       
-       return ext2fs_process_dir_block(fs, &db_info->blk,
-                                       db_info->blockcnt, private);
+       ctx->errcode = 0;
+
+       ret = ext2fs_process_dir_block(fs, &db_info->blk,
+                                      db_info->blockcnt, 0, 0, priv_data);
+       if ((ret & BLOCK_ABORT) && !ctx->errcode)
+               return DBLIST_ABORT;
+       return 0;
 }