X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flookup_table.c;h=38b9947ba814f0be1e655541c6156a9f8555fddb;hb=0dd190af48ac572f9e33ff9436ec8900fa6281a3;hp=4df37ea2eb343ea2e2239e48c3e5316326a251d3;hpb=004c7fd634328ab9b3c4b479097a10ca12ae38d7;p=wimlib

diff --git a/src/lookup_table.c b/src/lookup_table.c
index 4df37ea2..38b9947b 100644
--- 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)
 {
@@ -65,10 +66,20 @@ struct lookup_table_entry *new_lookup_table_entry()
 
 	lte->part_number  = 1;
 	lte->refcnt       = 1;
+	INIT_LIST_HEAD(&lte->lte_group_list);
 	return lte;
 }
 
 
+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.
@@ -147,6 +158,21 @@ lookup_table_decrement_refcnt(struct lookup_table* table, const u8 hash[])
 	return entry;
 }
 
+/* Like lookup_table_decrement_refcnt(), but for when we already know the lookup
+ * table entry. */
+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;
+		}
+	}
+	return lte;
+}
 
 /* 
  * Calls a function on all the entries in the lookup table.  Stop early and
@@ -261,7 +287,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);
@@ -356,20 +383,27 @@ __lookup_resource(const struct lookup_table *lookup_table, const u8 hash[])
 	return NULL;
 }
 
+/* Only for resolved lte's */
 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 dentry *dentry;
 	struct lookup_table_entry *lte;
-	u8 *hash;
+	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) {
@@ -379,21 +413,60 @@ int lookup_resource(WIMStruct *w, const char *path,
 						       stream_name,
 						       stream_name_len))
 				{
-					hash = dentry->ads_entries[i].hash;
-					goto do_lookup;
+					stream_idx = i + 1;
+					lte = dentry->ads_entries[i].lte;
+					goto out;
 				}
 			}
 			return -ENOENT;
 		}
 	}
-	hash = dentry->hash;
-do_lookup:
-	lte = __lookup_resource(w->lookup_table, hash);
+out:
 	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;
 }
+
+/* Resolve  a dentry's lookup table entries */
+static int dentry_resolve_ltes(struct dentry *dentry, void *__table)
+{
+	struct lookup_table *table = __table;
+	struct lookup_table_entry *lte;
+
+	/* 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 = lte;
+	dentry->lte_group_list.type = STREAM_TYPE_NORMAL;
+	dentry->resolved = true;
+
+	/* Alternate data streams */
+	if (dentry->link_group_master_status != GROUP_SLAVE) {
+		for (u16 i = 0; i < dentry->num_ads; i++) {
+			struct ads_entry *cur_entry = &dentry->ads_entries[i];
+
+			lte = __lookup_resource(table, cur_entry->hash);
+			if (lte)
+				list_add(&cur_entry->lte_group_list.list,
+					 &lte->lte_group_list);
+			else
+				INIT_LIST_HEAD(&cur_entry->lte_group_list.list);
+			cur_entry->lte = lte;
+			cur_entry->lte_group_list.type = STREAM_TYPE_ADS;
+		}
+	}
+	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_dentry_in_tree(root, dentry_resolve_ltes, table);
+}