X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fexport_image.c;h=34564e222e2cd70b1748008fbbb1eaf8fd85c8f4;hp=784938e9c5b34d52670e83b7aa93336e42f412ee;hb=1f2091f5bb860769e20105af2d9eff3a0872c57b;hpb=062465170ddb4520ca6fbc64a0f6e27e786de101 diff --git a/src/export_image.c b/src/export_image.c index 784938e9..34564e22 100644 --- a/src/export_image.c +++ b/src/export_image.c @@ -47,7 +47,8 @@ inode_allocate_needed_ltes(struct wim_inode *inode, 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); + list_add_tail(&dest_lte->export_stream_list, + lte_list_head); } } } @@ -76,7 +77,7 @@ inode_move_ltes_to_table(struct wim_inode *inode, list_del(next); dest_lte = container_of(next, struct wim_lookup_table_entry, - staging_list); + export_stream_list); dest_lte->part_number = 1; dest_lte->refcnt = 0; wimlib_assert(hashes_equal(dest_lte->hash, src_lte->hash)); @@ -185,6 +186,13 @@ wimlib_export_image(WIMStruct *src_wim, if (ret) return ret; + ret = wim_checksum_unhashed_streams(src_wim); + if (ret) + return ret; + ret = wim_checksum_unhashed_streams(dest_wim); + if (ret) + return ret; + if (num_additional_swms) { ret = new_joined_lookup_table(src_wim, additional_swms, num_additional_swms, @@ -230,6 +238,7 @@ wimlib_export_image(WIMStruct *src_wim, /* The `struct image_metadata' is now referenced by both the @src_wim * and the @dest_wim. */ src_imd->refcnt++; + src_imd->modified = 1; /* All memory allocations have been taken care of, so it's no longer * possible for this function to fail. Go ahead and update the lookup @@ -250,7 +259,7 @@ out_xml_delete_image: out_free_ltes: { struct wim_lookup_table_entry *lte, *tmp; - list_for_each_entry_safe(lte, tmp, <e_list_head, staging_list) + list_for_each_entry_safe(lte, tmp, <e_list_head, export_stream_list) free_lookup_table_entry(lte); } out: