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

diff --git a/src/add_image.c b/src/add_image.c
index ac6be4d1..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;
 
 }
 
@@ -104,40 +91,20 @@ err:
 
 static int
 unix_capture_regular_file(const char *path,
-			  uint64_t size,
+			  u64 size,
 			  struct wim_inode *inode,
 			  struct wim_lookup_table *lookup_table)
 {
-	struct wim_lookup_table_entry *lte;
-	u8 hash[SHA1_HASH_SIZE];
-	int ret;
-
 	inode->i_attributes = FILE_ATTRIBUTE_NORMAL;
 
 	/* Empty files do not have to have a lookup table entry. */
-	if (size == 0)
-		return 0;
+	if (size != 0) {
+		struct wim_lookup_table_entry *lte;
+		char *file_on_disk;
 
-	/* For each regular file, we must check to see if the file is in
-	 * the lookup table already; if it is, we increment its refcnt;
-	 * otherwise, we create a new lookup table entry and insert it.
-	 * */
-
-	ret = sha1sum(path, hash);
-	if (ret)
-		return ret;
-
-	lte = __lookup_resource(lookup_table, hash);
-	if (lte) {
-		lte->refcnt++;
-		DEBUG("Add lte reference %u for `%s'", lte->refcnt,
-		      path);
-	} else {
-		char *file_on_disk = STRDUP(path);
-		if (!file_on_disk) {
-			ERROR("Failed to allocate memory for file path");
+		file_on_disk = STRDUP(path);
+		if (!file_on_disk)
 			return WIMLIB_ERR_NOMEM;
-		}
 		lte = new_lookup_table_entry();
 		if (!lte) {
 			FREE(file_on_disk);
@@ -146,11 +113,9 @@ 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;
-		lte->resource_entry.size = size;
-		copy_hash(lte->hash, hash);
-		lookup_table_insert(lookup_table, lte);
+		lookup_table_insert_unhashed(lookup_table, lte, inode, 0);
+		inode->i_lte = lte;
 	}
-	inode->i_lte = lte;
 	return 0;
 }
 
@@ -159,6 +124,7 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 				 char *path,
 				 size_t path_len,
 				 struct wim_lookup_table *lookup_table,
+				 struct wim_inode_table *inode_table,
 				 const struct wimlib_capture_config *config,
 				 int add_image_flags,
 				 wimlib_progress_func_t progress_func);
@@ -168,6 +134,7 @@ unix_capture_directory(struct wim_dentry *dir_dentry,
 		       char *path,
 		       size_t path_len,
 		       struct wim_lookup_table *lookup_table,
+		       struct wim_inode_table *inode_table,
 		       const struct wimlib_capture_config *config,
 		       int add_image_flags,
 		       wimlib_progress_func_t progress_func)
@@ -211,6 +178,7 @@ unix_capture_directory(struct wim_dentry *dir_dentry,
 						       path,
 						       path_len + 1 + name_len,
 						       lookup_table,
+						       inode_table,
 						       config,
 						       add_image_flags,
 						       progress_func);
@@ -272,6 +240,7 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 				 char *path,
 				 size_t path_len,
 				 struct wim_lookup_table *lookup_table,
+				 struct wim_inode_table *inode_table,
 				 const struct wimlib_capture_config *config,
 				 int add_image_flags,
 				 wimlib_progress_func_t progress_func)
@@ -346,13 +315,19 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 		goto out;
 	}
 
-	ret = new_dentry_with_timeless_inode(path_basename_with_len(path, path_len),
-					     &root);
+	ret = inode_table_new_dentry(inode_table,
+				     path_basename_with_len(path, path_len),
+				     stbuf.st_ino,
+				     stbuf.st_dev,
+				     &root);
 	if (ret)
 		goto out;
 
 	inode = root->d_inode;
 
+	if (inode->i_nlink > 1) /* Already captured this inode? */
+		goto out;
+
 #ifdef HAVE_STAT_NANOSECOND_PRECISION
 	inode->i_creation_time = timespec_to_wim_timestamp(stbuf.st_mtim);
 	inode->i_last_write_time = timespec_to_wim_timestamp(stbuf.st_mtim);
@@ -362,17 +337,6 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 	inode->i_last_write_time = unix_timestamp_to_wim(stbuf.st_mtime);
 	inode->i_last_access_time = unix_timestamp_to_wim(stbuf.st_atime);
 #endif
