implement WIMLIB_INIT_FLAG_ASSUME_UTF8

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index 96fba59f284ac98c553b59291c69d5829b290eab..a5044c68b2200e694c8afcde4688dac9a403f3ef 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -32,11 +32,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#ifdef WITH_NTFS_3G
-#  include <time.h>
-#  include <ntfs-3g/volume.h>
-#endif
-
 #ifdef __WIN32__
 #  include "win32.h"
 #else
@@ -70,7 +65,7 @@ static WIMStruct *
 new_wim_struct()
 {
        WIMStruct *w = CALLOC(1, sizeof(WIMStruct));
-#ifdef WITH_FUSE
+#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
        if (pthread_mutex_init(&w->fp_tab_mutex, NULL) != 0) {
                ERROR_WITH_ERRNO("Failed to initialize mutex");
                FREE(w);
@@ -199,6 +194,7 @@ select_wim_image(WIMStruct *w, int image)
        if (w->current_image != WIMLIB_NO_IMAGE) {
                imd = wim_get_current_image_metadata(w);
                if (!imd->modified) {
+                       wimlib_assert(list_empty(&imd->unhashed_streams));
                        DEBUG("Freeing image %u", w->current_image);
                        destroy_image_metadata(imd, NULL, false);
                }
@@ -532,8 +528,19 @@ destroy_image_metadata(struct wim_image_metadata *imd,
                free_lookup_table_entry(imd->metadata_lte);
                imd->metadata_lte = NULL;
        }
+       if (!table) {
+               struct wim_lookup_table_entry *lte, *tmp;
+               list_for_each_entry_safe(lte, tmp, &imd->unhashed_streams, unhashed_list)
+                       free_lookup_table_entry(lte);
+       }
        INIT_LIST_HEAD(&imd->unhashed_streams);
        INIT_LIST_HEAD(&imd->inode_list);
+#ifdef WITH_NTFS_3G
+       if (imd->ntfs_vol) {
+               do_ntfs_umount(imd->ntfs_vol);  
+               imd->ntfs_vol = NULL;
+       }
+#endif
 }
 
 void
@@ -570,7 +577,7 @@ struct wim_image_metadata *
 new_image_metadata()
 {
        struct wim_image_metadata *imd;
-       
+
        imd = CALLOC(1, sizeof(*imd));
        if (imd) {
                imd->refcnt = 1;
@@ -610,6 +617,26 @@ new_image_metadata_array(unsigned num_images)
        return imd_array;
 }
 
+/* Checksum all streams that are unhashed (other than the metadata streams),
+ * merging them into the lookup table as needed.  This is a no-op unless the
+ * library has previously used to add or mount an image using the same
+ * WIMStruct. */
+int
+wim_checksum_unhashed_streams(WIMStruct *w)
+{
+       int ret;
+       for (int i = 0; i < w->hdr.image_count; i++) {
+               struct wim_lookup_table_entry *lte, *tmp;
+               struct wim_image_metadata *imd = w->image_metadata[i];
+               image_for_each_unhashed_stream_safe(lte, tmp, imd) {
+                       ret = hash_unhashed_stream(lte, w->lookup_table, NULL);
+                       if (ret)
+                               return ret;
+               }
+       }
+       return 0;
+}
+
 /* Frees the memory for the WIMStruct, including all internal memory; also
  * closes all files associated with the WIMStruct.  */
 WIMLIBAPI void
@@ -644,12 +671,6 @@ wimlib_free(WIMStruct *w)
                        put_image_metadata(w->image_metadata[i], NULL);
                FREE(w->image_metadata);
        }
-#ifdef WITH_NTFS_3G
-       if (w->ntfs_vol) {
-               DEBUG("Unmounting NTFS volume");
-               ntfs_umount(w->ntfs_vol, FALSE);
-       }
-#endif
        FREE(w);
        DEBUG("Freed WIMStruct");
 }
@@ -669,16 +690,17 @@ test_locale_ctype_utf8()
 #endif
 }
 
-/* Get global memory allocations out of the way,
- * single-threaded programs like 'imagex'. */
 WIMLIBAPI int
-wimlib_global_init()
+wimlib_global_init(int init_flags)
 {
        libxml_global_init();
-#ifdef WITH_NTFS_3G
-       libntfs3g_global_init();
-#endif
-       wimlib_mbs_is_utf8 = test_locale_ctype_utf8();
+       if (!(init_flags & WIMLIB_INIT_FLAG_ASSUME_UTF8)) {
+               wimlib_mbs_is_utf8 = test_locale_ctype_utf8();
+       #ifdef WITH_NTFS_3G
+               if (!wimlib_mbs_is_utf8)
+                       libntfs3g_global_init();
+       #endif
+       }
 #ifdef __WIN32__
        win32_global_init();
 #endif