X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmodify.c;h=2c92d821f44c83a762a1fe9b3e11aeeef82debb6;hp=5a89fd6b16026b397525e3cecf0b606ae55ff431;hb=63a5804943519281f206ca0fefacfe2b99fc9958;hpb=21a83b1b20f5ae138bc4bb9bdedd80a2a2d92c0a diff --git a/src/modify.c b/src/modify.c index 5a89fd6b..2c92d821 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/. */ @@ -36,17 +36,18 @@ #include #include #include +#include +#include #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) { 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 * */ @@ -72,20 +73,36 @@ void destroy_image_metadata(struct image_metadata *imd,struct lookup_table *lt) * to the WIM may still occur later when trying to actually read * the regular files in the tree into the WIM as file resources. */ -static int build_dentry_tree(struct dentry *root, const char *root_disk_path, - struct lookup_table* lookup_table, - int add_flags) +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, + void *extra_arg) { - DEBUG("%s", root_disk_path); struct stat root_stbuf; int ret = 0; int (*stat_fn)(const char *restrict, struct stat *restrict); + struct dentry *root; + const char *filename; + + 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); + *root_ret = NULL; + return 0; + } + if (add_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) { @@ -100,12 +117,23 @@ static int build_dentry_tree(struct dentry *root, const char *root_disk_path, } if (!S_ISREG(root_stbuf.st_mode) && !S_ISDIR(root_stbuf.st_mode) && !S_ISLNK(root_stbuf.st_mode)) { - ERROR("`%s' is not a regular file, directory, or symbolic link."); + ERROR("`%s' is not a regular file, directory, or symbolic link.", + root_disk_path); return WIMLIB_ERR_SPECIAL_FILE; } - stbuf_to_dentry(&root_stbuf, root); + + if (add_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) + filename = ""; + else + filename = path_basename(root_disk_path); + + root = new_dentry_with_inode(filename); + if (!root) + return WIMLIB_ERR_NOMEM; + + stbuf_to_inode(&root_stbuf, root->inode); add_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT; - root->resolved = true; + root->inode->resolved = true; if (dentry_is_directory(root)) { /* Open the directory on disk */ @@ -133,19 +161,17 @@ static int build_dentry_tree(struct dentry *root, const char *root_disk_path, || (p->d_name[1] == '.' && p->d_name[2] == '\0'))) continue; strcpy(name + len + 1, p->d_name); - child = new_dentry(p->d_name); - if (!child) - return WIMLIB_ERR_NOMEM; - ret = build_dentry_tree(child, name, lookup_table, - add_flags); - link_dentry(child, root); + 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 */ - size_t symlink_buf_len; char deref_name_buf[4096]; ssize_t deref_name_len; @@ -158,13 +184,17 @@ static int build_dentry_tree(struct dentry *root, const char *root_disk_path, } 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->inode, deref_name_buf, + lookup_table, NULL); } else { /* Regular file */ struct lookup_table_entry *lte; u8 hash[SHA1_HASH_SIZE]; + /* Empty files do not have to have a lookup table entry. */ + if (root_stbuf.st_size == 0) + goto out; + /* 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. @@ -196,8 +226,10 @@ static int build_dentry_tree(struct dentry *root, const char *root_disk_path, copy_hash(lte->hash, hash); lookup_table_insert(lookup_table, lte); } - root->lte = lte; + root->inode->lte = lte; } +out: + *root_ret = root; return ret; } @@ -217,32 +249,31 @@ struct wim_pair { 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->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); + src_lte = inode_stream_lte_unresolved(inode, i, + src_wim->lookup_table); if (!src_lte) 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->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); } } @@ -258,13 +289,14 @@ static int add_lte_to_dest_wim(struct dentry *dentry, void *arg) * * @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. */ -static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry) +static int add_new_dentry_tree(WIMStruct *w, struct 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_security_data *sd; struct link_group_table *lgt; DEBUG("Reallocating image metadata array for image_count = %u", @@ -282,15 +314,6 @@ static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry) metadata_lte = new_lookup_table_entry(); if (!metadata_lte) goto out_free_imd; - sd = CALLOC(1, sizeof(struct wim_security_data)); - if (!sd) - goto out_free_metadata_lte; - sd->refcnt = 1; - sd->total_length = 8; - - lgt = new_link_group_table(9001); - if (!lgt) - goto out_free_security_data; metadata_lte->resource_entry.flags = WIM_RESHDR_FLAG_METADATA; random_hash(metadata_lte->hash); @@ -301,7 +324,6 @@ 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); @@ -310,8 +332,6 @@ static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry) /* Change the current image to the new one. */ return wimlib_select_image(w, w->hdr.image_count); -out_free_security_data: - FREE(sd); out_free_metadata_lte: FREE(metadata_lte); out_free_imd: @@ -328,12 +348,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) { @@ -368,7 +401,9 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim, ret = wimlib_export_image(src_wim, i, dest_wim, NULL, dest_description, - export_flags); + export_flags, + additional_swms, + num_additional_swms); if (ret != 0) return ret; } @@ -378,13 +413,6 @@ 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", @@ -399,29 +427,44 @@ 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 + * 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); wims.src_wim = src_wim; wims.dest_wim = dest_wim; ret = for_dentry_in_tree(root, add_lte_to_dest_wim, &wims); if (ret != 0) - return ret; - ret = add_new_dentry_tree(dest_wim, root); + goto out; + ret = add_new_dentry_tree(dest_wim, root, sd); if (ret != 0) - return ret; - /* Bring over old security data */ - struct wim_security_data *sd = wim_security_data(src_wim); - struct image_metadata *new_imd = wim_get_current_image_metadata(dest_wim); - wimlib_assert(sd); - free_security_data(new_imd->security_data); - new_imd->security_data = sd; + goto out; sd->refcnt++; if (flags & WIMLIB_EXPORT_FLAG_BOOT) { @@ -429,8 +472,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; } /* @@ -442,6 +491,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++) { @@ -491,43 +545,318 @@ WIMLIBAPI int wimlib_delete_image(WIMStruct *w, int image) return 0; } +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) +{ + FREE(list->pats); +} + +static void destroy_capture_config(struct capture_config *config) +{ + 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)); +} + +static int pattern_list_add_pattern(struct pattern_list *list, + const char *pattern) +{ + 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; + } + 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) +{ + 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; + } + + 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; + } + + next_p = eol + 1; + bytes_remaining -= (eol - p) + 1; + 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; + goto out_destroy; + } 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; + goto out_destroy; + } + if (ret != 0) + goto out_destroy; + } + 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) +{ + 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; + } + if (fnmatch(pat, string, FNM_PATHNAME + #ifdef FNM_CASEFOLD + | FNM_CASEFOLD + #endif + ) == 0) + { + DEBUG("`%s' matches the pattern \"%s\"", + string, pat); + return true; + } + } + return false; +} + +static void print_pattern_list(const struct pattern_list *list) +{ + for (size_t i = 0; i < list->num_pats; i++) + printf(" %s\n", list->pats[i]); +} + +static void print_capture_config(const struct capture_config *config) +{ + if (config->exclusion_list.num_pats) { + puts("Files or folders excluded from image capture:"); + print_pattern_list(&config->exclusion_list); + putchar('\n'); + } +} + +/* Return true if the image capture configuration file indicates we should + * exclude the filename @path from capture. + * + * 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) +{ + 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; + } + return match_pattern(path, basename, &config->exclusion_list) && + !match_pattern(path, basename, &config->exclusion_exception); + +} + + + /* - * Adds an image to a WIM file from a directory tree on disk. + * 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. */ -WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *dir, - const char *name, const char *description, - const char *flags_element, int flags) +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) { - struct dentry *root_dentry; - struct image_metadata *imd; + struct dentry *root_dentry = NULL; + struct wim_security_data *sd; + struct capture_config config; + 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); return WIMLIB_ERR_IMAGE_NAME_COLLISION; } - DEBUG("Creating root dentry."); + DEBUG("Initializing capture configuration"); + if (!config_str) { + DEBUG("Using default capture configuration"); + config_str = default_config; + config_len = strlen(default_config); + } + ret = init_capture_config(config_str, config_len, dir, &config); + if (ret != 0) + return ret; + print_capture_config(&config); + + DEBUG("Allocating security data"); - root_dentry = new_dentry(""); - if (!root_dentry) - return WIMLIB_ERR_NOMEM; + sd = CALLOC(1, sizeof(struct wim_security_data)); + if (!sd) + goto out_destroy_config; + sd->total_length = 8; + sd->refcnt = 1; DEBUG("Building dentry tree."); - ret = build_dentry_tree(root_dentry, dir, w->lookup_table, - flags | WIMLIB_ADD_IMAGE_FLAG_ROOT); + ret = (*capture_tree)(&root_dentry, dir, w->lookup_table, sd, + &config, flags | WIMLIB_ADD_IMAGE_FLAG_ROOT, + extra_arg); + destroy_capture_config(&config); if (ret != 0) { ERROR("Failed to build dentry tree for `%s'", dir); @@ -539,22 +868,30 @@ WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *dir, if (ret != 0) goto out_free_dentry_tree; - ret = add_new_dentry_tree(w, root_dentry); + ret = add_new_dentry_tree(w, root_dentry, sd); if (ret != 0) goto out_free_dentry_tree; - DEBUG("Inserting dentries into hard link group table"); - ret = for_dentry_in_tree(root_dentry, link_group_table_insert, - w->image_metadata[w->hdr.image_count - 1].lgt); + DEBUG("Inserting dentries into inode table"); + 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("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 groups"); - assign_link_groups(w->image_metadata[w->hdr.image_count - 1].lgt); + + 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, description, flags_element); + ret = xml_add_image(w, root_dentry, name); if (ret != 0) goto out_destroy_imd; @@ -566,5 +903,19 @@ out_destroy_imd: return ret; out_free_dentry_tree: free_dentry_tree(root_dentry, w->lookup_table); + 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); +}