-	/* Leave the inode number at 0 for directories.  Otherwise grab the
-	 * inode number from the `stat' buffer, including the device number if
-	 * possible. */
-	if (!S_ISDIR(stbuf.st_mode)) {
-		if (sizeof(ino_t) >= 8)
-			inode->i_ino = (u64)stbuf.st_ino;
-		else
-			inode->i_ino = (u64)stbuf.st_ino |
-					   ((u64)stbuf.st_dev <<
-					    	((sizeof(ino_t) * 8) & 63));
-	}
 	inode->i_resolved = 1;
 	if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) {
 		ret = inode_set_unix_data(inode, stbuf.st_uid,
@@ -389,7 +353,7 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 						inode, lookup_table);
 	else if (S_ISDIR(stbuf.st_mode))
 		ret = unix_capture_directory(root, path, path_len,
-					     lookup_table, config,
+					     lookup_table, inode_table, config,
 					     add_image_flags, progress_func);
 	else
 		ret = unix_capture_symlink(path, inode, lookup_table);
@@ -438,6 +402,7 @@ static int
 unix_build_dentry_tree(struct wim_dentry **root_ret,
 		       const char *root_disk_path,
 		       struct wim_lookup_table *lookup_table,
+		       struct wim_inode_table *inode_table,
 		       struct sd_set *sd_set,
 		       const struct wimlib_capture_config *config,
 		       int add_image_flags,
@@ -463,6 +428,7 @@ unix_build_dentry_tree(struct wim_dentry **root_ret,
 					       path_buf,
 					       path_len,
 					       lookup_table,
+					       inode_table,
 					       config,
 					       add_image_flags,
 					       progress_func);
@@ -670,8 +636,8 @@ new_filler_directory(const tchar *name, struct wim_dentry **dentry_ret)
 	DEBUG("Creating filler directory \"%"TS"\"", name);
 	ret = new_dentry_with_inode(name, &dentry);
 	if (ret == 0) {
-		/* Leave the inode number as 0 for now.  The final inode number
-		 * will be assigned later by assign_inode_numbers(). */
+		/* Leave the inode number as 0; this is allowed for non
+		 * hard-linked files. */
 		dentry->d_inode->i_resolved = 1;
 		dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
 		*dentry_ret = dentry;
@@ -856,6 +822,7 @@ wimlib_add_image_multisource(WIMStruct *w,
 	int (*capture_tree)(struct wim_dentry **,
 			    const tchar *,
 			    struct wim_lookup_table *,
+			    struct wim_inode_table *,
 			    struct sd_set *,
 			    const struct wimlib_capture_config *,
 			    int,
@@ -866,8 +833,13 @@ wimlib_add_image_multisource(WIMStruct *w,
 	struct wim_dentry *branch;
 	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
@@ -881,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!");
@@ -936,18 +908,22 @@ wimlib_add_image_multisource(WIMStruct *w,
 	if (ret)
 		goto out;
 
+	ret = init_inode_table(&inode_table, 9001);
+	if (ret)
+		goto out;
+
 	DEBUG("Allocating security data");
 	sd = CALLOC(1, sizeof(struct wim_security_data));
 	if (!sd) {
 		ret = WIMLIB_ERR_NOMEM;
-		goto out;
+		goto out_destroy_inode_table;
 	}
 	sd->total_length = 8;
-	sd->refcnt = 1;
 
 	sd_set.sd = sd;
 	sd_set.rb_root.rb_node = NULL;
 
+
 	DEBUG("Using %zu capture sources", num_sources);
 	canonicalize_sources_and_targets(sources, num_sources);
 	sort_sources(sources, num_sources);
@@ -957,9 +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;
@@ -982,6 +958,7 @@ wimlib_add_image_multisource(WIMStruct *w,
 		ret = (*capture_tree)(&branch,
 				      sources[i].fs_source_path,
 				      w->lookup_table,
+				      &inode_table,
 				      &sd_set,
 				      config,
 				      flags,
@@ -1016,44 +993,47 @@ 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);
 
-	ret = dentry_tree_fix_inodes(root_dentry, &imd->inode_list);
-	if (ret)
-		goto out_destroy_imd;
+#ifdef WITH_NTFS_3G
+	imd->ntfs_vol = ntfs_vol;
+#endif
 
 	DEBUG("Assigning hard link group IDs");
-	assign_inode_numbers(&imd->inode_list);
+	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_sd_set;
-out_destroy_imd:
-	destroy_image_metadata(&w->image_metadata[w->hdr.image_count - 1],
-			       w->lookup_table);
-	w->hdr.image_count--;
-	goto out_destroy_sd_set;
+	goto out_destroy_inode_table;
+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);
 out_free_dentry_tree:
 	free_dentry_tree(root_dentry, w->lookup_table);
 out_free_security_data:
 	free_security_data(sd);
-out_destroy_sd_set:
+out_destroy_inode_table:
+	destroy_inode_table(&inode_table);
 	destroy_sd_set(&sd_set);
 out:
 	return ret;