inode updates (IN PROGRESS)

[wimlib] / src / resource.c

diff --git a/src/resource.c b/src/resource.c
index 3baa8f824fd7a683924cecc3753e0c1098bba0cc..5f97ed0223b3a3fc1c9b834796f33927d6ee68a2 100644 (file)
--- a/src/resource.c
+++ b/src/resource.c
@@ -22,6 +22,17 @@
  * wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdarg.h>
+
+#ifdef WITH_NTFS_3G
+#include <ntfs-3g/attrib.h>
+#include <ntfs-3g/inode.h>
+#include <ntfs-3g/dir.h>
+#endif
+
 #include "wimlib_internal.h"
 #include "lookup_table.h"
 #include "io.h"
@@ -29,17 +40,13 @@
 #include "xpress.h"
 #include "sha1.h"
 #include "dentry.h"
-#include "config.h"
 #include <unistd.h>
 #include <errno.h>
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
-
-#ifdef WITH_NTFS_3G
-#include <ntfs-3g/attrib.h>
-#include <ntfs-3g/inode.h>
-#include <ntfs-3g/dir.h>
 #endif
 
+
 /* 
  * Reads all or part of a compressed resource into an in-memory buffer.
  *
@@ -1085,8 +1092,8 @@ int write_dentry_resources(struct dentry *dentry, void *wim_p)
                printf("Writing streams for `%s'\n", dentry->full_path_utf8);
        }
 
-       for (unsigned i = 0; i <= dentry->num_ads; i++) {
-               lte = dentry_stream_lte(dentry, i, w->lookup_table);
+       for (unsigned i = 0; i <= dentry->inode->num_ads; i++) {
+               lte = inode_stream_lte(dentry->inode, i, w->lookup_table);
                if (lte && ++lte->out_refcnt == 1) {
                        ret = write_wim_resource(lte, w->out_fp, ctype,
                                                 &lte->output_resource_entry);
@@ -1121,10 +1128,11 @@ int read_metadata_resource(WIMStruct *w, struct image_metadata *imd)
        u32 dentry_offset;
        int ret;
        struct dentry *dentry;
-       struct link_group_table *lgt;
+       struct inode_table inode_tab;
        const struct lookup_table_entry *metadata_lte;
        u64 metadata_len;
        u64 metadata_offset;
+       struct hlist_head inode_list;
 
        metadata_lte = imd->metadata_lte;
        metadata_len = wim_resource_size(metadata_lte);
@@ -1196,6 +1204,7 @@ int read_metadata_resource(WIMStruct *w, struct image_metadata *imd)
        dentry->prev   = dentry;
        if (ret != 0)
                goto out_free_dentry_tree;
+       inode_add_dentry(dentry, dentry->inode);
 
        /* Now read the entire directory entry tree into memory. */
        DEBUG("Reading dentry tree");
@@ -1211,30 +1220,29 @@ int read_metadata_resource(WIMStruct *w, struct image_metadata *imd)
 
        /* Build hash table that maps hard link group IDs to dentry sets */
        DEBUG("Building link group table");
-       lgt = new_link_group_table(9001);
-       if (!lgt)
-               goto out_free_dentry_tree;
-       ret = for_dentry_in_tree(dentry, link_group_table_insert, lgt);
+       ret = init_inode_table(&inode_tab, 9001);
        if (ret != 0)
-               goto out_free_lgt;
+               goto out_free_dentry_tree;
+
+       for_dentry_in_tree(dentry, inode_table_insert, &inode_tab);
 
-       DEBUG("Fixing inconsistencies in the link groups");
-       ret = fix_link_groups(lgt);
+       DEBUG("Fixing inconsistencies in the hard link groups");
+       ret = fix_inodes(&inode_tab, &inode_list);
+       destroy_inode_table(&inode_tab);
        if (ret != 0)
-               goto out_free_lgt;
+               goto out_free_dentry_tree;
 
        DEBUG("Running miscellaneous verifications on the dentry tree");
+       for_lookup_table_entry(w->lookup_table, lte_zero_real_refcnt, NULL);
        ret = for_dentry_in_tree(dentry, verify_dentry, w);
        if (ret != 0)
-               goto out_free_lgt;
+               goto out_free_dentry_tree;
 
        DEBUG("Done reading image metadata");
 
-       imd->lgt           = lgt;
        imd->root_dentry   = dentry;
+       imd->inode_list = inode_list;
        goto out_free_buf;
-out_free_lgt:
-       free_link_group_table(lgt);
 out_free_dentry_tree:
        free_dentry_tree(dentry, NULL);
 out_free_security_data: