Add memdup() function

[wimlib] / src / export_image.c

diff --git a/src/export_image.c b/src/export_image.c
index 7e6d2789e198c93475462f5fcb21f265839ed7d3..455baa9152bbd2050b4d98f118667013c86138e8 100644 (file)
--- a/src/export_image.c
+++ b/src/export_image.c
@@ -21,10 +21,17 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
-#include "dentry.h"
-#include "lookup_table.h"
-#include "xml.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib.h"
+#include "wimlib/dentry.h"
+#include "wimlib/error.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/swm.h"
+#include "wimlib/xml.h"
 
 static int
 inode_allocate_needed_ltes(struct wim_inode *inode,
@@ -47,7 +54,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 +84,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));
@@ -102,9 +110,7 @@ wimlib_export_image(WIMStruct *src_wim,
                    wimlib_progress_func_t progress_func)
 {
        int ret;
-       struct wim_lookup_table *joined_tab, *src_wim_tab_save;
        struct wim_image_metadata *src_imd;
-       struct hlist_node *cur_node;
        struct list_head lte_list_head;
        struct wim_inode *inode;
 
@@ -186,15 +192,15 @@ wimlib_export_image(WIMStruct *src_wim,
        if (ret)
                return ret;
 
-       if (num_additional_swms) {
-               ret = new_joined_lookup_table(src_wim, additional_swms,
-                                             num_additional_swms,
-                                             &joined_tab);
-               if (ret)
-                       return ret;
-               src_wim_tab_save = src_wim->lookup_table;
-               src_wim->lookup_table = joined_tab;
-       }
+       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)
+               merge_lookup_tables(src_wim, additional_swms, num_additional_swms);
 
        ret = select_wim_image(src_wim, src_image);
        if (ret) {
@@ -209,7 +215,7 @@ wimlib_export_image(WIMStruct *src_wim,
        for_lookup_table_entry(src_wim->lookup_table, lte_zero_out_refcnt, NULL);
        src_imd = wim_get_current_image_metadata(src_wim);
        INIT_LIST_HEAD(&lte_list_head);
-       hlist_for_each_entry(inode, cur_node, &src_imd->inode_list, i_hlist) {
+       image_for_each_inode(inode, src_imd) {
                ret = inode_allocate_needed_ltes(inode,
                                                 src_wim->lookup_table,
                                                 dest_wim->lookup_table,
@@ -231,11 +237,12 @@ 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
         * table of the destination WIM and the boot index, if needed. */
-       hlist_for_each_entry(inode, cur_node, &src_imd->inode_list, i_hlist) {
+       image_for_each_inode(inode, src_imd) {
                inode_move_ltes_to_table(inode,
                                         src_wim->lookup_table,
                                         dest_wim->lookup_table,
@@ -244,6 +251,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,13 +264,11 @@ out_xml_delete_image:
 out_free_ltes:
        {
                struct wim_lookup_table_entry *lte, *tmp;
-               list_for_each_entry_safe(lte, tmp, &lte_list_head, staging_list)
+               list_for_each_entry_safe(lte, tmp, &lte_list_head, export_stream_list)
                        free_lookup_table_entry(lte);
        }
 out:
-       if (num_additional_swms) {
-               free_lookup_table(src_wim->lookup_table);
-               src_wim->lookup_table = src_wim_tab_save;
-       }
+       if (num_additional_swms)
+               unmerge_lookup_table(src_wim);
        return ret;
 }