X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmodify.c;h=3403eb323720a9fda7e10306bdeee27834eabf81;hp=d2b03abe88607c04666da6bea041b91eec06cd70;hb=3cf06a471de65b5e69b44c41b95b1bbfb49ab55f;hpb=67f45cecd793345416d5d85fbe37ec54b1bb6ef8 diff --git a/src/modify.c b/src/modify.c index d2b03abe..3403eb32 100644 --- a/src/modify.c +++ b/src/modify.c @@ -2,7 +2,7 @@ * modify.c * * Support for modifying WIM files with image-level operations (delete an image, - * add an image, export an imagex from one WIM to another.) There is nothing + * add an image, export an image from one WIM to another.) There is nothing * here that lets you change individual files in the WIM; for that you will need * to look at the filesystem implementation in mount.c. */ @@ -32,6 +32,7 @@ #include "dentry.h" #include "xml.h" #include "lookup_table.h" +#include "timestamp.h" #include #include #include @@ -44,40 +45,59 @@ * the WIM image. */ #define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000 -void destroy_image_metadata(struct image_metadata *imd,struct lookup_table *lt) +void destroy_image_metadata(struct image_metadata *imd, + struct lookup_table *table) { - free_dentry_tree(imd->root_dentry, lt); + free_dentry_tree(imd->root_dentry, table); free_security_data(imd->security_data); /* Get rid of the lookup table entry for this image's metadata resource * */ - if (lt) - lookup_table_remove(lt, imd->metadata_lte); + if (table) { + lookup_table_unlink(table, imd->metadata_lte); + free_lookup_table_entry(imd->metadata_lte); + } } -/* +/* * Recursively builds a dentry tree from a directory tree on disk, outside the * WIM file. * - * @root: A dentry that has already been created for the root of the dentry - * tree. - * @root_disk_path: The path to the root of the tree on disk. + * @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 file is already in the lookup table. These - * lookup table entries that are added point to the file on disk. + * 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 regular files in the tree into the WIM as file resources. + * 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, +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_flags, + int add_image_flags, + wimlib_progress_func_t progress_func, void *extra_arg) { struct stat root_stbuf; @@ -85,32 +105,46 @@ static int build_dentry_tree(struct dentry **root_ret, const char *root_disk_pat int (*stat_fn)(const char *restrict, struct stat *restrict); struct dentry *root; const char *filename; + struct inode *inode; if (exclude_path(root_disk_path, config, true)) { - if (add_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) - printf("Excluding file `%s' from capture\n", - root_disk_path); + if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) { + ERROR("Cannot exclude the root directory from capture"); + return WIMLIB_ERR_INVALID_CAPTURE_CONFIG; + } + 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.excluded = true; + progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); + } *root_ret = NULL; return 0; } + 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.excluded = false; + progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); + } - if (add_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE) + if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE) stat_fn = stat; else stat_fn = lstat; - if (add_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) - printf("Scanning `%s'\n", root_disk_path); - - 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; } - if ((add_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) && + if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) && !S_ISDIR(root_stbuf.st_mode)) { ERROR("`%s' is not a directory", root_disk_path); return WIMLIB_ERR_NOTDIR; @@ -122,75 +156,36 @@ static int build_dentry_tree(struct dentry **root_ret, const char *root_disk_pat return WIMLIB_ERR_SPECIAL_FILE; } - if (add_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) + if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) filename = ""; else filename = path_basename(root_disk_path); - root = new_dentry_with_inode(filename); + root = new_dentry_with_timeless_inode(filename); if (!root) return WIMLIB_ERR_NOMEM; - stbuf_to_dentry(&root_stbuf, root); - add_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT; - root->inode->resolved = true; + inode = root->d_inode; - if (dentry_is_directory(root)) { - /* Open the directory on disk */ - DIR *dir; - struct dirent *p; - struct dentry *child; + inode->creation_time = timespec_to_wim_timestamp(&root_stbuf.st_mtim); + inode->last_write_time = timespec_to_wim_timestamp(&root_stbuf.st_mtim); + inode->last_access_time = timespec_to_wim_timestamp(&root_stbuf.st_atim); + if (sizeof(ino_t) >= 8) + inode->ino = (u64)root_stbuf.st_ino; + else + inode->ino = (u64)root_stbuf.st_ino | + ((u64)root_stbuf.st_dev << ((sizeof(ino_t) * 8) & 63)); - dir = opendir(root_disk_path); - if (!dir) { - ERROR_WITH_ERRNO("Failed to open the directory `%s'", - root_disk_path); - return WIMLIB_ERR_OPEN; - } + add_image_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT; + inode->resolved = true; - /* 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] = '/'; + if (S_ISREG(root_stbuf.st_mode)) { /* Archiving a regular file */ - /* Create a dentry for each entry in the directory on disk, and recurse - * to any subdirectories. */ - while ((p = readdir(dir)) != NULL) { - if (p->d_name[0] == '.' && (p->d_name[1] == '\0' - || (p->d_name[1] == '.' && p->d_name[2] == '\0'))) - continue; - strcpy(name + len + 1, p->d_name); - ret = build_dentry_tree(&child, name, lookup_table, - sd, config, - add_flags, extra_arg); - if (ret != 0) - break; - if (child) - link_dentry(child, root); - } - closedir(dir); - } else if (dentry_is_symlink(root)) { - /* Archiving a symbolic link */ - 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 == -1) { - ERROR_WITH_ERRNO("Failed to read target of " - "symbolic link `%s'", root_disk_path); - return WIMLIB_ERR_READLINK; - } - deref_name_buf[deref_name_len] = '\0'; - DEBUG("Read symlink `%s'", deref_name_buf); - ret = inode_set_symlink(root->inode, deref_name_buf, - lookup_table, NULL); - } else { - /* Regular file */ struct lookup_table_entry *lte; u8 hash[SHA1_HASH_SIZE]; + inode->attributes = FILE_ATTRIBUTE_NORMAL; + /* Empty files do not have to have a lookup table entry. */ if (root_stbuf.st_size == 0) goto out; @@ -199,9 +194,10 @@ static int build_dentry_tree(struct dentry **root_ret, const char *root_disk_pat * the lookup table already; if it is, we increment its refcnt; * otherwise, we create a new lookup table entry and insert it. * */ + ret = sha1sum(root_disk_path, hash); if (ret != 0) - return ret; + goto out; lte = __lookup_resource(lookup_table, hash); if (lte) { @@ -212,12 +208,14 @@ static int build_dentry_tree(struct dentry **root_ret, const char *root_disk_pat char *file_on_disk = STRDUP(root_disk_path); if (!file_on_disk) { ERROR("Failed to allocate memory for file path"); - return WIMLIB_ERR_NOMEM; + ret = WIMLIB_ERR_NOMEM; + goto out; } lte = new_lookup_table_entry(); if (!lte) { FREE(file_on_disk); - return WIMLIB_ERR_NOMEM; + ret = WIMLIB_ERR_NOMEM; + goto out; } lte->file_on_disk = file_on_disk; lte->resource_location = RESOURCE_IN_FILE_ON_DISK; @@ -226,52 +224,193 @@ static int build_dentry_tree(struct dentry **root_ret, const char *root_disk_pat copy_hash(lte->hash, hash); lookup_table_insert(lookup_table, lte); } - root->inode->lte = lte; + 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 *p; + 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; + } + + /* 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; + p = readdir(dir); + if (p == NULL) { + if (errno) { + ret = WIMLIB_ERR_READ; + ERROR_WITH_ERRNO("Error reading the " + "directory `%s'", + root_disk_path); + } + break; + } + if (p->d_name[0] == '.' && (p->d_name[1] == '\0' + || (p->d_name[1] == '.' && p->d_name[2] == '\0'))) + continue; + strcpy(name + len + 1, p->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; + } } out: - *root_ret = root; + if (ret == 0) + *root_ret = root; + else + free_dentry_tree(root, lookup_table); return ret; } struct wim_pair { WIMStruct *src_wim; WIMStruct *dest_wim; + struct list_head lte_list_head; }; -/* +static int allocate_lte_if_needed(struct dentry *dentry, void *arg) +{ + const WIMStruct *src_wim, *dest_wim; + struct list_head *lte_list_head; + struct inode *inode; + + src_wim = ((struct wim_pair*)arg)->src_wim; + dest_wim = ((struct wim_pair*)arg)->dest_wim; + lte_list_head = &((struct wim_pair*)arg)->lte_list_head; + inode = dentry->d_inode; + + wimlib_assert(!inode->resolved); + + for (unsigned i = 0; i <= inode->num_ads; i++) { + struct lookup_table_entry *src_lte, *dest_lte; + src_lte = inode_stream_lte_unresolved(inode, i, + src_wim->lookup_table); + + if (src_lte && ++src_lte->out_refcnt == 1) { + dest_lte = inode_stream_lte_unresolved(inode, i, + dest_wim->lookup_table); + + if (!dest_lte) { + dest_lte = clone_lookup_table_entry(src_lte); + if (!dest_lte) + return WIMLIB_ERR_NOMEM; + list_add_tail(&dest_lte->staging_list, lte_list_head); + } + } + } + return 0; +} + +/* * This function takes in a dentry that was previously located only in image(s) - * in @src_wim, but now is being added to @dest_wim. If there is in fact already a - * lookup table entry for this file in the lookup table of the destination WIM - * file, we simply increment its reference count. Otherwise, a new lookup table - * entry is created that references the location of the file resource in the - * source WIM file through the other_wim_fp field of the lookup table entry. + * in @src_wim, but now is being added to @dest_wim. For each stream associated + * with the dentry, if there is already a lookup table entry for that stream in + * the lookup table of the destination WIM file, its reference count is + * incrementej. Otherwise, a new lookup table entry is created that points back + * to the stream in the source WIM file (through the @hash field combined with + * the @wim field of the lookup table entry.) */ static int add_lte_to_dest_wim(struct dentry *dentry, void *arg) { WIMStruct *src_wim, *dest_wim; + struct inode *inode; src_wim = ((struct wim_pair*)arg)->src_wim; dest_wim = ((struct wim_pair*)arg)->dest_wim; + inode = dentry->d_inode; - wimlib_assert(!dentry->inode->resolved); + wimlib_assert(!inode->resolved); - for (unsigned i = 0; i < (unsigned)dentry->inode->num_ads + 1; i++) { + for (unsigned i = 0; i <= inode->num_ads; i++) { struct lookup_table_entry *src_lte, *dest_lte; - src_lte = inode_stream_lte_unresolved(dentry->inode, i, + src_lte = inode_stream_lte_unresolved(inode, i, src_wim->lookup_table); - if (!src_lte) + + if (!src_lte) /* Empty or nonexistent stream. */ continue; - dest_lte = inode_stream_lte_unresolved(dentry->inode, i, + + dest_lte = inode_stream_lte_unresolved(inode, i, dest_wim->lookup_table); if (dest_lte) { dest_lte->refcnt++; } else { - dest_lte = MALLOC(sizeof(struct lookup_table_entry)); - if (!dest_lte) - return WIMLIB_ERR_NOMEM; - memcpy(dest_lte, src_lte, sizeof(struct lookup_table_entry)); + struct list_head *lte_list_head; + struct list_head *next; + + lte_list_head = &((struct wim_pair*)arg)->lte_list_head; + wimlib_assert(!list_empty(lte_list_head)); + + next = lte_list_head->next; + list_del(next); + dest_lte = container_of(next, struct lookup_table_entry, + staging_list); dest_lte->part_number = 1; dest_lte->refcnt = 1; + wimlib_assert(hashes_equal(dest_lte->hash, src_lte->hash)); + lookup_table_insert(dest_wim->lookup_table, dest_lte); } } @@ -281,10 +420,13 @@ static int add_lte_to_dest_wim(struct dentry *dentry, void *arg) /* * Adds an image (given by its dentry tree) to the image metadata array of a WIM * file, adds an entry to the lookup table for the image metadata, updates the - * image count in the header, and selects the new image. + * image count in the header, and selects the new image. * * Does not update the XML data. * + * 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. @@ -295,7 +437,9 @@ static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry, struct lookup_table_entry *metadata_lte; struct image_metadata *imd; struct image_metadata *new_imd; - struct link_group_table *lgt; + int ret; + + wimlib_assert(root_dentry != NULL); DEBUG("Reallocating image metadata array for image_count = %u", w->hdr.image_count + 1); @@ -303,15 +447,15 @@ static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry, if (!imd) { ERROR("Failed to allocate memory for new image metadata array"); - return WIMLIB_ERR_NOMEM; + goto err; } - memcpy(imd, w->image_metadata, + memcpy(imd, w->image_metadata, w->hdr.image_count * sizeof(struct image_metadata)); - + metadata_lte = new_lookup_table_entry(); if (!metadata_lte) - goto out_free_imd; + goto err_free_imd; metadata_lte->resource_entry.flags = WIM_RESHDR_FLAG_METADATA; random_hash(metadata_lte->hash); @@ -328,12 +472,15 @@ static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry, w->image_metadata = imd; w->hdr.image_count++; - /* Change the current image to the new one. */ - return wimlib_select_image(w, w->hdr.image_count); -out_free_metadata_lte: - FREE(metadata_lte); -out_free_imd: + /* Change the current image to the new one. There should not be any + * ways for this to fail, since the image is valid and the dentry tree + * is already in memory. */ + ret = select_wim_image(w, w->hdr.image_count); + wimlib_assert(ret == 0); + return ret; +err_free_imd: FREE(imd); +err: return WIMLIB_ERR_NOMEM; } @@ -341,14 +488,15 @@ out_free_imd: /* * Copies an image, or all the images, from a WIM file, into another WIM file. */ -WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, - int src_image, - WIMStruct *dest_wim, - const char *dest_name, - const char *dest_description, - int flags, +WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, + int src_image, + WIMStruct *dest_wim, + const char *dest_name, + const char *dest_description, + int export_flags, WIMStruct **additional_swms, - unsigned num_additional_swms) + unsigned num_additional_swms, + wimlib_progress_func_t progress_func) { int i; int ret; @@ -366,12 +514,12 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, return WIMLIB_ERR_SPLIT_UNSUPPORTED; } - if (src_image == WIM_ALL_IMAGES) { + if (src_image == WIMLIB_ALL_IMAGES) { if (src_wim->hdr.image_count > 1) { /* multi-image export. */ - if ((flags & WIMLIB_EXPORT_FLAG_BOOT) && + if ((export_flags & WIMLIB_EXPORT_FLAG_BOOT) && (src_wim->hdr.boot_idx == 0)) { /* Specifying the boot flag on a multi-image @@ -391,23 +539,25 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, return WIMLIB_ERR_INVALID_PARAM; } for (i = 1; i <= src_wim->hdr.image_count; i++) { - int export_flags = flags; + int new_flags = export_flags; if (i != src_wim->hdr.boot_idx) - export_flags &= ~WIMLIB_EXPORT_FLAG_BOOT; + new_flags &= ~WIMLIB_EXPORT_FLAG_BOOT; - ret = wimlib_export_image(src_wim, i, dest_wim, - NULL, - dest_description, - export_flags, + ret = wimlib_export_image(src_wim, i, dest_wim, + NULL, NULL, + new_flags, additional_swms, - num_additional_swms); + num_additional_swms, + progress_func); if (ret != 0) return ret; } return 0; + } else if (src_wim->hdr.image_count == 1) { + src_image = 1; } else { - src_image = 1; + return 0; } } @@ -417,6 +567,13 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, dest_name, src_image); } + if (!dest_description) { + dest_description = wimlib_get_image_description(src_wim, + src_image); + DEBUG("Using description `%s' for source image %d", + dest_description, src_image); + } + DEBUG("Exporting image %d from `%s'", src_image, src_wim->filename); if (wimlib_image_name_in_use(dest_wim, dest_name)) { @@ -439,39 +596,63 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, src_wim->lookup_table = joined_tab; } - ret = wimlib_select_image(src_wim, src_image); + ret = select_wim_image(src_wim, src_image); if (ret != 0) { ERROR("Could not select image %d from the WIM `%s' " "to export it", src_image, src_wim->filename); goto out; } - /* Cleaning up here on failure would be hard. For example, we could - * fail to allocate memory in add_lte_to_dest_wim(), - * leaving the lookup table entries in the destination WIM in an - * inconsistent state. Until these issues can be resolved, - * wimlib_export_image() is documented as leaving dest_wim in an - * indeterminate state. */ - root = wim_root_dentry(src_wim); - sd = wim_security_data(src_wim); - for_dentry_in_tree(root, increment_dentry_refcnt, NULL); + /* Pre-allocate the new lookup table entries that will be needed. This + * way, it's not possible to run out of memory part-way through + * modifying the lookup table of the destination WIM. */ wims.src_wim = src_wim; wims.dest_wim = dest_wim; - ret = for_dentry_in_tree(root, add_lte_to_dest_wim, &wims); + INIT_LIST_HEAD(&wims.lte_list_head); + for_lookup_table_entry(src_wim->lookup_table, lte_zero_out_refcnt, NULL); + root = wim_root_dentry(src_wim); + for_dentry_in_tree(root, dentry_unresolve_ltes, NULL); + ret = for_dentry_in_tree(root, allocate_lte_if_needed, &wims); if (ret != 0) - goto out; + goto out_free_ltes; + + ret = xml_export_image(src_wim->wim_info, src_image, + &dest_wim->wim_info, dest_name, dest_description); + if (ret != 0) + goto out_free_ltes; + + sd = wim_security_data(src_wim); ret = add_new_dentry_tree(dest_wim, root, sd); if (ret != 0) - goto out; + goto out_xml_delete_image; + + + /* All memory allocations have been taken care of, so it's no longer + * possible for this function to fail. Go ahead and increment the + * reference counts of the dentry tree and security data, then update + * the lookup table of the destination WIM and the boot index, if + * needed. */ + for_dentry_in_tree(root, increment_dentry_refcnt, NULL); sd->refcnt++; + for_dentry_in_tree(root, add_lte_to_dest_wim, &wims); + wimlib_assert(list_empty(&wims.lte_list_head)); - if (flags & WIMLIB_EXPORT_FLAG_BOOT) { + if (export_flags & WIMLIB_EXPORT_FLAG_BOOT) { DEBUG("Setting boot_idx to %d", dest_wim->hdr.image_count); - dest_wim->hdr.boot_idx = dest_wim->hdr.image_count; + wimlib_set_boot_idx(dest_wim, dest_wim->hdr.image_count); + } + ret = 0; + goto out; + +out_xml_delete_image: + xml_delete_image(&dest_wim->wim_info, dest_wim->hdr.image_count); +out_free_ltes: + { + struct lookup_table_entry *lte, *tmp; + list_for_each_entry_safe(lte, tmp, &wims.lte_list_head, staging_list) + free_lookup_table_entry(lte); } - ret = xml_export_image(src_wim->wim_info, src_image, &dest_wim->wim_info, - dest_name, dest_description); out: if (num_additional_swms) { free_lookup_table(src_wim->lookup_table); @@ -480,12 +661,11 @@ out: return ret; } -/* - * Deletes an image from the WIM. +/* + * Deletes an image from the WIM. */ WIMLIBAPI int wimlib_delete_image(WIMStruct *w, int image) { - int num_images; int i; int ret; @@ -494,12 +674,9 @@ WIMLIBAPI int wimlib_delete_image(WIMStruct *w, int image) return WIMLIB_ERR_SPLIT_UNSUPPORTED; } - if (image == WIM_ALL_IMAGES) { - num_images = w->hdr.image_count; - for (i = 1; i <= num_images; i++) { - /* Always delete the first image, since by the end - * there won't be any more than that! */ - ret = wimlib_delete_image(w, 1); + if (image == WIMLIB_ALL_IMAGES) { + for (i = w->hdr.image_count; i >= 1; i--) { + ret = wimlib_delete_image(w, i); if (ret != 0) return ret; } @@ -511,14 +688,13 @@ WIMLIBAPI int wimlib_delete_image(WIMStruct *w, int image) /* Even if the dentry tree is not allocated, we must select it (and * therefore allocate it) so that we can decrement the reference counts * in the lookup table. */ - ret = wimlib_select_image(w, image); + ret = select_wim_image(w, image); if (ret != 0) return ret; /* Free the dentry tree, any lookup table entries that have their * refcnt decremented to 0, and the security data. */ - destroy_image_metadata(wim_get_current_image_metadata(w), - w->lookup_table); + destroy_image_metadata(&w->image_metadata[image - 1], w->lookup_table); /* Get rid of the empty slot in the image metadata array. */ memmove(&w->image_metadata[image - 1], &w->image_metadata[image], @@ -536,10 +712,12 @@ WIMLIBAPI int wimlib_delete_image(WIMStruct *w, int image) else if (w->hdr.boot_idx > image) w->hdr.boot_idx--; - w->current_image = WIM_NO_IMAGE; + w->current_image = WIMLIB_NO_IMAGE; /* Remove the image from the XML information. */ xml_delete_image(&w->wim_info, image); + + w->deletion_occurred = true; return 0; } @@ -627,7 +805,7 @@ static int init_capture_config(const char *_config_str, size_t config_len, FREE(config_str); return WIMLIB_ERR_NOMEM; } - + memcpy(config_str, _config_str, config_len); next_p = config_str; config->config_str = config_str; @@ -643,9 +821,9 @@ static int init_capture_config(const char *_config_str, size_t config_len, ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG; goto out_destroy; } - + next_p = eol + 1; - bytes_remaining -= (eol - p) + 1; + bytes_remaining -= (next_p - p); if (eol == p) continue; @@ -674,7 +852,6 @@ static int init_capture_config(const char *_config_str, size_t config_len, else if (p[0] == '[' && strrchr(p, ']')) { ERROR("Unknown capture configuration section `%s'", p); ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG; - goto out_destroy; } else switch (type) { case EXCLUSION_LIST: DEBUG("Adding pattern \"%s\" to exclusion list", p); @@ -697,7 +874,7 @@ static int init_capture_config(const char *_config_str, size_t config_len, "in a block (such as [ExclusionList])", line_no); ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG; - goto out_destroy; + break; } if (ret != 0) goto out_destroy; @@ -773,49 +950,55 @@ bool exclude_path(const char *path, const struct capture_config *config, && path[config->prefix_len] == '/') path += config->prefix_len; } - return match_pattern(path, basename, &config->exclusion_list) && + return match_pattern(path, basename, &config->exclusion_list) && !match_pattern(path, basename, &config->exclusion_exception); } - - -/* - * Adds an image to the WIM, delegating the capture of the dentry tree and - * security data to the function @capture_tree passed as a parameter. - * Currently, @capture_tree may be build_dentry_tree() for capturing a "regular" - * directory tree on disk, or build_dentry_tree_ntfs() for capturing a WIM image - * directory from a NTFS volume using libntfs-3g. - * - * The @capture_tree function is also expected to create lookup table entries - * for all the file streams it captures and insert them into @lookup_table, - * being careful to look for identical entries that already exist and simply - * increment the reference count for them rather than duplicating the entry. - */ -int do_add_image(WIMStruct *w, const char *dir, const char *name, - const char *config_str, size_t config_len, - int flags, - int (*capture_tree)(struct dentry **, const char *, - struct lookup_table *, - struct wim_security_data *, - const struct capture_config *, - int, void *), - void *extra_arg) +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) { + int (*capture_tree)(struct dentry **, const char *, + struct 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_security_data *sd; struct capture_config config; - struct inode_table *inode_tab; + struct inode_table inode_tab; struct hlist_head inode_list; int ret; + if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) { +#ifdef WITH_NTFS_3G + if (add_image_flags & (WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE)) { + ERROR("Cannot dereference files when capturing directly from NTFS"); + return WIMLIB_ERR_INVALID_PARAM; + } + capture_tree = build_dentry_tree_ntfs; + extra_arg = &w->ntfs_vol; +#else + ERROR("wimlib was compiled without support for NTFS-3g, so"); + ERROR("we cannot capture a WIM image directly from a NTFS volume"); + return WIMLIB_ERR_UNSUPPORTED; +#endif + } else { + capture_tree = build_dentry_tree; + extra_arg = NULL; + } + DEBUG("Adding dentry tree from directory or NTFS volume `%s'.", dir); if (!name || !*name) { ERROR("Must specify a non-empty string for the image name"); return WIMLIB_ERR_INVALID_PARAM; } - if (!dir) { + if (!source) { ERROR("Must specify the name of a directory or NTFS volume"); return WIMLIB_ERR_INVALID_PARAM; } @@ -837,7 +1020,7 @@ int do_add_image(WIMStruct *w, const char *dir, const char *name, config_str = default_config; config_len = strlen(default_config); } - ret = init_capture_config(config_str, config_len, dir, &config); + ret = init_capture_config(config_str, config_len, source, &config); if (ret != 0) return ret; print_capture_config(&config); @@ -845,20 +1028,34 @@ int do_add_image(WIMStruct *w, const char *dir, const char *name, DEBUG("Allocating security data"); sd = CALLOC(1, sizeof(struct wim_security_data)); - if (!sd) + if (!sd) { + ret = WIMLIB_ERR_NOMEM; goto out_destroy_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, dir, w->lookup_table, sd, - &config, flags | WIMLIB_ADD_IMAGE_FLAG_ROOT, - extra_arg); + 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'", dir); - goto out_free_dentry_tree; + ERROR("Failed to build dentry tree for `%s'", source); + 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("Calculating full paths of dentries."); @@ -871,24 +1068,27 @@ int do_add_image(WIMStruct *w, const char *dir, const char *name, goto out_free_dentry_tree; DEBUG("Inserting dentries into inode table"); - for_dentry_in_tree(root_dentry, inode_table_insert, inode_tab); + ret = init_inode_table(&inode_tab, 9001); + if (ret != 0) + goto out_destroy_imd; + + for_dentry_in_tree(root_dentry, inode_table_insert, &inode_tab); - DEBUG("Cleanup up the hard link groups"); - ret = fix_inodes(inode_tab, &inode_list); - free_inode_table(inode_tab); + DEBUG("Cleaning up the hard link groups"); + ret = fix_inodes(&inode_tab, &inode_list); + destroy_inode_table(&inode_tab); if (ret != 0) goto out_destroy_imd; DEBUG("Assigning hard link group IDs"); assign_inode_numbers(&inode_list); - if (flags & WIMLIB_ADD_IMAGE_FLAG_BOOT) - wimlib_set_boot_idx(w, w->hdr.image_count); - - ret = xml_add_image(w, root_dentry, name); + ret = xml_add_image(w, name); if (ret != 0) goto out_destroy_imd; + if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_BOOT) + wimlib_set_boot_idx(w, w->hdr.image_count); return 0; out_destroy_imd: destroy_image_metadata(&w->image_metadata[w->hdr.image_count - 1], @@ -897,19 +1097,9 @@ out_destroy_imd: return ret; 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); return ret; } - -/* - * Adds an image to a WIM file from a directory tree on disk. - */ -WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *dir, - const char *name, const char *config_str, - size_t config_len, int flags) -{ - return do_add_image(w, dir, name, config_str, config_len, flags, - build_dentry_tree, NULL); -}