#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
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);
if (ret)
return ret;
- ret = read_xml_data(w->fp, &w->hdr.xml_res_entry,
- &w->xml_data, &w->wim_info);
+ ret = read_xml_data(w->fp, &w->hdr.xml_res_entry, &w->wim_info);
if (ret)
return ret;
}
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
new_image_metadata()
{
struct wim_image_metadata *imd;
-
+
imd = CALLOC(1, sizeof(*imd));
if (imd) {
imd->refcnt = 1;
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;
- list_for_each_entry_safe(lte, tmp,
- &w->image_metadata[i]->unhashed_streams,
- unhashed_list)
- {
+ 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;
free_lookup_table(w->lookup_table);
FREE(w->filename);
- FREE(w->xml_data);
free_wim_info(w->wim_info);
if (w->image_metadata) {
for (unsigned i = 0; i < w->hdr.image_count; i++)
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");
}
#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