e2fsprogs: remove checker infrastructure

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

diff --git a/lib/ext2fs/dupfs.c b/lib/ext2fs/dupfs.c
index f7edd83..02721e1 100644 (file)
--- a/lib/ext2fs/dupfs.c
+++ b/lib/ext2fs/dupfs.c
@@ -1,27 +1,23 @@
 /*
  * dupfs.c --- duplicate a ext2 filesystem handle
- * 
- * Copyright (C) 1997 Theodore Ts'o.
+ *
+ * Copyright (C) 1997, 1998, 2001, 2003, 2005 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 "config.h"
 #include <stdio.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <stdlib.h>
 #include <time.h>
 #include <string.h>
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-
-#include <linux/ext2_fs.h>
 
+#include "ext2_fs.h"
 #include "ext2fsP.h"
 
 errcode_t ext2fs_dup_handle(ext2_filsys src, ext2_filsys *dest)
@@ -30,40 +26,49 @@ errcode_t ext2fs_dup_handle(ext2_filsys src, ext2_filsys *dest)
        errcode_t       retval;
 
        EXT2_CHECK_MAGIC(src, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-       
-       fs = (ext2_filsys) malloc(sizeof(struct struct_ext2_filsys));
-       if (!fs)
-               return ENOMEM;
+
+       retval = ext2fs_get_mem(sizeof(struct struct_ext2_filsys), &fs);
+       if (retval)
+               return retval;
 
        *fs = *src;
        fs->device_name = 0;
        fs->super = 0;
+       fs->orig_super = 0;
        fs->group_desc = 0;
        fs->inode_map = 0;
        fs->block_map = 0;
        fs->badblocks = 0;
        fs->dblist = 0;
+       fs->mmp_buf = 0;
+       fs->mmp_cmp = 0;
+       fs->mmp_fd = -1;
 
        io_channel_bumpcount(fs->io);
        if (fs->icache)
                fs->icache->refcount++;
 
-       retval = ENOMEM;
-       fs->device_name = malloc(strlen(src->device_name)+1);
-       if (!fs->device_name)
+       retval = ext2fs_get_mem(strlen(src->device_name)+1, &fs->device_name);
+       if (retval)
                goto errout;
        strcpy(fs->device_name, src->device_name);
 
-       fs->super = malloc(SUPERBLOCK_SIZE);
-       if (!fs->super)
+       retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &fs->super);
+       if (retval)
                goto errout;
        memcpy(fs->super, src->super, SUPERBLOCK_SIZE);
 
-       fs->group_desc = malloc(fs->desc_blocks * fs->blocksize);
-       if (!fs->group_desc)
+       retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &fs->orig_super);
+       if (retval)
+               goto errout;
+       memcpy(fs->orig_super, src->orig_super, SUPERBLOCK_SIZE);
+
+       retval = ext2fs_get_array(fs->desc_blocks, fs->blocksize,
+                               &fs->group_desc);
+       if (retval)
                goto errout;
        memcpy(fs->group_desc, src->group_desc,
-              fs->desc_blocks * fs->blocksize);
+              (size_t) fs->desc_blocks * fs->blocksize);
 
        if (src->inode_map) {
                retval = ext2fs_copy_bitmap(src->inode_map, &fs->inode_map);
@@ -85,11 +90,33 @@ errcode_t ext2fs_dup_handle(ext2_filsys src, ext2_filsys *dest)
                if (retval)
                        goto errout;
        }
+       if (src->mmp_buf) {
+               retval = ext2fs_get_mem(src->blocksize, &fs->mmp_buf);
+               if (retval)
+                       goto errout;
+               memcpy(fs->mmp_buf, src->mmp_buf, src->blocksize);
+       }
+       if (src->mmp_fd >= 0) {
+               fs->mmp_fd = dup(src->mmp_fd);
+               if (fs->mmp_fd < 0) {
+                       retval = EXT2_ET_MMP_OPEN_DIRECT;
+                       goto errout;
+               }
+       }
+       if (src->mmp_cmp) {
+               int align = ext2fs_get_dio_alignment(src->mmp_fd);
+
+               retval = ext2fs_get_memalign(src->blocksize, align,
+                                            &fs->mmp_cmp);
+               if (retval)
+                       goto errout;
+               memcpy(fs->mmp_cmp, src->mmp_cmp, src->blocksize);
+       }
        *dest = fs;
        return 0;
 errout:
        ext2fs_free(fs);
        return retval;
-       
+
 }