X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodify.c;h=f6886bbe1dcb32d2fb84f90095e29134e4d8211d;hb=5c85ddd0c9dc90b43603317dcfb809bfc4d192bc;hp=3a40c90e9f1f6ac598610535c7427ba00209548d;hpb=ed828dc4cbf4eabc9f8b32cb4c6a86a04e087f7a;p=wimlib diff --git a/src/modify.c b/src/modify.c index 3a40c90e..f6886bbe 100644 --- a/src/modify.c +++ b/src/modify.c @@ -13,16 +13,16 @@ * This file is part of wimlib, a library for working with WIM files. * * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * A PARTICULAR PURPOSE. See the GNU General Public License for more * details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ @@ -41,14 +41,13 @@ #include /** Private flag: Used to mark that we currently adding the root directory of - * the WIM. */ + * 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 *lt) { free_dentry_tree(imd->root_dentry, lt); free_security_data(imd->security_data); - free_link_group_table(imd->lgt); /* Get rid of the lookup table entry for this image's metadata resource * */ @@ -128,13 +127,13 @@ static int build_dentry_tree(struct dentry **root_ret, const char *root_disk_pat else filename = path_basename(root_disk_path); - root = new_dentry(filename); + root = new_dentry_with_inode(filename); if (!root) return WIMLIB_ERR_NOMEM; - stbuf_to_dentry(&root_stbuf, root); + stbuf_to_inode(&root_stbuf, root->d_inode); add_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT; - root->resolved = true; + root->d_inode->resolved = true; if (dentry_is_directory(root)) { /* Open the directory on disk */ @@ -185,8 +184,8 @@ static int build_dentry_tree(struct dentry **root_ret, const char *root_disk_pat } deref_name_buf[deref_name_len] = '\0'; DEBUG("Read symlink `%s'", deref_name_buf); - ret = dentry_set_symlink(root, deref_name_buf, - lookup_table, NULL); + ret = inode_set_symlink(root->d_inode, deref_name_buf, + lookup_table, NULL); } else { /* Regular file */ struct lookup_table_entry *lte; @@ -227,7 +226,7 @@ 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->lte = lte; + root->d_inode->lte = lte; } out: *root_ret = root; @@ -241,42 +240,43 @@ struct wim_pair { /* * 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->resolved); + wimlib_assert(!inode->resolved); - for (unsigned i = 0; i < (unsigned)dentry->num_ads + 1; i++) { + for (unsigned i = 0; i <= inode->num_ads; i++) { struct lookup_table_entry *src_lte, *dest_lte; - src_lte = dentry_stream_lte_unresolved(dentry, i, - src_wim->lookup_table); - if (!src_lte) + src_lte = inode_stream_lte_unresolved(inode, i, + src_wim->lookup_table); + + if (!src_lte) /* Empty or nonexistent stream. */ continue; - dest_lte = dentry_stream_lte_unresolved(dentry, i, - dest_wim->lookup_table); + + dest_lte = inode_stream_lte_unresolved(inode, i, + dest_wim->lookup_table); if (dest_lte) { dest_lte->refcnt++; } else { - dest_lte = new_lookup_table_entry(); + dest_lte = MALLOC(sizeof(struct lookup_table_entry)); if (!dest_lte) return WIMLIB_ERR_NOMEM; - dest_lte->resource_location = RESOURCE_IN_WIM; - dest_lte->wim = src_wim; - memcpy(&dest_lte->resource_entry, - &src_lte->resource_entry, - sizeof(struct resource_entry)); - copy_hash(dest_lte->hash, - dentry_stream_hash_unresolved(dentry, i)); + memcpy(dest_lte, src_lte, sizeof(struct lookup_table_entry)); + dest_lte->part_number = 1; + dest_lte->refcnt = 1; lookup_table_insert(dest_wim->lookup_table, dest_lte); } } @@ -300,7 +300,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); @@ -318,10 +320,6 @@ static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry, if (!metadata_lte) goto out_free_imd; - lgt = new_link_group_table(9001); - if (!lgt) - goto out_free_metadata_lte; - metadata_lte->resource_entry.flags = WIM_RESHDR_FLAG_METADATA; random_hash(metadata_lte->hash); lookup_table_insert(w->lookup_table, metadata_lte); @@ -331,15 +329,18 @@ static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry, new_imd->root_dentry = root_dentry; new_imd->metadata_lte = metadata_lte; new_imd->security_data = sd; - new_imd->lgt = lgt; new_imd->modified = true; FREE(w->image_metadata); 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); + /* 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 = wimlib_select_image(w, w->hdr.image_count); + wimlib_assert(ret == 0); + return ret; out_free_metadata_lte: FREE(metadata_lte); out_free_imd: @@ -356,13 +357,25 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, WIMStruct *dest_wim, const char *dest_name, const char *dest_description, - int flags) + int flags, + WIMStruct **additional_swms, + unsigned num_additional_swms) { int i; int ret; struct dentry *root; struct wim_pair wims; struct wim_security_data *sd; + struct lookup_table *joined_tab, *src_wim_tab_save; + + if (!src_wim || !dest_wim) + return WIMLIB_ERR_INVALID_PARAM; + + if (dest_wim->hdr.total_parts != 1) { + ERROR("Exporting an image to a split WIM is " + "unsupported"); + return WIMLIB_ERR_SPLIT_UNSUPPORTED; + } if (src_image == WIM_ALL_IMAGES) { if (src_wim->hdr.image_count > 1) { @@ -395,9 +408,10 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, export_flags &= ~WIMLIB_EXPORT_FLAG_BOOT; ret = wimlib_export_image(src_wim, i, dest_wim, - NULL, - dest_description, - export_flags); + NULL, NULL, + export_flags, + additional_swms, + num_additional_swms); if (ret != 0) return ret; } @@ -407,19 +421,19 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, } } - ret = wimlib_select_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); - return ret; - } - if (!dest_name) { dest_name = wimlib_get_image_name(src_wim, src_image); DEBUG("Using name `%s' for source image %d", 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)) { @@ -428,13 +442,33 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, return WIMLIB_ERR_IMAGE_NAME_COLLISION; } + ret = verify_swm_set(src_wim, additional_swms, num_additional_swms); + if (ret != 0) + return ret; + + if (num_additional_swms) { + ret = new_joined_lookup_table(src_wim, additional_swms, + num_additional_swms, + &joined_tab); + if (ret != 0) + return ret; + src_wim_tab_save = src_wim->lookup_table; + src_wim->lookup_table = joined_tab; + } + + ret = wimlib_select_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 is an - * indeterminate state. */ + * 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 with the only permitted + * operation being wimlib_free(). */ root = wim_root_dentry(src_wim); sd = wim_security_data(src_wim); for_dentry_in_tree(root, increment_dentry_refcnt, NULL); @@ -442,10 +476,10 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, wims.dest_wim = dest_wim; ret = for_dentry_in_tree(root, add_lte_to_dest_wim, &wims); if (ret != 0) - return ret; + goto out; ret = add_new_dentry_tree(dest_wim, root, sd); if (ret != 0) - return ret; + goto out; sd->refcnt++; if (flags & WIMLIB_EXPORT_FLAG_BOOT) { @@ -453,8 +487,14 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, dest_wim->hdr.boot_idx = dest_wim->hdr.image_count; } - return xml_export_image(src_wim->wim_info, src_image, &dest_wim->wim_info, - dest_name, dest_description); + 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); + src_wim->lookup_table = src_wim_tab_save; + } + return ret; } /* @@ -466,6 +506,11 @@ WIMLIBAPI int wimlib_delete_image(WIMStruct *w, int image) int i; int ret; + if (w->hdr.total_parts != 1) { + ERROR("Deleting an image from a split WIM is not supported."); + return WIMLIB_ERR_SPLIT_UNSUPPORTED; + } + if (image == WIM_ALL_IMAGES) { num_images = w->hdr.image_count; for (i = 1; i <= num_images; i++) { @@ -523,6 +568,7 @@ enum pattern_type { ALIGNMENT_LIST, }; +/* Default capture configuration file when none is specified. */ static const char *default_config = "[ExclusionList]\n" "\\$ntfs.log\n" @@ -570,6 +616,8 @@ static int pattern_list_add_pattern(struct pattern_list *list, 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) { @@ -723,6 +771,15 @@ static void print_capture_config(const struct capture_config *config) } } +/* 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) { @@ -740,6 +797,18 @@ bool exclude_path(const char *path, const struct capture_config *config, +/* + * 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, @@ -753,20 +822,26 @@ int do_add_image(WIMStruct *w, const char *dir, const char *name, struct dentry *root_dentry = NULL; struct wim_security_data *sd; struct capture_config config; - struct link_group_table *lgt; + struct inode_table inode_tab; + struct hlist_head inode_list; int ret; - DEBUG("Adding dentry tree from dir `%s'.", dir); + 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) { - ERROR("Must specify the name of a directory"); + 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"); + return WIMLIB_ERR_SPLIT_UNSUPPORTED; + } + if (wimlib_image_name_in_use(w, name)) { ERROR("There is already an image named \"%s\" in `%s'", name, w->filename); @@ -812,25 +887,26 @@ int do_add_image(WIMStruct *w, const char *dir, const char *name, if (ret != 0) goto out_free_dentry_tree; - lgt = w->image_metadata[w->hdr.image_count - 1].lgt; - DEBUG("Inserting dentries into hard link group table"); - ret = for_dentry_in_tree(root_dentry, link_group_table_insert, lgt); - + DEBUG("Inserting dentries into inode table"); + ret = init_inode_table(&inode_tab, 9001); if (ret != 0) goto out_destroy_imd; - DEBUG("Cleanup up the hard link groups"); - ret = fix_link_groups(lgt); + for_dentry_in_tree(root_dentry, inode_table_insert, &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_link_group_ids(w->image_metadata[w->hdr.image_count - 1].lgt); + 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;