X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fadd_image.c;h=67a354e4b27b0e3424f020de322a0d22adfc1a3f;hp=d658dc923fd58395e1e0062e715b9034a1337850;hb=7acdc3aecd7ce546727ae8239e0d942c2a00db43;hpb=ded522fd0a15d740354329c5066ebd3473563e57 diff --git a/src/add_image.c b/src/add_image.c index d658dc92..67a354e4 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. * @@ -21,49 +21,48 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ +#include "config.h" + +#ifdef __WIN32__ +# include "win32.h" +#else +# include +# include +# include +# include "timestamp.h" +#endif + #include "wimlib_internal.h" #include "dentry.h" -#include "timestamp.h" #include "lookup_table.h" #include "xml.h" -#include -#include + #include -#include -#include #include +#include +#include #include -/** Private flag: Used to mark that we currently adding the root directory of - * the WIM image. */ -#define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000 +#ifdef HAVE_ALLOCA_H +# include +#endif /* - * 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. - * - * Does not update the XML data. - * - * On failure, WIMLIB_ERR_NOMEM is returned and no changes are made. Otherwise, - * 0 is returned and the image metadata array of @w is modified. - * - * @w: The WIMStruct for the WIM file. - * @root_dentry: The root of the directory tree for the image. - * @sd: The security data for the image. + * Adds the dentry tree and security data for a new image to the image metadata + * array of the WIMStruct. */ -int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry, +int add_new_dentry_tree(WIMStruct *w, struct wim_dentry *root_dentry, struct wim_security_data *sd) { - struct lookup_table_entry *metadata_lte; - struct image_metadata *imd; - struct image_metadata *new_imd; + 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 image_metadata)); + imd = CALLOC((w->hdr.image_count + 1), sizeof(struct wim_image_metadata)); if (!imd) { ERROR("Failed to allocate memory for new image metadata array"); @@ -71,7 +70,7 @@ int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry, } memcpy(imd, w->image_metadata, - w->hdr.image_count * sizeof(struct image_metadata)); + w->hdr.image_count * sizeof(struct wim_image_metadata)); metadata_lte = new_lookup_table_entry(); if (!metadata_lte) @@ -99,16 +98,17 @@ err: } - +#ifndef __WIN32__ /* - * Recursively builds a dentry tree from a directory tree on disk, outside the - * WIM file. + * build_dentry_tree(): + * Recursively builds a tree of WIM dentries from an on-disk directory + * tree. * * @root_ret: Place to return a pointer to the root of the dentry tree. Only - * modified if successful. NULL if the file or directory was + * modified if successful. Set to 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 (UTF-8). * * @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, @@ -123,7 +123,8 @@ err: * * @add_flags: Bitwise or of WIMLIB_ADD_IMAGE_FLAG_* * - * @extra_arg: Ignored. (Only used in NTFS mode.) + * @extra_arg: Ignored in UNIX builds; used to pass sd_set pointer in Windows + * builds. * * @return: 0 on success, nonzero on failure. It is a failure if any of * the files cannot be `stat'ed, or if any of the needed @@ -132,26 +133,24 @@ err: * the on-disk files during a call to wimlib_write() or * wimlib_overwrite(). */ -static int build_dentry_tree(struct dentry **root_ret, - const char *root_disk_path, - struct lookup_table *lookup_table, - struct wim_security_data *sd, - const struct capture_config *config, - int add_image_flags, - wimlib_progress_func_t progress_func, - void *extra_arg) +static int unix_build_dentry_tree(struct wim_dentry **root_ret, + const char *root_disk_path, + struct wim_lookup_table *lookup_table, + struct wim_security_data *sd, + const struct capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func, + void *extra_arg) { - struct stat root_stbuf; + struct wim_dentry *root = NULL; int ret = 0; - int (*stat_fn)(const char *restrict, struct stat *restrict); - struct dentry *root; - const char *filename; - struct inode *inode; + struct wim_inode *inode; if (exclude_path(root_disk_path, config, true)) { if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) { ERROR("Cannot exclude the root directory from capture"); - return WIMLIB_ERR_INVALID_CAPTURE_CONFIG; + ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG; + goto out; } if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) && progress_func) @@ -161,8 +160,7 @@ static int build_dentry_tree(struct dentry **root_ret, info.scan.excluded = true; progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); } - *root_ret = NULL; - return 0; + goto out; } if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) @@ -174,6 +172,9 @@ static int build_dentry_tree(struct dentry **root_ret, progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); } + /* UNIX version of capturing a directory tree */ + struct stat root_stbuf; + int (*stat_fn)(const char *restrict, struct stat *restrict); if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE) stat_fn = stat; else @@ -182,7 +183,7 @@ static int build_dentry_tree(struct dentry **root_ret, ret = (*stat_fn)(root_disk_path, &root_stbuf); if (ret != 0) { ERROR_WITH_ERRNO("Failed to stat `%s'", root_disk_path); - return WIMLIB_ERR_STAT; + goto out; } if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) && @@ -194,59 +195,71 @@ static int build_dentry_tree(struct dentry **root_ret, ret = stat(root_disk_path, &root_stbuf); if (ret != 0) { ERROR_WITH_ERRNO("Failed to stat `%s'", root_disk_path); - return WIMLIB_ERR_STAT; + ret = WIMLIB_ERR_STAT; + goto out; } if (!S_ISDIR(root_stbuf.st_mode)) { ERROR("`%s' is not a directory", root_disk_path); - return WIMLIB_ERR_NOTDIR; + ret = WIMLIB_ERR_NOTDIR; + goto out; } } if (!S_ISREG(root_stbuf.st_mode) && !S_ISDIR(root_stbuf.st_mode) && !S_ISLNK(root_stbuf.st_mode)) { ERROR("`%s' is not a regular file, directory, or symbolic link.", root_disk_path); - return WIMLIB_ERR_SPECIAL_FILE; + ret = WIMLIB_ERR_SPECIAL_FILE; + goto out; } - 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; + ret = WIMLIB_ERR_INVALID_UTF8_STRING; + else if (errno == ENOMEM) + ret = WIMLIB_ERR_NOMEM; else - return WIMLIB_ERR_NOMEM; + ret = WIMLIB_ERR_ICONV_NOT_AVAILABLE; + goto out; } inode = root->d_inode; #ifdef HAVE_STAT_NANOSECOND_PRECISION - 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); + inode->i_creation_time = timespec_to_wim_timestamp(root_stbuf.st_mtim); + inode->i_last_write_time = timespec_to_wim_timestamp(root_stbuf.st_mtim); + inode->i_last_access_time = timespec_to_wim_timestamp(root_stbuf.st_atim); #else - inode->creation_time = unix_timestamp_to_wim(root_stbuf.st_mtime); - inode->last_write_time = unix_timestamp_to_wim(root_stbuf.st_mtime); - inode->last_access_time = unix_timestamp_to_wim(root_stbuf.st_atime); + inode->i_creation_time = unix_timestamp_to_wim(root_stbuf.st_mtime); + inode->i_last_write_time = unix_timestamp_to_wim(root_stbuf.st_mtime); + inode->i_last_access_time = unix_timestamp_to_wim(root_stbuf.st_atime); #endif - 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_image_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT; - inode->resolved = 1; - + /* Leave the inode number at 0 for directories. */ + if (!S_ISDIR(root_stbuf.st_mode)) { + if (sizeof(ino_t) >= 8) + inode->i_ino = (u64)root_stbuf.st_ino; + else + inode->i_ino = (u64)root_stbuf.st_ino | + ((u64)root_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, 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 lookup_table_entry *lte; + struct wim_lookup_table_entry *lte; u8 hash[SHA1_HASH_SIZE]; - inode->attributes = FILE_ATTRIBUTE_NORMAL; + inode->i_attributes = FILE_ATTRIBUTE_NORMAL; /* Empty files do not have to have a lookup table entry. */ if (root_stbuf.st_size == 0) @@ -286,14 +299,14 @@ static int build_dentry_tree(struct dentry **root_ret, copy_hash(lte->hash, hash); lookup_table_insert(lookup_table, lte); } - root->d_inode->lte = lte; + root->d_inode->i_lte = lte; } else if (S_ISDIR(root_stbuf.st_mode)) { /* Archiving a directory */ - inode->attributes = FILE_ATTRIBUTE_DIRECTORY; + inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY; DIR *dir; struct dirent entry, *result; - struct dentry *child; + struct wim_dentry *child; dir = opendir(root_disk_path); if (!dir) { @@ -327,9 +340,11 @@ static int build_dentry_tree(struct dentry **root_ret, || (result->d_name[1] == '.' && result->d_name[2] == '\0'))) continue; strcpy(name + len + 1, result->d_name); - ret = build_dentry_tree(&child, name, lookup_table, - NULL, config, add_image_flags, - progress_func, NULL); + ret = unix_build_dentry_tree(&child, name, + lookup_table, + NULL, config, + add_image_flags, + progress_func, NULL); if (ret != 0) break; if (child) @@ -337,8 +352,8 @@ static int build_dentry_tree(struct dentry **root_ret, } closedir(dir); } else { /* Archiving a symbolic link */ - inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT; - inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; + inode->i_attributes = FILE_ATTRIBUTE_REPARSE_POINT; + inode->i_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 @@ -370,7 +385,7 @@ static int build_dentry_tree(struct dentry **root_ret, if (stat(root_disk_path, &stbuf) == 0 && S_ISDIR(stbuf.st_mode)) { - inode->attributes |= FILE_ATTRIBUTE_DIRECTORY; + inode->i_attributes |= FILE_ATTRIBUTE_DIRECTORY; } } } else { @@ -386,7 +401,7 @@ out: free_dentry_tree(root, lookup_table); return ret; } - +#endif /* !__WIN32__ */ enum pattern_type { NONE = 0, @@ -396,8 +411,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" @@ -411,6 +431,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) { @@ -446,11 +469,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; @@ -467,17 +489,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; @@ -552,6 +567,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) { @@ -569,11 +597,14 @@ static bool match_pattern(const char *path, const char *path_basename, /* A file name pattern */ string = path_basename; } + + /* Warning: on Windows native builds, fnmatch() calls the + * replacement function in win32.c. */ if (fnmatch(pat, string, FNM_PATHNAME - #ifdef FNM_CASEFOLD - | FNM_CASEFOLD - #endif - ) == 0) + #ifdef FNM_CASEFOLD + | FNM_CASEFOLD + #endif + ) == 0) { DEBUG("`%s' matches the pattern \"%s\"", string, pat); @@ -583,21 +614,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. * @@ -622,30 +638,292 @@ 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) + return ""; + 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; +} + +#ifdef __WIN32__ +static void zap_backslashes(char *s) +{ + while (*s) { + if (*s == '\\') + *s = '/'; + s++; + } +} +#endif + +/* 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); +#ifdef __WIN32__ + /* The Windows API can handle forward slashes. Just get rid of + * backslashes to avoid confusing other parts of the library + * code. */ + zap_backslashes(sources->fs_source_path); + if (sources->wim_target_path) + zap_backslashes(sources->wim_target_path); +#endif + 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 added 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) { + /* Leave the inode number as 0 for now. The final inode number + * will be assigned later by assign_inode_numbers(). */ + 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; + + DEBUG("Doing overlay %s => %s", + branch->file_name_utf8, target->file_name_utf8); + + 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; + } + } + free_dentry(branch); + 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; + + DEBUG("Attaching branch \"%s\" => \"%s\"", + branch->file_name_utf8, target_path); + + 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 dentry **, const char *, - struct lookup_table *, + int (*capture_tree)(struct wim_dentry **, const char *, + struct wim_lookup_table *, struct wim_security_data *, const struct capture_config *, int, wimlib_progress_func_t, void *); void *extra_arg; - - struct dentry *root_dentry = NULL; + struct wim_dentry *root_dentry; + struct wim_dentry *branch; struct wim_security_data *sd; struct capture_config config; - struct image_metadata *imd; + struct wim_image_metadata *imd; int ret; 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 @@ -654,20 +932,29 @@ WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *source, return WIMLIB_ERR_UNSUPPORTED; #endif } else { - capture_tree = build_dentry_tree; + #ifdef __WIN32__ + capture_tree = win32_build_dentry_tree; + #else + capture_tree = unix_build_dentry_tree; + #endif extra_arg = NULL; } - DEBUG("Adding dentry tree from directory or NTFS volume `%s'.", source); +#ifdef __WIN32__ + if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) { + ERROR("Capturing UNIX-specific data is not supported on Windows"); + return WIMLIB_ERR_INVALID_PARAM; + } + if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE) { + ERROR("Dereferencing symbolic links is not supported on Windows"); + return WIMLIB_ERR_INVALID_PARAM; + } +#endif 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"); @@ -680,48 +967,98 @@ 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) { + ret = WIMLIB_ERR_NOMEM; + goto out_free_security_data; + } + } else { + size_t i; + + #ifdef __WIN32__ + win32_acquire_capture_privileges(); + #endif + + 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."); @@ -748,17 +1085,46 @@ 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_destroy_capture_config; 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: +#ifdef __WIN32__ + win32_release_capture_privileges(); +#endif + 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; }