X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fadd_image.c;h=de9a465f15d012f82065fc0ce700471e21065472;hp=d658dc923fd58395e1e0062e715b9034a1337850;hb=c6a1140e085f633273fcf47a6462bd9382ce118a;hpb=ded522fd0a15d740354329c5066ebd3473563e57 diff --git a/src/add_image.c b/src/add_image.c index d658dc92..de9a465f 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,52 @@ * 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 "security.h" + #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, - struct wim_security_data *sd) +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,15 +74,13 @@ 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) goto err_free_imd; metadata_lte->resource_entry.flags = WIM_RESHDR_FLAG_METADATA; - random_hash(metadata_lte->hash); - lookup_table_insert(w->lookup_table, metadata_lte); new_imd = &imd[w->hdr.image_count]; @@ -99,553 +100,789 @@ err: } +#ifndef __WIN32__ -/* - * Recursively builds a dentry tree from a directory tree on disk, outside the - * WIM file. - * - * @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 - * excluded from capture. - * - * @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, - * 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. - * - * @sd: Ignored. (Security data only captured in NTFS mode.) - * - * @capture_config: - * Configuration for files to be excluded from capture. - * - * @add_flags: Bitwise or of WIMLIB_ADD_IMAGE_FLAG_* - * - * @extra_arg: Ignored. (Only used in NTFS mode.) - * - * @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 - * directories cannot be opened or read. Failure to add the files - * to the WIM may still occur later when trying to actually read - * 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_capture_regular_file(const char *path, + uint64_t size, + struct wim_inode *inode, + struct wim_lookup_table *lookup_table) { - struct stat root_stbuf; + 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; + + /* 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"); + return WIMLIB_ERR_NOMEM; + } + lte = new_lookup_table_entry(); + if (!lte) { + FREE(file_on_disk); + return WIMLIB_ERR_NOMEM; + } + 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); + } + inode->i_lte = lte; + return 0; +} + +static int +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); + +static int +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) +{ + + DIR *dir; + struct dirent entry, *result; + struct wim_dentry *child; + int ret; + + dir_dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY; + dir = opendir(path); + if (!dir) { + ERROR_WITH_ERRNO("Failed to open the directory `%s'", + path); + return WIMLIB_ERR_OPEN; + } + + /* Recurse on directory contents */ + while (1) { + errno = 0; + ret = readdir_r(dir, &entry, &result); + if (ret != 0) { + ret = WIMLIB_ERR_READ; + ERROR_WITH_ERRNO("Error reading the " + "directory `%s'", + path); + break; + } + if (result == NULL) + break; + if (result->d_name[0] == '.' && (result->d_name[1] == '\0' + || (result->d_name[1] == '.' && result->d_name[2] == '\0'))) + continue; + + size_t name_len = strlen(result->d_name); + + path[path_len] = '/'; + memcpy(&path[path_len + 1], result->d_name, name_len + 1); + ret = unix_build_dentry_tree_recursive(&child, + path, + path_len + 1 + name_len, + lookup_table, + inode_table, + config, + add_image_flags, + progress_func); + if (ret) + break; + if (child) + dentry_add_child(dir_dentry, child); + } + closedir(dir); + return ret; +} + +static int +unix_capture_symlink(const char *path, + struct wim_inode *inode, + struct wim_lookup_table *lookup_table) +{ + char deref_name_buf[4096]; + ssize_t deref_name_len; + int ret; + + 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 + * data buffer that contains a relative or absolute symbolic + * link (NOT a junction point or *full* path symbolic link with + * drive letter). + */ + deref_name_len = readlink(path, deref_name_buf, + sizeof(deref_name_buf) - 1); + if (deref_name_len >= 0) { + deref_name_buf[deref_name_len] = '\0'; + DEBUG("Read symlink `%s'", deref_name_buf); + ret = inode_set_symlink(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(path, &stbuf) == 0 && S_ISDIR(stbuf.st_mode)) + inode->i_attributes |= FILE_ATTRIBUTE_DIRECTORY; + } + } else { + ERROR_WITH_ERRNO("Failed to read target of " + "symbolic link `%s'", path); + ret = WIMLIB_ERR_READLINK; + } + return ret; +} + +static int +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) +{ + 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 (exclude_path(path, path_len, 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) + if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE) && progress_func) { union wimlib_progress_info info; - info.scan.cur_path = root_disk_path; + info.scan.cur_path = path; 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) && progress_func) { union wimlib_progress_info info; - info.scan.cur_path = root_disk_path; + info.scan.cur_path = path; info.scan.excluded = false; progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); } + /* UNIX version of capturing a directory tree */ + struct stat stbuf; + int (*stat_fn)(const char *restrict, struct stat *restrict); if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE) stat_fn = stat; else stat_fn = lstat; - ret = (*stat_fn)(root_disk_path, &root_stbuf); + ret = (*stat_fn)(path, &stbuf); if (ret != 0) { - ERROR_WITH_ERRNO("Failed to stat `%s'", root_disk_path); - return WIMLIB_ERR_STAT; + ERROR_WITH_ERRNO("Failed to stat `%s'", path); + goto out; } if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) && - !S_ISDIR(root_stbuf.st_mode)) + !S_ISDIR(stbuf.st_mode)) { /* Do a dereference-stat in case the root is a symbolic link. * This case is allowed, provided that the symbolic link points * to a directory. */ - ret = stat(root_disk_path, &root_stbuf); + ret = stat(path, &stbuf); if (ret != 0) { - ERROR_WITH_ERRNO("Failed to stat `%s'", root_disk_path); - return WIMLIB_ERR_STAT; + ERROR_WITH_ERRNO("Failed to stat `%s'", path); + 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; + if (!S_ISDIR(stbuf.st_mode)) { + ERROR("`%s' is not a directory", path); + 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)) { + if (!S_ISREG(stbuf.st_mode) && !S_ISDIR(stbuf.st_mode) + && !S_ISLNK(stbuf.st_mode)) { ERROR("`%s' is not a regular file, directory, or symbolic link.", - root_disk_path); - return WIMLIB_ERR_SPECIAL_FILE; + path); + 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); - if (!root) { - if (errno == EILSEQ) - return WIMLIB_ERR_INVALID_UTF8_STRING; - else - return WIMLIB_ERR_NOMEM; - } + 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->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(stbuf.st_mtim); + inode->i_last_write_time = timespec_to_wim_timestamp(stbuf.st_mtim); + inode->i_last_access_time = timespec_to_wim_timestamp(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(stbuf.st_mtime); + 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 - if (sizeof(ino_t) >= 8) - inode->ino = (u64)root_stbuf.st_ino; + inode->i_resolved = 1; + if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) { + ret = inode_set_unix_data(inode, stbuf.st_uid, + stbuf.st_gid, + 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(stbuf.st_mode)) + ret = unix_capture_regular_file(path, stbuf.st_size, + inode, lookup_table); + else if (S_ISDIR(stbuf.st_mode)) + ret = unix_capture_directory(root, path, path_len, + lookup_table, inode_table, config, + add_image_flags, progress_func); 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; + ret = unix_capture_symlink(path, inode, lookup_table); +out: + if (ret == 0) + *root_ret = root; + else + free_dentry_tree(root, lookup_table); + return ret; +} - if (S_ISREG(root_stbuf.st_mode)) { /* Archiving a regular file */ +/* + * unix_build_dentry_tree(): + * Builds a tree of WIM dentries from an on-disk directory tree (UNIX + * version; no NTFS-specific data is captured). + * + * @root_ret: Place to return a pointer to the root of the dentry tree. Only + * 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. + * + * @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, + * 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. + * + * @sd_set: Ignored. (Security data only captured in NTFS mode.) + * + * @config: + * Configuration for files to be excluded from capture. + * + * @add_flags: Bitwise or of WIMLIB_ADD_IMAGE_FLAG_* + * + * @extra_arg: Ignored + * + * @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 + * directories cannot be opened or read. Failure to add the files + * to the WIM may still occur later when trying to actually read + * the on-disk files during a call to wimlib_write() or + * wimlib_overwrite(). + */ +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, + wimlib_progress_func_t progress_func, + void *extra_arg) +{ + char *path_buf; + int ret; + size_t path_len; + size_t path_bufsz; - struct lookup_table_entry *lte; - u8 hash[SHA1_HASH_SIZE]; + path_bufsz = min(32790, PATH_MAX + 1); + path_len = strlen(root_disk_path); - inode->attributes = FILE_ATTRIBUTE_NORMAL; + if (path_len >= path_bufsz) + return WIMLIB_ERR_INVALID_PARAM; - /* Empty files do not have to have a lookup table entry. */ - if (root_stbuf.st_size == 0) - goto out; + path_buf = MALLOC(path_bufsz); + if (!path_buf) + return WIMLIB_ERR_NOMEM; + memcpy(path_buf, root_disk_path, path_len + 1); + ret = unix_build_dentry_tree_recursive(root_ret, + path_buf, + path_len, + lookup_table, + inode_table, + config, + add_image_flags, + progress_func); + FREE(path_buf); + return ret; +} +#endif /* !__WIN32__ */ - /* 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. - * */ +static bool +match_pattern(const tchar *path, + const tchar *path_basename, + const struct wimlib_pattern_list *list) +{ + for (size_t i = 0; i < list->num_pats; i++) { - ret = sha1sum(root_disk_path, hash); - if (ret != 0) - goto out; + const tchar *pat = list->pats[i]; + const tchar *string; - lte = __lookup_resource(lookup_table, hash); - if (lte) { - lte->refcnt++; - DEBUG("Add lte reference %u for `%s'", lte->refcnt, - root_disk_path); + if (*pat == T('/')) { + /* Absolute path from root of capture */ + string = 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); + if (tstrchr(pat, T('/'))) + /* Relative path from root of capture */ + string = path + 1; + else + /* A file name pattern */ + string = path_basename; } - root->d_inode->lte = lte; - } else if (S_ISDIR(root_stbuf.st_mode)) { /* Archiving a directory */ - - inode->attributes = FILE_ATTRIBUTE_DIRECTORY; - DIR *dir; - struct dirent entry, *result; - struct dentry *child; - - dir = opendir(root_disk_path); - if (!dir) { - ERROR_WITH_ERRNO("Failed to open the directory `%s'", - root_disk_path); - ret = WIMLIB_ERR_OPEN; - goto out; + /* Warning: on Windows native builds, fnmatch() calls the + * replacement function in win32.c. */ + if (fnmatch(pat, string, FNM_PATHNAME | FNM_NOESCAPE + #ifdef FNM_CASEFOLD + | FNM_CASEFOLD + #endif + ) == 0) + { + DEBUG("\"%"TS"\" matches the pattern \"%"TS"\"", + string, pat); + return true; + } else { + DEBUG2("\"%"TS"\" does not match the pattern \"%"TS"\"", + string, pat); } + } + return false; +} - /* Buffer for names of files in directory. */ - size_t len = strlen(root_disk_path); - char name[len + 1 + FILENAME_MAX + 1]; - memcpy(name, root_disk_path, len); - name[len] = '/'; - - /* Create a dentry for each entry in the directory on disk, and recurse - * to any subdirectories. */ - while (1) { - errno = 0; - ret = readdir_r(dir, &entry, &result); - if (ret != 0) { - ret = WIMLIB_ERR_READ; - ERROR_WITH_ERRNO("Error reading the " - "directory `%s'", - root_disk_path); - break; - } - if (result == NULL) - break; - if (result->d_name[0] == '.' && (result->d_name[1] == '\0' - || (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); - if (ret != 0) - break; - if (child) - dentry_add_child(root, child); - } - closedir(dir); - } 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) { - deref_name_buf[deref_name_len] = '\0'; - 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; +/* Return true if the image capture configuration file indicates we should + * exclude the filename @path from capture. + * + * If @exclude_prefix is %true, the part of the path up and including the name + * of the directory being captured is not included in the path for matching + * purposes. This allows, for example, a pattern like /hiberfil.sys to match a + * file /mnt/windows7/hiberfil.sys if we are capturing the /mnt/windows7 + * directory. + */ +bool +exclude_path(const tchar *path, size_t path_len, + const struct wimlib_capture_config *config, bool exclude_prefix) +{ + const tchar *basename = path_basename_with_len(path, path_len); + if (exclude_prefix) { + wimlib_assert(path_len >= config->_prefix_num_tchars); + if (!tmemcmp(config->_prefix, path, config->_prefix_num_tchars) && + path[config->_prefix_num_tchars] == T('/')) + { + path += config->_prefix_num_tchars; } } -out: - if (ret == 0) - *root_ret = root; - else - free_dentry_tree(root, lookup_table); - return ret; + return match_pattern(path, basename, &config->exclusion_pats) && + !match_pattern(path, basename, &config->exclusion_exception_pats); + } +/* Strip leading and trailing forward slashes from a string. Modifies it in + * place and returns the stripped string. */ +static const tchar * +canonicalize_target_path(tchar *target_path) +{ + tchar *p; + if (target_path == NULL) + return T(""); + for (;;) { + if (*target_path == T('\0')) + return target_path; + else if (*target_path == T('/')) + target_path++; + else + break; + } -enum pattern_type { - NONE = 0, - EXCLUSION_LIST, - EXCLUSION_EXCEPTION, - COMPRESSION_EXCLUSION_LIST, - ALIGNMENT_LIST, -}; - -/* Default capture configuration file when none is specified. */ -static const char *default_config = -"[ExclusionList]\n" -"\\$ntfs.log\n" -"\\hiberfil.sys\n" -"\\pagefile.sys\n" -"\\System Volume Information\n" -"\\RECYCLER\n" -"\\Windows\\CSC\n" -"\n" -"[CompressionExclusionList]\n" -"*.mp3\n" -"*.zip\n" -"*.cab\n" -"\\WINDOWS\\inf\\*.pnf\n"; - -static void destroy_pattern_list(struct pattern_list *list) + p = tstrchr(target_path, T('\0')) - 1; + while (*p == T('/')) + *p-- = T('\0'); + return target_path; +} + +/* Strip leading and trailing slashes from the target paths, and translate all + * backslashes in the source and target paths into forward slashes. */ +static void +canonicalize_sources_and_targets(struct wimlib_capture_source *sources, + size_t num_sources) { - FREE(list->pats); + while (num_sources--) { + DEBUG("Canonicalizing { source: \"%"TS"\", target=\"%"TS"\"}", + sources->fs_source_path, + sources->wim_target_path); + + /* 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); + + sources->wim_target_path = + (tchar*)canonicalize_target_path(sources->wim_target_path); + DEBUG("Canonical target: \"%"TS"\"", sources->wim_target_path); + sources++; + } } -static void destroy_capture_config(struct capture_config *config) +static int +capture_source_cmp(const void *p1, const void *p2) { - destroy_pattern_list(&config->exclusion_list); - destroy_pattern_list(&config->exclusion_exception); - destroy_pattern_list(&config->compression_exclusion_list); - destroy_pattern_list(&config->alignment_list); - FREE(config->config_str); - FREE(config->prefix); - memset(config, 0, sizeof(*config)); + const struct wimlib_capture_source *s1 = p1, *s2 = p2; + return tstrcmp(s1->wim_target_path, s2->wim_target_path); } -static int pattern_list_add_pattern(struct pattern_list *list, - const char *pattern) +/* 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) { - const char **pats; - if (list->num_pats >= list->num_allocated_pats) { - pats = REALLOC(list->pats, - sizeof(list->pats[0]) * (list->num_allocated_pats + 8)); - if (!pats) - return WIMLIB_ERR_NOMEM; - list->num_allocated_pats += 8; - list->pats = pats; + 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] != T('\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 } - list->pats[list->num_pats++] = pattern; return 0; + } -/* 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) +/* 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 int +new_filler_directory(const tchar *name, struct wim_dentry **dentry_ret) { - char *config_str; - char *prefix; - char *p; - char *eol; - char *next_p; - size_t bytes_remaining; - enum pattern_type type = NONE; int ret; - unsigned long line_no = 0; - - DEBUG("config_len = %zu", config_len); - bytes_remaining = config_len; - memset(config, 0, sizeof(*config)); - config_str = MALLOC(config_len); - if (!config_str) { - ERROR("Could not duplicate capture config string"); - return WIMLIB_ERR_NOMEM; - } - prefix = STRDUP(_prefix); - if (!prefix) { - FREE(config_str); - return WIMLIB_ERR_NOMEM; + struct wim_dentry *dentry; + + DEBUG("Creating filler directory \"%"TS"\"", name); + ret = new_dentry_with_inode(name, &dentry); + if (ret == 0) { + /* 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; } + return ret; +} - 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; - eol = memchr(p, '\n', bytes_remaining); - if (!eol) { - ERROR("Expected end-of-line in capture config file on " - "line %lu", line_no); - ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG; - goto out_destroy; - } +/* 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; - next_p = eol + 1; - bytes_remaining -= (next_p - p); - if (eol == p) - continue; - - if (*(eol - 1) == '\r') - eol--; - *eol = '\0'; - - /* Translate backslash to forward slash */ - for (char *pp = p; pp != eol; pp++) - if (*pp == '\\') - *pp = '/'; - - /* Remove drive letter */ - if (eol - p > 2 && isalpha(*p) && *(p + 1) == ':') - p += 2; - - ret = 0; - if (strcmp(p, "[ExclusionList]") == 0) - type = EXCLUSION_LIST; - else if (strcmp(p, "[ExclusionException]") == 0) - type = EXCLUSION_EXCEPTION; - else if (strcmp(p, "[CompressionExclusionList]") == 0) - type = COMPRESSION_EXCLUSION_LIST; - else if (strcmp(p, "[AlignmentList]") == 0) - type = ALIGNMENT_LIST; - else if (p[0] == '[' && strrchr(p, ']')) { - ERROR("Unknown capture configuration section `%s'", p); - ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG; - } else switch (type) { - case EXCLUSION_LIST: - DEBUG("Adding pattern \"%s\" to exclusion list", p); - ret = pattern_list_add_pattern(&config->exclusion_list, p); - break; - case EXCLUSION_EXCEPTION: - DEBUG("Adding pattern \"%s\" to exclusion exception list", p); - ret = pattern_list_add_pattern(&config->exclusion_exception, p); - break; - case COMPRESSION_EXCLUSION_LIST: - DEBUG("Adding pattern \"%s\" to compression exclusion list", p); - ret = pattern_list_add_pattern(&config->compression_exclusion_list, p); - break; - case ALIGNMENT_LIST: - DEBUG("Adding pattern \"%s\" to alignment list", p); - ret = pattern_list_add_pattern(&config->alignment_list, p); - break; - default: - ERROR("Line %lu of capture configuration is not " - "in a block (such as [ExclusionList])", - line_no); - ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG; - break; + DEBUG("Doing overlay \"%"WS"\" => \"%"WS"\"", + branch->file_name, target->file_name); + + if (!dentry_is_directory(target)) { + ERROR("Cannot overlay directory \"%"WS"\" " + "over non-directory", branch->file_name); + 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 \"%"WS"\" already exists " + "as a child of \"%"WS"\"", + child->file_name, target->file_name); + return WIMLIB_ERR_INVALID_OVERLAY; } - if (ret != 0) - goto out_destroy; } + free_dentry(branch); return 0; -out_destroy: - destroy_capture_config(config); - return ret; + } -static bool match_pattern(const char *path, const char *path_basename, - const struct pattern_list *list) +/* 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, + tchar *target_path) { - for (size_t i = 0; i < list->num_pats; i++) { - const char *pat = list->pats[i]; - const char *string; - if (pat[0] == '/') - /* Absolute path from root of capture */ - string = path; - else { - if (strchr(pat, '/')) - /* Relative path from root of capture */ - string = path + 1; - else - /* A file name pattern */ - string = path_basename; + tchar *slash; + struct wim_dentry *dentry, *parent, *target; + int ret; + + DEBUG("Attaching branch \"%"WS"\" => \"%"TS"\"", + branch->file_name, target_path); + + if (*target_path == T('\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; } - if (fnmatch(pat, string, FNM_PATHNAME - #ifdef FNM_CASEFOLD - | FNM_CASEFOLD - #endif - ) == 0) - { - DEBUG("`%s' matches the pattern \"%s\"", - string, pat); - return true; + } + + /* Adding a non-root branch. Create root if it hasn't been created + * already. */ + if (!*root_p) { + ret = new_filler_directory(T(""), root_p); + if (ret) + return ret; + } + + /* Walk the path to the branch, creating filler directories as needed. + * */ + parent = *root_p; + while ((slash = tstrchr(target_path, T('/')))) { + *slash = T('\0'); + dentry = get_dentry_child_with_name(parent, target_path); + if (!dentry) { + ret = new_filler_directory(target_path, &dentry); + if (ret) + return ret; + 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 == T('/')); } - 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]); + /* If the target path already existed, overlay the branch onto it. + * Otherwise, set the branch as the target path. */ + target = get_dentry_child_with_utf16le_name(parent, branch->file_name, + branch->file_name_nbytes); + if (target) { + return do_overlay(target, branch); + } else { + dentry_add_child(parent, branch); + return 0; + } } -static void print_capture_config(const struct capture_config *config) +static int +canonicalize_pat(tchar **pat_p) { - if (config->exclusion_list.num_pats) { - puts("Files or folders excluded from image capture:"); - print_pattern_list(&config->exclusion_list); - putchar('\n'); + tchar *pat = *pat_p; + + /* Turn all backslashes in the pattern into forward slashes. */ + zap_backslashes(pat); + + if (*pat != T('/') && *pat != T('\0') && *(pat + 1) == T(':')) { + /* Pattern begins with drive letter */ + if (*(pat + 2) != T('/')) { + /* Something like c:file, which is actually a path + * relative to the current working directory on the c: + * drive. We require paths with drive letters to be + * absolute. */ + ERROR("Invalid path \"%"TS"\"; paths including drive letters " + "must be absolute!", pat); + ERROR("Maybe try \"%"TC":/%"TS"\"?", + *pat, pat + 2); + return WIMLIB_ERR_INVALID_CAPTURE_CONFIG; + } + + WARNING("Pattern \"%"TS"\" starts with a drive letter, which is " + "being removed.", pat); + /* Strip the drive letter */ + pat += 2; + *pat_p = pat; } + return 0; } -/* Return true if the image capture configuration file indicates we should - * exclude the filename @path from capture. - * - * If @exclude_prefix is %true, the part of the path up and including the name - * of the directory being captured is not included in the path for matching - * purposes. This allows, for example, a pattern like /hiberfil.sys to match a - * file /mnt/windows7/hiberfil.sys if we are capturing the /mnt/windows7 - * directory. - */ -bool exclude_path(const char *path, const struct capture_config *config, - bool exclude_prefix) +static int +canonicalize_pat_list(struct wimlib_pattern_list *pat_list) { - const char *basename = path_basename(path); - if (exclude_prefix) { - wimlib_assert(strlen(path) >= config->prefix_len); - if (memcmp(config->prefix, path, config->prefix_len) == 0 - && path[config->prefix_len] == '/') - path += config->prefix_len; + int ret = 0; + for (size_t i = 0; i < pat_list->num_pats; i++) { + ret = canonicalize_pat(&pat_list->pats[i]); + if (ret) + break; } - return match_pattern(path, basename, &config->exclusion_list) && - !match_pattern(path, basename, &config->exclusion_exception); + return ret; +} +static int +canonicalize_capture_config(struct wimlib_capture_config *config) +{ + int ret = canonicalize_pat_list(&config->exclusion_pats); + if (ret) + return ret; + return canonicalize_pat_list(&config->exclusion_exception_pats); } -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) +WIMLIBAPI int +wimlib_add_image_multisource(WIMStruct *w, + struct wimlib_capture_source *sources, + size_t num_sources, + const tchar *name, + struct wimlib_capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func) { - int (*capture_tree)(struct dentry **, const char *, - struct lookup_table *, - struct wim_security_data *, - const struct capture_config *, - int, wimlib_progress_func_t, void *); + 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, + 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; + struct wim_inode_table inode_table; int ret; + struct sd_set sd_set; 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 +891,32 @@ 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 (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) + add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE; 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"); @@ -675,90 +924,169 @@ WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *source, } if (wimlib_image_name_in_use(w, name)) { - ERROR("There is already an image named \"%s\" in `%s'", - name, w->filename); + ERROR("There is already an image named \"%"TS"\" in the WIM!", + name); 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); + if (!config) { + DEBUG("Capture config not provided; using empty config"); + config = alloca(sizeof(*config)); + memset(config, 0, sizeof(*config)); } - ret = init_capture_config(config_str, config_len, source, &config); - if (ret != 0) - return ret; - print_capture_config(&config); - DEBUG("Allocating security data"); + ret = canonicalize_capture_config(config); + 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_destroy_config; + goto out_destroy_inode_table; } 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); - } + sd_set.sd = sd; + sd_set.rb_root.rb_node = NULL; - 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_sources_and_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) { + + DEBUG("Building dentry tree."); + root_dentry = NULL; + + for (size_t i = 0; i < num_sources; i++) { + int flags; union wimlib_progress_info progress; - progress.scan.source = source; - progress_func(WIMLIB_PROGRESS_MSG_SCAN_END, &progress); + + DEBUG("Building dentry tree for source %zu of %zu " + "(\"%"TS"\" => \"%"TS"\")", 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); + } + config->_prefix = sources[i].fs_source_path; + config->_prefix_num_tchars = tstrlen(sources[i].fs_source_path); + 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, + &inode_table, + &sd_set, + config, + flags, + progress_func, extra_arg); + if (ret) { + ERROR("Failed to build dentry tree for `%"TS"'", + 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); + } + + if (root_dentry == NULL) { + ret = new_filler_directory(T(""), &root_dentry); + if (ret) + 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 != 0) + if (ret) goto out_free_dentry_tree; ret = add_new_dentry_tree(w, root_dentry, sd); - if (ret != 0) + if (ret) goto out_free_dentry_tree; imd = &w->image_metadata[w->hdr.image_count - 1]; - ret = dentry_tree_fix_inodes(root_dentry, &imd->inode_list); - if (ret != 0) - goto out_destroy_imd; - 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 != 0) + if (ret) goto out_destroy_imd; 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_inode_table; 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_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_config: - destroy_capture_config(&config); +out_destroy_inode_table: + destroy_inode_table(&inode_table); + destroy_sd_set(&sd_set); +out: + return ret; +} + +WIMLIBAPI int +wimlib_add_image(WIMStruct *w, + const tchar *source, + const tchar *name, + struct wimlib_capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func) +{ + if (!source || !*source) + return WIMLIB_ERR_INVALID_PARAM; + + tchar *fs_source_path = TSTRDUP(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, add_image_flags, + progress_func); + FREE(fs_source_path); return ret; }