X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fadd_image.c;h=923d361e14bb2647cb9355d340abdd7ce2602fee;hp=02ca2f2584734808dde746e85b8c0cdb009e75ec;hb=3f9b53a4a214a254bb27ed30994faf2a0fd12375;hpb=9e2571b03cd9c71d11b3dad9ea5dcfa43f50deb4

diff --git a/src/add_image.c b/src/add_image.c
index 02ca2f25..923d361e 100644
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -54,49 +54,36 @@
  * Adds the dentry tree and security data for a new image to the image metadata
  * array of the WIMStruct.
  */
-int
+static int
 add_new_dentry_tree(WIMStruct *w, struct wim_dentry *root_dentry,
 		    struct wim_security_data *sd)
 {
-	struct wim_lookup_table_entry *metadata_lte;
-	struct wim_image_metadata *imd;
 	struct wim_image_metadata *new_imd;
-
-	wimlib_assert(root_dentry != NULL);
-
-	DEBUG("Reallocating image metadata array for image_count = %u",
-	      w->hdr.image_count + 1);
-	imd = CALLOC((w->hdr.image_count + 1), sizeof(struct wim_image_metadata));
-
-	if (!imd) {
-		ERROR("Failed to allocate memory for new image metadata array");
-		goto err;
-	}
-
-	memcpy(imd, w->image_metadata,
-	       w->hdr.image_count * sizeof(struct wim_image_metadata));
+	struct wim_lookup_table_entry *metadata_lte;
+	int ret;
 
 	metadata_lte = new_lookup_table_entry();
 	if (!metadata_lte)
-		goto err_free_imd;
+		return WIMLIB_ERR_NOMEM;
 
 	metadata_lte->resource_entry.flags = WIM_RESHDR_FLAG_METADATA;
+	metadata_lte->unhashed = 1;
 
-	new_imd = &imd[w->hdr.image_count];
+	new_imd = new_image_metadata();
+	if (!new_imd) {
+		free_lookup_table_entry(metadata_lte);
+		return WIMLIB_ERR_NOMEM;
+	}
 
 	new_imd->root_dentry	= root_dentry;
 	new_imd->metadata_lte	= metadata_lte;
 	new_imd->security_data  = sd;
 	new_imd->modified	= 1;
 
-	FREE(w->image_metadata);
-	w->image_metadata = imd;
-	w->hdr.image_count++;
-	return 0;
-err_free_imd:
-	FREE(imd);
-err:
-	return WIMLIB_ERR_NOMEM;
+	ret = append_image_metadata(w, new_imd);
+	if (ret)
+		put_image_metadata(new_imd, NULL);
+	return ret;
 
 }
 
@@ -126,7 +113,7 @@ unix_capture_regular_file(const char *path,
 		lte->file_on_disk = file_on_disk;
 		lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
 		lte->resource_entry.original_size = size;
-		lookup_table_insert_unhashed(lookup_table, lte);
+		lookup_table_insert_unhashed(lookup_table, lte, inode, 0);
 		inode->i_lte = lte;
 	}
 	return 0;
@@ -371,12 +358,10 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 	else
 		ret = unix_capture_symlink(path, inode, lookup_table);
 out:
-	if (ret == 0) {
+	if (ret == 0)
 		*root_ret = root;
-	} else {
+	else
 		free_dentry_tree(root, lookup_table);
-		lookup_table_free_unhashed_streams(lookup_table);
-	}
 	return ret;
 }
 
@@ -849,8 +834,12 @@ wimlib_add_image_multisource(WIMStruct *w,
 	struct wim_security_data *sd;
 	struct wim_image_metadata *imd;
 	struct wim_inode_table inode_table;
+	struct list_head unhashed_streams;
 	int ret;
 	struct sd_set sd_set;
+#ifdef WITH_NTFS_3G
+	struct _ntfs_volume *ntfs_vol = NULL;
+#endif
 
 	if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) {
 #ifdef WITH_NTFS_3G
@@ -864,7 +853,7 @@ wimlib_add_image_multisource(WIMStruct *w,
 			return WIMLIB_ERR_INVALID_PARAM;
 		}
 		capture_tree = build_dentry_tree_ntfs;
-		extra_arg = &w->ntfs_vol;
+		extra_arg = &ntfs_vol;
 #else
 		ERROR("wimlib was compiled without support for NTFS-3g, so\n"
 		      "        cannot capture a WIM image directly from a NTFS volume!");
@@ -930,7 +919,6 @@ wimlib_add_image_multisource(WIMStruct *w,
 		goto out_destroy_inode_table;
 	}
 	sd->total_length = 8;
-	sd->refcnt = 1;
 
 	sd_set.sd = sd;
 	sd_set.rb_root.rb_node = NULL;
@@ -945,10 +933,9 @@ wimlib_add_image_multisource(WIMStruct *w,
 		goto out_free_security_data;
 	}
 
-
-	DEBUG("Building dentry tree.");
+	INIT_LIST_HEAD(&unhashed_streams);
+	w->lookup_table->unhashed_streams = &unhashed_streams;
 	root_dentry = NULL;
-
 	for (size_t i = 0; i < num_sources; i++) {
 		int flags;
 		union wimlib_progress_info progress;
@@ -1006,32 +993,38 @@ wimlib_add_image_multisource(WIMStruct *w,
 			goto out_free_dentry_tree;
 	}
 
-	DEBUG("Calculating full paths of dentries.");
-	ret = for_dentry_in_tree(root_dentry, calculate_dentry_full_path, NULL);
-	if (ret)
-		goto out_free_dentry_tree;
-
 	ret = add_new_dentry_tree(w, root_dentry, sd);
-	if (ret)
+
+	if (ret) {
+#ifdef WITH_NTFS_3G
+		if (ntfs_vol)
+			do_ntfs_umount(ntfs_vol);
+#endif
 		goto out_free_dentry_tree;
+	}
 
-	imd = &w->image_metadata[w->hdr.image_count - 1];
+	imd = w->image_metadata[w->hdr.image_count - 1];
+	list_transfer(&unhashed_streams, &imd->unhashed_streams);
+
+#ifdef WITH_NTFS_3G
+	imd->ntfs_vol = ntfs_vol;
+#endif
 
 	DEBUG("Assigning hard link group IDs");
 	inode_table_prepare_inode_list(&inode_table, &imd->inode_list);
 
 	ret = xml_add_image(w, name);
 	if (ret)
-		goto out_destroy_imd;
+		goto out_put_imd;
 
 	if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_BOOT)
 		wimlib_set_boot_idx(w, w->hdr.image_count);
+
 	ret = 0;
 	goto out_destroy_inode_table;
-out_destroy_imd:
-	destroy_image_metadata(&w->image_metadata[w->hdr.image_count - 1],
-			       w->lookup_table);
-	w->hdr.image_count--;
+out_put_imd:
+	put_image_metadata(w->image_metadata[--w->hdr.image_count],
+			   w->lookup_table);
 	goto out_destroy_inode_table;
 out_free_branch:
 	free_dentry_tree(branch, w->lookup_table);