X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fmodify.c;h=3180c507a71116f88a23a1b7682673d6dbec281f;hb=0541069de2f74283d44ebb02372b60fb608795f2;hp=b0da749b7efa1c4fb2a658b4a628fcc4054d3462;hpb=fe2f5051c12e2d9187fd7640b8f19434c284f94d;p=wimlib

diff --git a/src/modify.c b/src/modify.c
index b0da749b..3180c507 100644
--- a/src/modify.c
+++ b/src/modify.c
@@ -32,6 +32,7 @@
 #include "dentry.h"
 #include "xml.h"
 #include "lookup_table.h"
+#include "timestamp.h"
 #include <sys/stat.h>
 #include <dirent.h>
 #include <string.h>
@@ -44,18 +45,21 @@
  * the WIM image. */
 #define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000
 
-void destroy_image_metadata(struct image_metadata *imd, struct lookup_table *lt)
+void destroy_image_metadata(struct image_metadata *imd,
+			    struct lookup_table *table)
 {
-	free_dentry_tree(imd->root_dentry, lt);
+	free_dentry_tree(imd->root_dentry, table);
 	free_security_data(imd->security_data);
 
 	/* Get rid of the lookup table entry for this image's metadata resource
 	 * */
-	if (lt)
-		lookup_table_remove(lt, imd->metadata_lte);
+	if (table) {
+		lookup_table_unlink(table, imd->metadata_lte);
+		free_lookup_table_entry(imd->metadata_lte);
+	}
 }
 
-/* 
+/*
  * Recursively builds a dentry tree from a directory tree on disk, outside the
  * WIM file.
  *
@@ -63,10 +67,10 @@ void destroy_image_metadata(struct image_metadata *imd, struct lookup_table *lt)
  *		modified if successful.  NULL if the file or directory was
  *		excluded from capture.
  *
- * @root_disk_path:  The path to the root of the directory tree on disk. 
+ * @root_disk_path:  The path to the root of the directory tree on disk.
  *
  * @lookup_table: The lookup table for the WIM file.  For each file added to the
- * 		dentry tree being built, an entry is added to the lookup table, 
+ * 		dentry tree being built, an entry is added to the lookup table,
  * 		unless an identical stream is already in the lookup table.
  * 		These lookup table entries that are added point to the path of
  * 		the file on disk.
@@ -100,6 +104,7 @@ static int build_dentry_tree(struct dentry **root_ret,
 	int (*stat_fn)(const char *restrict, struct stat *restrict);
 	struct dentry *root;
 	const char *filename;
+	struct inode *inode;
 
 	if (exclude_path(root_disk_path, config, true)) {
 		if (add_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) {
@@ -128,7 +133,7 @@ static int build_dentry_tree(struct dentry **root_ret,
 		return WIMLIB_ERR_STAT;
 	}
 
-	if ((add_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) && 
+	if ((add_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) &&
 	      !S_ISDIR(root_stbuf.st_mode)) {
 		ERROR("`%s' is not a directory", root_disk_path);
 		return WIMLIB_ERR_NOTDIR;
@@ -149,11 +154,70 @@ static int build_dentry_tree(struct dentry **root_ret,
 	if (!root)
 		return WIMLIB_ERR_NOMEM;
 
-	stbuf_to_inode(&root_stbuf, root->d_inode);
+	inode = root->d_inode;
+
+	inode->creation_time = timespec_to_wim_timestamp(&root_stbuf.st_mtim);
+	inode->last_write_time = timespec_to_wim_timestamp(&root_stbuf.st_mtim);
+	inode->last_access_time = timespec_to_wim_timestamp(&root_stbuf.st_atim);
+	if (sizeof(ino_t) >= 8)
+		inode->ino = (u64)root_stbuf.st_ino;
+	else
+		inode->ino = (u64)root_stbuf.st_ino |
+				   ((u64)root_stbuf.st_dev << ((sizeof(ino_t) * 8) & 63));
+
 	add_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT;
-	root->d_inode->resolved = true;
+	inode->resolved = true;
+
+	if (S_ISREG(root_stbuf.st_mode)) { /* Archiving a regular file */
+
+		struct lookup_table_entry *lte;
+		u8 hash[SHA1_HASH_SIZE];
+
+		inode->attributes = FILE_ATTRIBUTE_NORMAL;
+
+		/* Empty files do not have to have a lookup table entry. */
+		if (root_stbuf.st_size == 0)
+			goto out;
+
+		/* 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(root_disk_path, hash);
+		if (ret != 0)
+			goto out;
+
+		lte = __lookup_resource(lookup_table, hash);
+		if (lte) {
+			lte->refcnt++;
+			DEBUG("Add lte reference %u for `%s'", lte->refcnt,
+			      root_disk_path);
+		} else {
+			char *file_on_disk = STRDUP(root_disk_path);
+			if (!file_on_disk) {
+				ERROR("Failed to allocate memory for file path");
+				ret = WIMLIB_ERR_NOMEM;
+				goto out;
+			}
+			lte = new_lookup_table_entry();
+			if (!lte) {
+				FREE(file_on_disk);
+				ret = WIMLIB_ERR_NOMEM;
+				goto out;
+			}
+			lte->file_on_disk = file_on_disk;
+			lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
+			lte->resource_entry.original_size = root_stbuf.st_size;
+			lte->resource_entry.size = root_stbuf.st_size;
+			copy_hash(lte->hash, hash);
+			lookup_table_insert(lookup_table, lte);
+		}
+		root->d_inode->lte = lte;
+	} else if (S_ISDIR(root_stbuf.st_mode)) { /* Archiving a directory */
+
+		inode->attributes = FILE_ATTRIBUTE_DIRECTORY;
 
