X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fadd_image.c;h=fc2f6a200ca314e486942d66378bdd8ae1665833;hb=07319692b785446fb5aab6c455443554f9c00ec7;hp=62fbdfb3141bc2647696117fcb26ada96efb4a69;hpb=01919fdd57105c0ab91316b79c10e3992e686436;p=wimlib

diff --git a/src/add_image.c b/src/add_image.c
index 62fbdfb3..fc2f6a20 100644
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -28,15 +28,15 @@
 #include "xml.h"
 #include <string.h>
 #include <fnmatch.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <errno.h>
 #include <unistd.h>
 
-/** Private flag: Used to mark that we currently adding the root directory of
- * the WIM image. */
-#define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000
+#define WIMLIB_ADD_IMAGE_FLAG_ROOT	0x80000000
+#define WIMLIB_ADD_IMAGE_FLAG_SOURCE    0x40000000
 
 /*
  * Adds the dentry tree and security data for a new image to the image metadata
@@ -136,7 +136,6 @@ static int build_dentry_tree(struct wim_dentry **root_ret,
 	int ret = 0;
 	int (*stat_fn)(const char *restrict, struct stat *restrict);
 	struct wim_dentry *root;
-	const char *filename;
 	struct wim_inode *inode;
 
 	if (exclude_path(root_disk_path, config, true)) {
@@ -199,12 +198,7 @@ static int build_dentry_tree(struct wim_dentry **root_ret,
 		return WIMLIB_ERR_SPECIAL_FILE;
 	}
 
-	if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT)
-		filename = "";
-	else
-		filename = path_basename(root_disk_path);
-
-	root = new_dentry_with_timeless_inode(filename);
+	root = new_dentry_with_timeless_inode(path_basename(root_disk_path));
 	if (!root) {
 		if (errno == EILSEQ)
 			return WIMLIB_ERR_INVALID_UTF8_STRING;
@@ -230,10 +224,17 @@ static int build_dentry_tree(struct wim_dentry **root_ret,
 	else
 		inode->i_ino = (u64)root_stbuf.st_ino |
 				   ((u64)root_stbuf.st_dev << ((sizeof(ino_t) * 8) & 63));
-
-	add_image_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT;
 	inode->i_resolved = 1;
-
+	if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) {
+		ret = inode_set_unix_data(inode, root_stbuf.st_uid,
+					  root_stbuf.st_gid,
+					  root_stbuf.st_mode,
+					  lookup_table,
+					  UNIX_DATA_ALL | UNIX_DATA_CREATE);
+		if (ret)
+			goto out;
+	}
+	add_image_flags &= ~(WIMLIB_ADD_IMAGE_FLAG_ROOT | WIMLIB_ADD_IMAGE_FLAG_SOURCE);
 	if (S_ISREG(root_stbuf.st_mode)) { /* Archiving a regular file */
 
 		struct wim_lookup_table_entry *lte;
@@ -389,8 +390,13 @@ enum pattern_type {
 	ALIGNMENT_LIST,
 };
 
+#define COMPAT_DEFAULT_CONFIG
+
 /* Default capture configuration file when none is specified. */
 static const char *default_config =
+#ifdef COMPAT_DEFAULT_CONFIG /* XXX: This policy is being moved to library
+				users.  The next ABI-incompatible library
+				version will default to the empty string here. */
 "[ExclusionList]\n"
 "\\$ntfs.log\n"
 "\\hiberfil.sys\n"
@@ -404,6 +410,9 @@ static const char *default_config =
 "*.zip\n"
 "*.cab\n"
 "\\WINDOWS\\inf\\*.pnf\n";
