Win32: Fix drive root detection with \\?\-style paths

[wimlib] / src / join.c

diff --git a/src/join.c b/src/join.c
index b6bf6ebd78d22d598d3e6e536cab2dbe706f7386..3500654168671247318c0f866f18e0967d5aebf0 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -23,71 +23,19 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
-#include "lookup_table.h"
-#include "xml.h"
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
-static int
-move_lte_to_table(struct wim_lookup_table_entry *lte, void *other_tab)
-{
-       hlist_del(&lte->hash_list);
-       lookup_table_insert((struct wim_lookup_table*)other_tab, lte);
-       return 0;
-}
-
-static int
-lookup_table_join(struct wim_lookup_table *table,
-                 struct wim_lookup_table *new)
-{
-       for_lookup_table_entry(new, move_lte_to_table, table);
-       new->num_entries = 0;
-       return 0;
-}
-
-/*
- * new_joined_lookup_table: - Join lookup tables from the parts of a split WIM.
- *
- * @w specifies the first part, while @additional_swms and @num_additional_swms
- * specify an array of pointers to the WIMStruct's for additional split WIM parts.
- *
- * The lookup table entries are *moved* to the new table.
- *
- * On success, 0 is returned on a pointer to the joined lookup table is returned
- * in @table_ret.
- *
- * The reason we join the lookup tables is so we only have to search one lookup
- * table to find the location of a resource in the entire WIM.
- */
-int
-new_joined_lookup_table(WIMStruct *w,
-                       WIMStruct **additional_swms,
-                       unsigned num_additional_swms,
-                       struct wim_lookup_table **table_ret)
-{
-       struct wim_lookup_table *table;
-       int ret;
-       unsigned i;
-
-       table = new_lookup_table(9001);
-       if (!table)
-               return WIMLIB_ERR_NOMEM;
-
-       if (w)
-               lookup_table_join(table, w->lookup_table);
-
-       for (i = 0; i < num_additional_swms; i++) {
-               ret = lookup_table_join(table, additional_swms[i]->lookup_table);
-               if (ret != 0)
-                       goto out_free_table;
-       }
-       *table_ret = table;
-       return 0;
-out_free_table:
-       free_lookup_table(table);
-       return ret;
-}
+#include "wimlib.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/resource.h"
+#include "wimlib/swm.h"
+#include "wimlib/write.h"
+#include "wimlib/xml.h"
 
+#include <stdlib.h> /* for qsort() */
 
 static int
 join_wims(WIMStruct **swms, unsigned num_swms,
@@ -151,9 +99,7 @@ join_wims(WIMStruct **swms, unsigned num_swms,
        }
 
        /* Write lookup table, XML data, and optional integrity table */
-       for (i = 0; i < num_swms; i++)
-               lookup_table_join(joined_wim->lookup_table, swms[i]->lookup_table);
-
+       merge_lookup_tables(joined_wim, swms, num_swms);
        free_wim_info(joined_wim->wim_info);
        joined_wim->wim_info = swms[0]->wim_info;
        joined_wim->image_metadata = swms[0]->image_metadata;