X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flookup_table.c;h=364f469ed08ab7a89426d72f6d41df8868385023;hp=3d66ca18246be543cb63037d34af60989a0cb1f8;hb=e86f9f34e67c89123b747524d7e67dd70175d3d4;hpb=79b64b516e5bdb486832f88788362dbe9deb1b61

diff --git a/src/lookup_table.c b/src/lookup_table.c
index 3d66ca18..364f469e 100644
--- a/src/lookup_table.c
+++ b/src/lookup_table.c
@@ -99,6 +99,7 @@ clone_lookup_table_entry(const struct lookup_table_entry *old)
 		memcpy(new->attached_buffer, old->attached_buffer,
 		       wim_resource_size(old));
 		break;
+#ifdef WITH_NTFS_3G
 	case RESOURCE_IN_NTFS_VOLUME:
 		if (old->ntfs_loc) {
 			struct ntfs_location *loc;
@@ -120,6 +121,9 @@ clone_lookup_table_entry(const struct lookup_table_entry *old)
 			       loc->stream_name_utf16_num_chars * 2);
 		}
 		break;
+#endif
+	default:
+		break;
 	}
 	return new;
 out_free:
@@ -152,7 +156,6 @@ void free_lookup_table_entry(struct lookup_table_entry *lte)
 		default:
 			break;
 		}
-		FREE(lte->extracted_file);
 		FREE(lte);
 	}
 }
@@ -215,8 +218,8 @@ static void finalize_lte(struct lookup_table_entry *lte)
 void lte_decrement_refcnt(struct lookup_table_entry *lte,
 			  struct lookup_table *table)
 {
-	wimlib_assert(lte);
-	wimlib_assert(lte->refcnt);
+	wimlib_assert(lte != NULL);
+	wimlib_assert(lte->refcnt != 0);
 	if (--lte->refcnt == 0) {
 		lookup_table_unlink(table, lte);
 	#ifdef WITH_FUSE
@@ -227,13 +230,13 @@ void lte_decrement_refcnt(struct lookup_table_entry *lte,
 }
 
 #ifdef WITH_FUSE
-void lte_decrement_num_opened_fds(struct lookup_table_entry *lte,
-			          struct lookup_table *table)
+void lte_decrement_num_opened_fds(struct lookup_table_entry *lte)
 {
-	wimlib_assert(lte);
-	wimlib_assert(lte->num_opened_fds);
-	if (--lte->num_opened_fds == 0 && lte->refcnt == 0)
-		finalize_lte(lte);
+	wimlib_assert(lte != NULL);
+	if (lte->num_opened_fds != 0) {
+		if (--lte->num_opened_fds == 0 && lte->refcnt == 0)
+			finalize_lte(lte);
+	}
 }
 #endif
 
@@ -362,6 +365,14 @@ int read_lookup_table(WIMStruct *w)
 			ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
 			goto out_free_cur_entry;
 		}
+		if ((cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_METADATA)
+		    && cur_entry->refcnt != 1)
+		{
+			ERROR("Found metadata resource with refcnt != 1:");
+			print_lookup_table_entry(cur_entry);
+			ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
+			goto out_free_cur_entry;
+		}
 		lookup_table_insert(table, cur_entry);
 
 	}
@@ -407,6 +418,33 @@ int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out)
 	return 0;
 }
 
+/* Writes the lookup table to the output file. */
+int write_lookup_table(struct lookup_table *table, FILE *out,
+		       struct resource_entry *out_res_entry)
+{
+	off_t start_offset, end_offset;
+	int ret;
+
+	start_offset = ftello(out);
+	if (start_offset == -1)
+		return WIMLIB_ERR_WRITE;
+
+	ret = for_lookup_table_entry(table, write_lookup_table_entry, out);
+	if (ret != 0)
+		return ret;
+
+	end_offset = ftello(out);
+	if (end_offset == -1)
+		return WIMLIB_ERR_WRITE;
+
+	out_res_entry->offset        = start_offset;
+	out_res_entry->size          = end_offset - start_offset;
+	out_res_entry->original_size = end_offset - start_offset;
+	out_res_entry->flags         = WIM_RESHDR_FLAG_METADATA;
+
+	return 0;
+}
+
 
 int lte_zero_real_refcnt(struct lookup_table_entry *lte, void *ignore)
 {
@@ -420,13 +458,21 @@ int lte_zero_out_refcnt(struct lookup_table_entry *lte, void *ignore)
 	return 0;
 }
 
-int lte_free_extracted_file(struct lookup_table_entry *lte, void *ignone)
+int lte_zero_extracted_file(struct lookup_table_entry *lte, void *ignore)
 {
-	FREE(lte->extracted_file);
 	lte->extracted_file = NULL;
 	return 0;
 }
 
+int lte_free_extracted_file(struct lookup_table_entry *lte, void *ignore)
+{
+	if (lte->extracted_file != NULL) {
+		FREE(lte->extracted_file);
+		lte->extracted_file = NULL;
+	}
+	return 0;
+}
+
 void print_lookup_table_entry(const struct lookup_table_entry *lte)
 {
 	if (!lte) {
@@ -580,7 +626,7 @@ out:
 }
 #endif
 
-static void inode_resolve_ltes(struct inode *inode, struct lookup_table *table)
+void inode_resolve_ltes(struct inode *inode, struct lookup_table *table)
 {
 	struct lookup_table_entry *lte;
 
@@ -658,7 +704,7 @@ int dentry_unresolve_ltes(struct dentry *dentry, void *ignore)
  */
 struct lookup_table_entry *
 inode_unnamed_lte(const struct inode *inode,
-		   const struct lookup_table *table)
+		  const struct lookup_table *table)
 {
 	if (inode->resolved)
 		return inode_unnamed_lte_resolved(inode);
@@ -666,3 +712,16 @@ inode_unnamed_lte(const struct inode *inode,
 		return inode_unnamed_lte_unresolved(inode, table);
 }
 
+static int lte_add_stream_size(struct lookup_table_entry *lte,
+			       void *total_bytes_p)
+{
+	*(u64*)total_bytes_p += lte->resource_entry.size;
+	return 0;
+}
+
+u64 lookup_table_total_stream_size(struct lookup_table *table)
+{
+	u64 total_size = 0;
+	for_lookup_table_entry(table, lte_add_stream_size, &total_size);
+	return total_size;
+}