+#else
+"";
+#endif
 
 static void destroy_pattern_list(struct pattern_list *list)
 {
@@ -439,11 +448,10 @@ static int pattern_list_add_pattern(struct pattern_list *list,
 
 /* Parses the contents of the image capture configuration file and fills in a
  * `struct capture_config'. */
-static int init_capture_config(const char *_config_str, size_t config_len,
-			       const char *_prefix, struct capture_config *config)
+static int init_capture_config(struct capture_config *config,
+			       const char *_config_str, size_t config_len)
 {
 	char *config_str;
-	char *prefix;
 	char *p;
 	char *eol;
 	char *next_p;
@@ -460,17 +468,10 @@ static int init_capture_config(const char *_config_str, size_t config_len,
 		ERROR("Could not duplicate capture config string");
 		return WIMLIB_ERR_NOMEM;
 	}
-	prefix = STRDUP(_prefix);
-	if (!prefix) {
-		FREE(config_str);
-		return WIMLIB_ERR_NOMEM;
-	}
 
 	memcpy(config_str, _config_str, config_len);
 	next_p = config_str;
 	config->config_str = config_str;
-	config->prefix = prefix;
-	config->prefix_len = strlen(prefix);
 	while (bytes_remaining) {
 		line_no++;
 		p = next_p;
@@ -545,6 +546,19 @@ out_destroy:
 	return ret;
 }
 
+static int capture_config_set_prefix(struct capture_config *config,
+				     const char *_prefix)
+{
+	char *prefix = STRDUP(_prefix);
+
+	if (!prefix)
+		return WIMLIB_ERR_NOMEM;
+	FREE(config->prefix);
+	config->prefix = prefix;
+	config->prefix_len = strlen(prefix);
+	return 0;
+}
+
 static bool match_pattern(const char *path, const char *path_basename,
 			  const struct pattern_list *list)
 {
@@ -576,21 +590,6 @@ static bool match_pattern(const char *path, const char *path_basename,
 	return false;
 }
 
-static void print_pattern_list(const struct pattern_list *list)
-{
-	for (size_t i = 0; i < list->num_pats; i++)
-		printf("    %s\n", list->pats[i]);
-}
-
-static void print_capture_config(const struct capture_config *config)
-{
-	if (config->exclusion_list.num_pats) {
-		puts("Files or folders excluded from image capture:");
-		print_pattern_list(&config->exclusion_list);
-		putchar('\n');
-	}
-}
-
 /* Return true if the image capture configuration file indicates we should
  * exclude the filename @path from capture.
  *
@@ -615,10 +614,242 @@ bool exclude_path(const char *path, const struct capture_config *config,
 
 }
 
-WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *source,
-			       const char *name, const char *config_str,
-			       size_t config_len, int add_image_flags,
-			       wimlib_progress_func_t progress_func)
+/* Strip leading and trailing forward slashes from a string.  Modifies it in
+ * place and returns the stripped string. */
+static const char *canonicalize_target_path(char *target_path)
+{
+	char *p;
+	if (target_path == NULL)
+		target_path = "";
+	for (;;) {
+		if (*target_path == '\0')
+			return target_path;
+		else if (*target_path == '/')
+			target_path++;
+		else
+			break;
+	}
+
+	p = target_path + strlen(target_path) - 1;
+	while (*p == '/')
+		*p-- = '\0';
+	return target_path;
+}
+
+/* Strip leading and trailing slashes from the target paths */
+static void canonicalize_targets(struct wimlib_capture_source *sources,
+				 size_t num_sources)
+{
+	while (num_sources--) {
+		DEBUG("Canonicalizing { source: \"%s\", target=\"%s\"}",
+		      sources->fs_source_path,
+		      sources->wim_target_path);
+		sources->wim_target_path =
+			(char*)canonicalize_target_path(sources->wim_target_path);
+		DEBUG("Canonical target: \"%s\"", sources->wim_target_path);
+		sources++;
+	}
+}
+
+static int capture_source_cmp(const void *p1, const void *p2)
+{
+	const struct wimlib_capture_source *s1 = p1, *s2 = p2;
+	return strcmp(s1->wim_target_path, s2->wim_target_path);
+}
+
+/* Sorts the capture sources lexicographically by target path.  This occurs
+ * after leading and trailing forward slashes are stripped.
+ *
+ * One purpose of this is to make sure that target paths that are inside other
+ * target paths are extracted after the containing target paths. */
+static void sort_sources(struct wimlib_capture_source *sources,
+			 size_t num_sources)
+{
+	qsort(sources, num_sources, sizeof(sources[0]), capture_source_cmp);
+}
+
+static int check_sorted_sources(struct wimlib_capture_source *sources,
+				size_t num_sources, int add_image_flags)
+{
+	if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) {
+		if (num_sources != 1) {
+			ERROR("Must specify exactly 1 capture source "
+			      "(the NTFS volume) in NTFS mode!");
+			return WIMLIB_ERR_INVALID_PARAM;
+		}
+		if (sources[0].wim_target_path[0] != '\0') {
+			ERROR("In NTFS capture mode the target path inside "
+			      "the image must be the root directory!");
+			return WIMLIB_ERR_INVALID_PARAM;
+		}
+	} else if (num_sources != 0) {
+		/* This code is disabled because the current code
+		 * unconditionally attempts to do overlays.  So, duplicate
+		 * target paths are OK. */
+	#if 0
+		if (num_sources > 1 && sources[0].wim_target_path[0] == '\0') {
+			ERROR("Cannot specify root target when using multiple "
+			      "capture sources!");
+			return WIMLIB_ERR_INVALID_PARAM;
+		}
+		for (size_t i = 0; i < num_sources - 1; i++) {
+			size_t len = strlen(sources[i].wim_target_path);
+			size_t j = i + 1;
+			const char *target1 = sources[i].wim_target_path;
+			do {
+				const char *target2 = sources[j].wim_target_path;
+				DEBUG("target1=%s, target2=%s",
+				      target1,target2);
+				if (strncmp(target1, target2, len) ||
+				    target2[len] > '/')
+					break;
+				if (target2[len] == '/') {
+					ERROR("Invalid target `%s': is a prefix of `%s'",
+					      target1, target2);
+					return WIMLIB_ERR_INVALID_PARAM;
+				}
+				if (target2[len] == '\0') {
+					ERROR("Invalid target `%s': is a duplicate of `%s'",
+					      target1, target2);
+					return WIMLIB_ERR_INVALID_PARAM;
+				}
+			} while (++j != num_sources);
+		}
+	#endif
+	}
+	return 0;
+
+}
+
+/* Creates a new directory to place in the WIM image.  This is to create parent
+ * directories that are not part of any target as needed.  */
+static struct wim_dentry *
+new_filler_directory(const char *name)
+{
+	struct wim_dentry *dentry;
+	DEBUG("Creating filler directory \"%s\"", name);
+	dentry = new_dentry_with_inode(name);
+	if (dentry) {
+		/* Set the inode number to 0 for now.  The final inode number
+		 * will be assigned later by assign_inode_numbers(). */
+		dentry->d_inode->i_ino = 0;
+		dentry->d_inode->i_resolved = 1;
+		dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
+	}
+	return dentry;
+}
+
+/* Transfers the children of @branch to @target.  It is an error if @target is
+ * not a directory or if both @branch and @target contain a child dentry with
+ * the same name. */
+static int do_overlay(struct wim_dentry *target, struct wim_dentry *branch)
+{
+	struct rb_root *rb_root;
+
+	if (!dentry_is_directory(target)) {
+		ERROR("Cannot overlay directory `%s' over non-directory",
+		      branch->file_name_utf8);
+		return WIMLIB_ERR_INVALID_OVERLAY;
+	}
+
+	rb_root = &branch->d_inode->i_children;
+	while (rb_root->rb_node) { /* While @branch has children... */
+		struct wim_dentry *child = rbnode_dentry(rb_root->rb_node);
+		/* Move @child to the directory @target */
+		unlink_dentry(child);
+		if (!dentry_add_child(target, child)) {
+			/* Revert the change to avoid leaking the directory tree
+			 * rooted at @child */
+			dentry_add_child(branch, child);
+			ERROR("Overlay error: file `%s' already exists "
+			      "as a child of `%s'",
+			      child->file_name_utf8, target->file_name_utf8);
+			return WIMLIB_ERR_INVALID_OVERLAY;
+		}
+	}
+	return 0;
+
+}
+
+/* Attach or overlay a branch onto the WIM image.
+ *
+ * @root_p:
+ * 	Pointer to the root of the WIM image, or pointer to NULL if it has not
+ * 	been created yet.
+ * @branch
+ * 	Branch to add.
+ * @target_path:
+ * 	Path in the WIM image to add the branch, with leading and trailing
+ * 	slashes stripped.
+ */
+static int attach_branch(struct wim_dentry **root_p,
+			 struct wim_dentry *branch,
+			 char *target_path)
+{
+	char *slash;
+	struct wim_dentry *dentry, *parent, *target;
+
+	if (*target_path == '\0') {
+		/* Target: root directory */
+		if (*root_p) {
+			/* Overlay on existing root */
+			return do_overlay(*root_p, branch);
+		} else  {
+			/* Set as root */
+			*root_p = branch;
+			return 0;
+		}
+	}
+
+	/* Adding a non-root branch.  Create root if it hasn't been created
+	 * already. */
+	if (!*root_p) {
+		*root_p = new_filler_directory("");
+		if (!*root_p)
+			return WIMLIB_ERR_NOMEM;
+	}
+
+	/* Walk the path to the branch, creating filler directories as needed.
+	 * */
+	parent = *root_p;
+	while ((slash = strchr(target_path, '/'))) {
+		*slash = '\0';
+		dentry = get_dentry_child_with_name(parent, target_path);
+		if (!dentry) {
+			dentry = new_filler_directory(target_path);
+			if (!dentry)
+				return WIMLIB_ERR_NOMEM;
+			dentry_add_child(parent, dentry);
+		}
+		parent = dentry;
+		target_path = slash;
+		/* Skip over slashes.  Note: this cannot overrun the length of
+		 * the string because the last character cannot be a slash, as
+		 * trailing slashes were tripped.  */
+		do {
+			++target_path;
+		} while (*target_path == '/');
+	}
+
+	/* If the target path already existed, overlay the branch onto it.
+	 * Otherwise, set the branch as the target path. */
+	target = get_dentry_child_with_name(parent, branch->file_name_utf8);
+	if (target) {
+		return do_overlay(target, branch);
+	} else {
+		dentry_add_child(parent, branch);
+		return 0;
+	}
+}
+
+WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w,
+					   struct wimlib_capture_source *sources,
+					   size_t num_sources,
+					   const char *name,
+					   const char *config_str,
+					   size_t config_len,
+					   int add_image_flags,
+					   wimlib_progress_func_t progress_func)
 {
 	int (*capture_tree)(struct wim_dentry **, const char *,
 			    struct wim_lookup_table *,
@@ -626,8 +857,8 @@ WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *source,
 			    const struct capture_config *,
 			    int, wimlib_progress_func_t, void *);
 	void *extra_arg;
-
-	struct wim_dentry *root_dentry = NULL;
+	struct wim_dentry *root_dentry;
+	struct wim_dentry *branch;
 	struct wim_security_data *sd;
 	struct capture_config config;
 	struct wim_image_metadata *imd;
@@ -635,10 +866,15 @@ WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *source,
 
 	if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) {
 #ifdef WITH_NTFS_3G
-		if (add_image_flags & (WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE)) {
+		if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE) {
 			ERROR("Cannot dereference files when capturing directly from NTFS");
 			return WIMLIB_ERR_INVALID_PARAM;
 		}
+		if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) {
+			ERROR("Capturing UNIX owner and mode not supported "
+			      "when capturing directly from NTFS");
+			return WIMLIB_ERR_INVALID_PARAM;
+		}
 		capture_tree = build_dentry_tree_ntfs;
 		extra_arg = &w->ntfs_vol;
 #else
@@ -651,16 +887,10 @@ WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *source,
 		extra_arg = NULL;
 	}
 
-	DEBUG("Adding dentry tree from directory or NTFS volume `%s'.", source);
-
 	if (!name || !*name) {
 		ERROR("Must specify a non-empty string for the image name");
 		return WIMLIB_ERR_INVALID_PARAM;
 	}
-	if (!source || !*source) {
-		ERROR("Must specify the name of a directory or NTFS volume");
-		return WIMLIB_ERR_INVALID_PARAM;
-	}
 
 	if (w->hdr.total_parts != 1) {
 		ERROR("Cannot add an image to a split WIM");
@@ -673,48 +903,92 @@ WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *source,
 		return WIMLIB_ERR_IMAGE_NAME_COLLISION;
 	}
 
-	DEBUG("Initializing capture configuration");
 	if (!config_str) {
 		DEBUG("Using default capture configuration");
 		config_str = default_config;
 		config_len = strlen(default_config);
 	}
-	ret = init_capture_config(config_str, config_len, source, &config);
-	if (ret != 0)
-		return ret;
-	print_capture_config(&config);
+	ret = init_capture_config(&config, config_str, config_len);
+	if (ret)
+		goto out;
 
 	DEBUG("Allocating security data");
-
 	sd = CALLOC(1, sizeof(struct wim_security_data));
 	if (!sd) {
 		ret = WIMLIB_ERR_NOMEM;
-		goto out_destroy_config;
+		goto out_destroy_capture_config;
 	}
 	sd->total_length = 8;
 	sd->refcnt = 1;
 
-	if (progress_func) {
-		union wimlib_progress_info progress;
-		progress.scan.source = source;
-		progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, &progress);
-	}
-
-	DEBUG("Building dentry tree.");
-	ret = (*capture_tree)(&root_dentry, source, w->lookup_table, sd,
-			      &config, add_image_flags | WIMLIB_ADD_IMAGE_FLAG_ROOT,
-			      progress_func, extra_arg);
-	destroy_capture_config(&config);
-
-	if (ret != 0) {
-		ERROR("Failed to build dentry tree for `%s'", source);
+	DEBUG("Using %zu capture sources", num_sources);
+	canonicalize_targets(sources, num_sources);
+	sort_sources(sources, num_sources);
+	ret = check_sorted_sources(sources, num_sources, add_image_flags);
+	if (ret) {
+		ret = WIMLIB_ERR_INVALID_PARAM;
 		goto out_free_security_data;
 	}
 
-	if (progress_func) {
-		union wimlib_progress_info progress;
-		progress.scan.source = source;
-		progress_func(WIMLIB_PROGRESS_MSG_SCAN_END, &progress);
+	DEBUG("Building dentry tree.");
+	if (num_sources == 0) {
+		root_dentry = new_filler_directory("");
+		if (!root_dentry)
+			goto out_free_security_data;
+	} else {
+		size_t i;
+
+		root_dentry = NULL;
+		i = 0;
+		do {
+			int flags;
+			union wimlib_progress_info progress;
+
+			DEBUG("Building dentry tree for source %zu of %zu "
+			      "(\"%s\" => \"%s\")", i + 1, num_sources,
+			      sources[i].fs_source_path,
+			      sources[i].wim_target_path);
+			if (progress_func) {
+				memset(&progress, 0, sizeof(progress));
+				progress.scan.source = sources[i].fs_source_path;
+				progress.scan.wim_target_path = sources[i].wim_target_path;
+				progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, &progress);
+			}
+			ret = capture_config_set_prefix(&config,
+							sources[i].fs_source_path);
+			if (ret)
+				goto out_free_dentry_tree;
+			flags = add_image_flags | WIMLIB_ADD_IMAGE_FLAG_SOURCE;
+			if (!*sources[i].wim_target_path)
+				flags |= WIMLIB_ADD_IMAGE_FLAG_ROOT;
+			ret = (*capture_tree)(&branch, sources[i].fs_source_path,
+					      w->lookup_table, sd,
+					      &config,
+					      flags,
+					      progress_func, extra_arg);
+			if (ret) {
+				ERROR("Failed to build dentry tree for `%s'",
+				      sources[i].fs_source_path);
+				goto out_free_dentry_tree;
+			}
+			if (branch) {
+				/* Use the target name, not the source name, for
+				 * the root of each branch from a capture
+				 * source.  (This will also set the root dentry
+				 * of the entire image to be unnamed.) */
+				ret = set_dentry_name(branch,
+						      path_basename(sources[i].wim_target_path));
+				if (ret)
+					goto out_free_branch;
+
+				ret = attach_branch(&root_dentry, branch,
+						    sources[i].wim_target_path);
+				if (ret)
+					goto out_free_branch;
+			}
+			if (progress_func)
+				progress_func(WIMLIB_PROGRESS_MSG_SCAN_END, &progress);
+		} while (++i != num_sources);
 	}
 
 	DEBUG("Calculating full paths of dentries.");
@@ -741,17 +1015,43 @@ WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *source,
 
 	if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_BOOT)
 		wimlib_set_boot_idx(w, w->hdr.image_count);
-	return 0;
+	ret = 0;
+	goto out;
 out_destroy_imd:
 	destroy_image_metadata(&w->image_metadata[w->hdr.image_count - 1],
 			       w->lookup_table);
 	w->hdr.image_count--;
-	return ret;
+	goto out;
+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_config:
+out_destroy_capture_config:
 	destroy_capture_config(&config);
+out:
+	return ret;
+}
+
+WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *source,
+			       const char *name, const char *config_str,
+			       size_t config_len, int add_image_flags,
+			       wimlib_progress_func_t progress_func)
+{
+	if (!source || !*source)
+		return WIMLIB_ERR_INVALID_PARAM;
+
+	char *fs_source_path = STRDUP(source);
+	int ret;
+	struct wimlib_capture_source capture_src = {
+		.fs_source_path = fs_source_path,
+		.wim_target_path = NULL,
+		.reserved = 0,
+	};
+	ret = wimlib_add_image_multisource(w, &capture_src, 1, name,
+					   config_str, config_len,
+					   add_image_flags, progress_func);
+	FREE(fs_source_path);
 	return ret;
 }