-	if (dentry_is_directory(root)) { /* Archiving a directory */
 		DIR *dir;
 		struct dirent *p;
 		struct dentry *child;
@@ -196,13 +260,23 @@ static int build_dentry_tree(struct dentry **root_ret,
 			if (ret != 0)
 				break;
 			if (child)
-				link_dentry(child, root);
+				dentry_add_child(root, child);
 		}
 		closedir(dir);
-	} else if (dentry_is_symlink(root)) { /* Archiving a symbolic link */
+	} else { /* Archiving a symbolic link */
+		inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
+		inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
+
+		/* The idea here is to call readlink() to get the UNIX target of
+		 * the symbolic link, then turn the target into a reparse point
+		 * data buffer that contains a relative or absolute symbolic
+		 * link (NOT a junction point or *full* path symbolic link with
+		 * drive letter).
+		 */
+
 		char deref_name_buf[4096];
 		ssize_t deref_name_len;
-		
+
 		deref_name_len = readlink(root_disk_path, deref_name_buf,
 					  sizeof(deref_name_buf) - 1);
 		if (deref_name_len >= 0) {
@@ -210,55 +284,27 @@ static int build_dentry_tree(struct dentry **root_ret,
 			DEBUG("Read symlink `%s'", deref_name_buf);
 			ret = inode_set_symlink(root->d_inode, deref_name_buf,
 						lookup_table, NULL);
+			if (ret == 0) {
+				/*
+				 * Unfortunately, Windows seems to have the
+				 * concept of "file" symbolic links as being
+				 * different from "directory" symbolic links...
+				 * so FILE_ATTRIBUTE_DIRECTORY needs to be set
+				 * on the symbolic link if the *target* of the
+				 * symbolic link is a directory.
+				 */
+				struct stat stbuf;
+				if (stat(root_disk_path, &stbuf) == 0 &&
+				    S_ISDIR(stbuf.st_mode))
+				{
+					inode->attributes |= FILE_ATTRIBUTE_DIRECTORY;
+				}
+			}
 		} else {
 			ERROR_WITH_ERRNO("Failed to read target of "
 					 "symbolic link `%s'", root_disk_path);
 			ret = WIMLIB_ERR_READLINK;
 		}
-	} else { /* Archiving a regular file */
-
-		struct lookup_table_entry *lte;
-		u8 hash[SHA1_HASH_SIZE];
-
-		/* Empty files do not have to have a lookup table entry. */
-		if (root_stbuf.st_size == 0)
-			goto out;
-
-		/* 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(root_disk_path, hash);
-		if (ret != 0)
-			goto out;
-
-		lte = __lookup_resource(lookup_table, hash);
-		if (lte) {
-			lte->refcnt++;
-			DEBUG("Add lte reference %u for `%s'", lte->refcnt,
-			      root_disk_path);
-		} else {
-			char *file_on_disk = STRDUP(root_disk_path);
-			if (!file_on_disk) {
-				ERROR("Failed to allocate memory for file path");
-				ret = WIMLIB_ERR_NOMEM;
-				goto out;
-			}
-			lte = new_lookup_table_entry();
-			if (!lte) {
-				FREE(file_on_disk);
-				ret = WIMLIB_ERR_NOMEM;
-				goto out;
-			}
-			lte->file_on_disk = file_on_disk;
-			lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
-			lte->resource_entry.original_size = root_stbuf.st_size;
-			lte->resource_entry.size = root_stbuf.st_size;
-			copy_hash(lte->hash, hash);
-			lookup_table_insert(lookup_table, lte);
-		}
-		root->d_inode->lte = lte;
 	}
 out:
 	if (ret == 0)
@@ -300,14 +346,14 @@ static int allocate_lte_if_needed(struct dentry *dentry, void *arg)
 				dest_lte = clone_lookup_table_entry(src_lte);
 				if (!dest_lte)
 					return WIMLIB_ERR_NOMEM;
-				list_add_tail(&dest_lte->list, lte_list_head);
+				list_add_tail(&dest_lte->staging_list, lte_list_head);
 			}
 		}
 	}
 	return 0;
 }
 
-/* 
+/*
  * This function takes in a dentry that was previously located only in image(s)
  * in @src_wim, but now is being added to @dest_wim.  For each stream associated
  * with the dentry, if there is already a lookup table entry for that stream in
@@ -348,7 +394,8 @@ static int add_lte_to_dest_wim(struct dentry *dentry, void *arg)
 
 			next = lte_list_head->next;
 			list_del(next);
-			dest_lte = container_of(next, struct lookup_table_entry, list);
+			dest_lte = container_of(next, struct lookup_table_entry,
+						staging_list);
 			dest_lte->part_number = 1;
 			dest_lte->refcnt = 1;
 			wimlib_assert(hashes_equal(dest_lte->hash, src_lte->hash));
@@ -362,7 +409,7 @@ static int add_lte_to_dest_wim(struct dentry *dentry, void *arg)
 /*
  * Adds an image (given by its dentry tree) to the image metadata array of a WIM
  * file, adds an entry to the lookup table for the image metadata, updates the
- * image count in the header, and selects the new image. 
+ * image count in the header, and selects the new image.
  *
  * Does not update the XML data.
  *
@@ -389,15 +436,15 @@ static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry,
 
 	if (!imd) {
 		ERROR("Failed to allocate memory for new image metadata array");
-		return WIMLIB_ERR_NOMEM;
+		goto err;
 	}
 
-	memcpy(imd, w->image_metadata, 
+	memcpy(imd, w->image_metadata,
 	       w->hdr.image_count * sizeof(struct image_metadata));
-	
+
 	metadata_lte = new_lookup_table_entry();
 	if (!metadata_lte)
-		goto out_free_imd;
+		goto err_free_imd;
 
 	metadata_lte->resource_entry.flags = WIM_RESHDR_FLAG_METADATA;
 	random_hash(metadata_lte->hash);
@@ -420,10 +467,9 @@ static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry,
 	ret = select_wim_image(w, w->hdr.image_count);
 	wimlib_assert(ret == 0);
 	return ret;
-out_free_metadata_lte:
-	FREE(metadata_lte);
-out_free_imd:
+err_free_imd:
 	FREE(imd);
+err:
 	return WIMLIB_ERR_NOMEM;
 
 }
@@ -431,11 +477,11 @@ out_free_imd:
 /*
  * Copies an image, or all the images, from a WIM file, into another WIM file.
  */
-WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, 
-				  int src_image, 
-				  WIMStruct *dest_wim, 
-				  const char *dest_name, 
-				  const char *dest_description, 
+WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim,
+				  int src_image,
+				  WIMStruct *dest_wim,
+				  const char *dest_name,
+				  const char *dest_description,
 				  int flags,
 				  WIMStruct **additional_swms,
 				  unsigned num_additional_swms)
@@ -461,7 +507,7 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim,
 
 			/* multi-image export. */
 
-			if ((flags & WIMLIB_EXPORT_FLAG_BOOT) && 
+			if ((flags & WIMLIB_EXPORT_FLAG_BOOT) &&
 			      (src_wim->hdr.boot_idx == 0))
 			{
 				/* Specifying the boot flag on a multi-image
@@ -486,7 +532,7 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim,
 				if (i != src_wim->hdr.boot_idx)
 					export_flags &= ~WIMLIB_EXPORT_FLAG_BOOT;
 
-				ret = wimlib_export_image(src_wim, i, dest_wim, 
+				ret = wimlib_export_image(src_wim, i, dest_wim,
 							  NULL, NULL,
 							  export_flags,
 							  additional_swms,
@@ -495,8 +541,10 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim,
 					return ret;
 			}
 			return 0;
+		} else if (src_wim->hdr.image_count == 1) {
+			src_image = 1;
 		} else {
-			src_image = 1; 
+			return 0;
 		}
 	}
 
@@ -588,7 +636,7 @@ out_xml_delete_image:
 out_free_ltes:
 	{
 		struct lookup_table_entry *lte, *tmp;
-		list_for_each_entry_safe(lte, tmp, &wims.lte_list_head, list)
+		list_for_each_entry_safe(lte, tmp, &wims.lte_list_head, staging_list)
 			free_lookup_table_entry(lte);
 	}
 
@@ -600,8 +648,8 @@ out:
 	return ret;
 }
 
-/* 
- * Deletes an image from the WIM. 
+/*
+ * Deletes an image from the WIM.
  */
 WIMLIBAPI int wimlib_delete_image(WIMStruct *w, int image)
 {
@@ -655,6 +703,8 @@ WIMLIBAPI int wimlib_delete_image(WIMStruct *w, int image)
 
 	/* Remove the image from the XML information. */
 	xml_delete_image(&w->wim_info, image);
+
+	w->deletion_occurred = true;
 	return 0;
 }
 
@@ -742,7 +792,7 @@ static int init_capture_config(const char *_config_str, size_t config_len,
 		FREE(config_str);
 		return WIMLIB_ERR_NOMEM;
 	}
-	
+
 	memcpy(config_str, _config_str, config_len);
 	next_p = config_str;
 	config->config_str = config_str;
@@ -758,7 +808,7 @@ static int init_capture_config(const char *_config_str, size_t config_len,
 			ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG;
 			goto out_destroy;
 		}
-		
+
 		next_p = eol + 1;
 		bytes_remaining -= (next_p - p);
 		if (eol == p)
@@ -887,7 +937,7 @@ bool exclude_path(const char *path, const struct capture_config *config,
 		     && path[config->prefix_len] == '/')
 			path += config->prefix_len;
 	}
-	return match_pattern(path, basename, &config->exclusion_list) && 
+	return match_pattern(path, basename, &config->exclusion_list) &&
 		!match_pattern(path, basename, &config->exclusion_exception);
 
 }
@@ -910,7 +960,7 @@ int do_add_image(WIMStruct *w, const char *dir, const char *name,
 		 const char *config_str, size_t config_len,
 		 int flags,
 		 int (*capture_tree)(struct dentry **, const char *,
-			 	     struct lookup_table *, 
+			 	     struct lookup_table *,
 				     struct wim_security_data *,
 				     const struct capture_config *,
 				     int, void *),
@@ -967,6 +1017,9 @@ int do_add_image(WIMStruct *w, const char *dir, const char *name,
 	sd->refcnt = 1;
 
 	DEBUG("Building dentry tree.");
+	if (flags & WIMLIB_ADD_IMAGE_FLAG_SHOW_PROGRESS) {
+		printf("Scanning `%s'...\n", dir);
+	}
 	ret = (*capture_tree)(&root_dentry, dir, w->lookup_table, sd,
 			      &config, flags | WIMLIB_ADD_IMAGE_FLAG_ROOT,
 			      extra_arg);
@@ -1027,7 +1080,7 @@ out_destroy_config:
 /*
  * Adds an image to a WIM file from a directory tree on disk.
  */
-WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *dir, 
+WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *dir,
 			       const char *name, const char *config_str,
 			       size_t config_len, int flags)
 {