X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fexport_image.c;h=c5c85d5f77f401070693ed42f8016c6e0b37b162;hb=161e7cdd2c0d3b3c1025da452a3192d381297465;hp=deeaddb44522497e3f57007f05f2b34f99ef41bd;hpb=f3e97b29c4a8c564d54b0fd11cd43a9b4cd6a8ad;p=wimlib diff --git a/src/export_image.c b/src/export_image.c index deeaddb4..c5c85d5f 100644 --- a/src/export_image.c +++ b/src/export_image.c @@ -47,7 +47,7 @@ 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->new_stream_list, + list_add_tail(&dest_lte->export_stream_list, lte_list_head); } } @@ -77,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, - new_stream_list); + export_stream_list); dest_lte->part_number = 1; dest_lte->refcnt = 0; wimlib_assert(hashes_equal(dest_lte->hash, src_lte->hash)); @@ -186,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, @@ -231,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 @@ -244,6 +252,12 @@ wimlib_export_image(WIMStruct *src_wim, if (export_flags & WIMLIB_EXPORT_FLAG_BOOT) dest_wim->hdr.boot_idx = dest_wim->hdr.image_count; + if (src_wim->hdr.flags & WIM_HDR_FLAG_RP_FIX) + { + /* Set the reparse point fixup flag on the destination WIM if + * the flag is set on the source WIM. */ + dest_wim->hdr.flags |= WIM_HDR_FLAG_RP_FIX; + } ret = 0; goto out; out_xml_delete_image: @@ -251,7 +265,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, new_stream_list) + list_for_each_entry_safe(lte, tmp, <e_list_head, export_stream_list) free_lookup_table_entry(lte); } out: