Fixes

[wimlib] / src / lookup_table.c

diff --git a/src/lookup_table.c b/src/lookup_table.c
index e0cfaaf93f6d0b1838451d1ed0e5aa8e6d365a5c..66c4670076f61dfabf8e278d91caef7d3276f427 100644 (file)
--- a/src/lookup_table.c
+++ b/src/lookup_table.c
@@ -66,6 +66,7 @@ struct lookup_table_entry *new_lookup_table_entry()
 
        lte->part_number  = 1;
        lte->refcnt       = 1;
+       INIT_LIST_HEAD(&lte->lte_group_list);
        return lte;
 }
 
@@ -162,18 +163,19 @@ lookup_table_decrement_refcnt(struct lookup_table* table, const u8 hash[])
 struct lookup_table_entry *
 lte_decrement_refcnt(struct lookup_table_entry *lte, struct lookup_table *table)
 {
-       wimlib_assert(lte->refcnt);
-       if (lte && --lte->refcnt == 0) {
-               lookup_table_unlink(table, lte);
-               if (lte->num_opened_fds == 0) {
-                       free_lookup_table_entry(lte);
-                       lte = NULL;
+       if (lte) {
+               wimlib_assert(lte->refcnt);
+               if (--lte->refcnt == 0) {
+                       lookup_table_unlink(table, lte);
+                       if (lte->num_opened_fds == 0) {
+                               free_lookup_table_entry(lte);
+                               lte = NULL;
+                       }
                }
        }
        return lte;
 }
 
-
 /* 
  * Calls a function on all the entries in the lookup table.  Stop early and
  * return nonzero if any call to the function returns nonzero.
@@ -383,22 +385,32 @@ __lookup_resource(const struct lookup_table *lookup_table, const u8 hash[])
        return NULL;
 }
 
-/* Only for resolved lte's */
+/* 
+ * Finds the dentry, lookup table entry, and stream index for a WIM file stream,
+ * given a path name.
+ *
+ * This is only for pre-resolved dentries.
+ */
 int lookup_resource(WIMStruct *w, const char *path,
                    int lookup_flags,
                    struct dentry **dentry_ret,
                    struct lookup_table_entry **lte_ret,
                    unsigned *stream_idx_ret)
 {
-       struct dentry *dentry = get_dentry(w, path);
+       struct dentry *dentry;
        struct lookup_table_entry *lte;
-       unsigned stream_idx = 0;
-       lte = dentry->lte;
+       unsigned stream_idx;
+       dentry = get_dentry(w, path);
        if (!dentry)
                return -ENOENT;
+
+       wimlib_assert(dentry->resolved);
+
+       lte = dentry->lte;
        if (!(lookup_flags & LOOKUP_FLAG_DIRECTORY_OK)
              && dentry_is_directory(dentry))
                return -EISDIR;
+       stream_idx = 0;
        if (lookup_flags & LOOKUP_FLAG_ADS_OK) {
                const char *stream_name = path_stream_name(path);
                if (stream_name) {
@@ -426,29 +438,34 @@ out:
        return 0;
 }
 
-static int lte_init_lte_group_list(struct lookup_table_entry *lte, void *ignore)
-{
-       INIT_LIST_HEAD(&lte->lte_group_list);
-       return 0;
-}
-
-/* Resolve  a dentry's lookup table entries */
-static int dentry_resolve_ltes(struct dentry *dentry, void *__table)
+/* Resolve a dentry's lookup table entries 
+ *
+ * This replaces the SHA1 hash fields (which are used to lookup an entry in the
+ * lookup table) with pointers directly to the lookup table entries.  A circular
+ * linked list of streams sharing the same lookup table entry is created.
+ *
+ * This function always succeeds; unresolved lookup table entries are given a
+ * NULL pointer.
+ */
+int dentry_resolve_ltes(struct dentry *dentry, void *__table)
 {
        struct lookup_table *table = __table;
        struct lookup_table_entry *lte;
 
-       /* Default file stream */
+       wimlib_assert(!dentry->resolved);
+
+       /* Resolve the default file stream */
        lte = __lookup_resource(table, dentry->hash);
        if (lte)
                list_add(&dentry->lte_group_list.list, &lte->lte_group_list);
        else
                INIT_LIST_HEAD(&dentry->lte_group_list.list);
-       dentry->lte_group_list.type = STREAM_TYPE_NORMAL;
        dentry->lte = lte;
+       dentry->lte_group_list.type = STREAM_TYPE_NORMAL;
+       dentry->resolved = true;
 
-       /* Alternate data streams */
-       if (dentry->link_group_master_status != GROUP_SLAVE) {
+       /* Resolve the alternate data streams */
+       if (dentry->ads_entries_status != ADS_ENTRIES_USER) {
                for (u16 i = 0; i < dentry->num_ads; i++) {
                        struct ads_entry *cur_entry = &dentry->ads_entries[i];
 
@@ -464,10 +481,3 @@ static int dentry_resolve_ltes(struct dentry *dentry, void *__table)
        }
        return 0;
 }
-
-/* Resolve all the lookup table entries of a dentry tree */
-void resolve_lookup_table_entries(struct dentry *root, struct lookup_table *table)
-{
-       for_lookup_table_entry(table, lte_init_lte_group_list, NULL);
-       for_dentry_in_tree(root, dentry_resolve_ltes, table);
-}