link_group_set_stream_hash(), staging_list

[wimlib] / src / lookup_table.c

diff --git a/src/lookup_table.c b/src/lookup_table.c
index c0369a9f49ac70fedf039c84a25e3dc871dcbd18..d3ed585445a225f53b91e82e7d437d127f9560ee 100644 (file)
--- a/src/lookup_table.c
+++ b/src/lookup_table.c
@@ -27,6 +27,7 @@
 #include "wimlib_internal.h"
 #include "lookup_table.h"
 #include "io.h"
+#include <errno.h>
 
 struct lookup_table *new_lookup_table(size_t capacity)
 {
@@ -69,6 +70,15 @@ struct lookup_table_entry *new_lookup_table_entry()
 }
 
 
+void free_lookup_table_entry(struct lookup_table_entry *lte)
+{
+       if (lte) {
+               if (lte->staging_list.next)
+                       list_del(&lte->staging_list);
+               FREE(lte->file_on_disk);
+               FREE(lte);
+       }
+}
 
 /*
  * Inserts an entry into the lookup table.
@@ -118,7 +128,8 @@ void lookup_table_unlink(struct lookup_table *table,
 /* Decrement the reference count for the dentry having hash value @hash in the
  * lookup table.  The lookup table entry is unlinked and freed if there are no
  * references to in remaining.  */
-bool lookup_table_decrement_refcnt(struct lookup_table* table, const u8 hash[])
+struct lookup_table_entry *
+lookup_table_decrement_refcnt(struct lookup_table* table, const u8 hash[])
 {
        size_t pos = *(size_t*)hash % table->capacity;
        struct lookup_table_entry *prev = NULL;
@@ -129,19 +140,21 @@ bool lookup_table_decrement_refcnt(struct lookup_table* table, const u8 hash[])
                if (memcmp(hash, entry->hash, WIM_HASH_SIZE) == 0) {
                        wimlib_assert(entry->refcnt != 0);
                        if (--entry->refcnt == 0) {
-                               if (entry->staging_num_times_opened == 0)
+                               if (entry->num_opened_fds == 0) {
                                        free_lookup_table_entry(entry);
+                                       entry = NULL;
+                               }
                                if (prev)
                                        prev->next = next;
                                else
                                        table->array[pos] = next;
-                               return true;
+                               break;
                        }
                }
                prev = entry;
                entry = next;
        }
-       return false;
+       return entry;
 }
 
 
@@ -258,7 +271,8 @@ int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out)
                return 0;
 
        if (lte->output_resource_entry.flags & WIM_RESHDR_FLAG_METADATA)
-               DEBUG("Writing metadata entry at %lu", ftello(out));
+               DEBUG("Writing metadata entry at %lu (orig size = %zu)",
+                     ftello(out), lte->output_resource_entry.original_size);
 
        p = put_resource_entry(buf, &lte->output_resource_entry);
        p = put_u16(p, lte->part_number);
@@ -357,11 +371,12 @@ int lookup_resource(WIMStruct *w, const char *path,
                    int lookup_flags,
                    struct dentry **dentry_ret,
                    struct lookup_table_entry **lte_ret,
-                   u8 **hash_ret)
+                   unsigned *stream_idx_ret)
 {
        struct dentry *dentry = get_dentry(w, path);
        struct lookup_table_entry *lte;
-       const u8 *hash;
+       unsigned stream_idx = 0;
+       const u8 *hash = dentry->hash;
        if (!dentry)
                return -ENOENT;
        if (!(lookup_flags & LOOKUP_FLAG_DIRECTORY_OK)
@@ -370,8 +385,13 @@ int lookup_resource(WIMStruct *w, const char *path,
        if (lookup_flags & LOOKUP_FLAG_ADS_OK) {
                const char *stream_name = path_stream_name(path);
                if (stream_name) {
+                       size_t stream_name_len = strlen(stream_name);
                        for (u16 i = 0; i < dentry->num_ads; i++) {
-                               if (strcmp(stream_name, dentry->ads_entries[i].stream_name) == 0) {
+                               if (ads_entry_has_name(&dentry->ads_entries[i],
+                                                      stream_name,
+                                                      stream_name_len))
+                               {
+                                       stream_idx = i + 1;
                                        hash = dentry->ads_entries[i].hash;
                                        goto do_lookup;
                                }
@@ -379,14 +399,13 @@ int lookup_resource(WIMStruct *w, const char *path,
                        return -ENOENT;
                }
        }
-       hash = dentry->hash;
 do_lookup:
        lte = __lookup_resource(w->lookup_table, hash);
        if (dentry_ret)
                *dentry_ret = dentry;
        if (lte_ret)
                *lte_ret = lte;
-       if (hash_ret)
-               *hash_ret = hash;
+       if (stream_idx_ret)
+               *stream_idx_ret = stream_idx;
        return 0;
 }