struct link_group {
u64 link_group_id;
struct link_group *next;
- struct list_head *link_group_head;
+ struct list_head dentry_list;
};
struct link_group_table {
u64 capacity;
};
+#include <sys/mman.h>
struct link_group_table *new_link_group_table(u64 capacity)
{
group = table->array[pos];
while (group) {
if (group->link_group_id == dentry->hard_link) {
- list_add(&dentry->link_group_list, group->link_group_head);
+ list_add(&dentry->link_group_list, &group->dentry_list);
return 0;
}
group = group->next;
group = MALLOC(sizeof(struct link_group));
if (!group)
return WIMLIB_ERR_NOMEM;
- INIT_LIST_HEAD(&dentry->link_group_list);
- group->link_group_id = dentry->hard_link;
- group->next = table->array[pos];
- group->link_group_head = &dentry->link_group_list;
- table->array[pos] = group;
+ group->link_group_id = dentry->hard_link;
+ group->next = table->array[pos];
+ INIT_LIST_HEAD(&group->dentry_list);
+ list_add(&dentry->link_group_list, &group->dentry_list);
+ table->array[pos] = group;
/* XXX Make the table grow when too many entries have been inserted. */
table->num_entries++;
struct dentry *dentry;
while (group) {
next_group = group->next;
- if (list_empty(group->link_group_head)) {
+ if (list_is_singular(&group->dentry_list)) {
/* Hard link group of size 1. Change the hard
* link ID to 0 and discard the link_group */
- dentry = container_of(group->link_group_head,
+ dentry = container_of(group->dentry_list.next,
struct dentry,
link_group_list);
dentry->hard_link = 0;
* dentries in the group the next available hard
* link IDs and queue the group to be
* re-inserted into the table. */
- list_for_each_entry(dentry, group->link_group_head,
+ list_for_each_entry(dentry, &group->dentry_list,
link_group_list)
dentry->hard_link = id;
group->next = remaining_groups;
* the WIM. */
#define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000
-static 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, true);
+ if (lt)
+ free_dentry_tree(imd->root_dentry, lt, true);
+ else
+ free_dentry_tree(imd->root_dentry, NULL, false);
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
* */
- lookup_table_remove(lt, imd->metadata_lte);
+ if (lt)
+ lookup_table_remove(lt, imd->metadata_lte);
}
/*
*
* @root: A dentry that has already been created for the root of the dentry
* tree.
- * @source_path: The path to the root of the tree on disk.
- * @root_stat: A pointer to a `struct stat' that contains the metadata for the
- * root of the tree on disk.
+ * @root_disk_path: The path to the root of the 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
struct lookup_table* lookup_table,
int add_flags)
{
- DEBUG("`%s'", root_disk_path);
+ DEBUG("%s", root_disk_path);
struct stat root_stbuf;
int ret;
int (*stat_fn)(const char *restrict, struct stat *restrict);
continue;
strcpy(name + len + 1, p->d_name);
child = new_dentry(p->d_name);
- if (!child) {
- ERROR("No memory to allocate new dentry");
+ if (!child)
return WIMLIB_ERR_NOMEM;
- }
ret = build_dentry_tree(child, name, lookup_table,
add_flags);
link_dentry(child, root);
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",
w->hdr.image_count + 1);
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;
randomize_byte_array(metadata_lte->hash, WIM_HASH_SIZE);
lookup_table_insert(w->lookup_table, metadata_lte);
- w->hdr.image_count++;
+ new_imd = &imd[w->hdr.image_count];
- new_imd = &imd[w->hdr.image_count - 1];
- new_imd->metadata_lte = metadata_lte;
- new_imd->modified = true;
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);
+out_free_security_data:
+ FREE(sd);
out_free_metadata_lte:
FREE(metadata_lte);
out_free_imd:
const char *flags_element, int flags)
{
struct dentry *root_dentry;
- struct stat root_stat;
struct image_metadata *imd;
int ret;
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);
+ w->image_metadata[w->hdr.image_count - 1].lgt);
if (ret != 0)
goto out_destroy_imd;
+ DEBUG("Assigning hard link groups");
assign_link_groups(w->image_metadata[w->hdr.image_count - 1].lgt);
if (flags & WIMLIB_ADD_IMAGE_FLAG_BOOT)
out_destroy_imd:
destroy_image_metadata(&w->image_metadata[w->hdr.image_count - 1],
w->lookup_table);
+ w->hdr.image_count--;
return ret;
out_free_dentry_tree:
free_dentry_tree(root_dentry, w->lookup_table, true);
imd = wim_get_current_image_metadata(w);
if (!imd->modified) {
DEBUG("Freeing image %u", w->current_image);
- free_dentry_tree(imd->root_dentry, NULL, false);
- imd->root_dentry = NULL;
- free_security_data(imd->security_data);
- imd->security_data = NULL;
+ destroy_image_metadata(imd, NULL);
+ memset(imd, 0, sizeof(*imd));
}
}
FREE(w->xml_data);
free_wim_info(w->wim_info);
if (w->image_metadata) {
- for (i = 0; i < w->hdr.image_count; i++) {
- free_dentry_tree(w->image_metadata[i].root_dentry,
- NULL, false);
- free_security_data(w->image_metadata[i].security_data);
- }
+ for (i = 0; i < w->hdr.image_count; i++)
+ destroy_image_metadata(&w->image_metadata[i], NULL);
FREE(w->image_metadata);
}
FREE(w);