NTFS capture updates

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index 6042a90c17809cf6a4fe74c5d84df4d2932a5cd9..0b37899d36576a2f821264178748f5ef3dbb1eff 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -30,6 +30,10 @@
 #include "xml.h"
 #include <stdlib.h>
 
+#ifdef WITH_NTFS_3G
+#include <ntfs-3g/volume.h>
+#endif
+
 static int print_metadata(WIMStruct *w)
 {
        print_security_data(wim_security_data(w));
@@ -139,13 +143,6 @@ int wim_hdr_flags_compression_type(int wim_hdr_flags)
        }
 }
 
-int wim_resource_compression_type(const WIMStruct *w, 
-                                 const struct resource_entry *entry)
-{
-       int wim_ctype = wimlib_get_compression_type(w);
-       return resource_compression_type(wim_ctype, entry->flags);
-}
-
 /*
  * Creates a WIMStruct for a new WIM file.
  */
@@ -208,7 +205,9 @@ int wimlib_select_image(WIMStruct *w, int image)
                if (!imd->modified) {
                        DEBUG("Freeing image %u", w->current_image);
                        destroy_image_metadata(imd, NULL);
-                       memset(imd, 0, sizeof(*imd));
+                       imd->root_dentry = NULL;
+                       imd->security_data = NULL;
+                       imd->lgt = NULL;
                }
        }
 
@@ -221,7 +220,7 @@ int wimlib_select_image(WIMStruct *w, int image)
                #ifdef ENABLE_DEBUG
                DEBUG("Reading metadata resource specified by the following "
                      "lookup table entry:");
-               print_lookup_table_entry(imd->metadata_lte, NULL);
+               print_lookup_table_entry(imd->metadata_lte);
                #endif
                return read_metadata_resource(w->fp, 
                                              wimlib_get_compression_type(w), 
@@ -442,9 +441,7 @@ static int begin_read(WIMStruct *w, const char *in_wim_path, int flags)
                return WIMLIB_ERR_COMPRESSED_LOOKUP_TABLE;
        }
 
-       ret = read_lookup_table(w->fp, w->hdr.lookup_table_res_entry.offset,
-                               w->hdr.lookup_table_res_entry.size, 
-                               &w->lookup_table);
+       ret = read_lookup_table(w);
        if (ret != 0)
                return ret;
 
@@ -526,7 +523,7 @@ WIMLIBAPI int wimlib_open_wim(const char *wim_file, int flags,
 
        ret = begin_read(w, wim_file, flags);
        if (ret != 0) {
-               ERROR("Could not begin reading the WIM file `%s'", wim_file);
+               DEBUG("Could not begin reading the WIM file `%s'", wim_file);
                wimlib_free(w);
                return ret;
        }
@@ -538,7 +535,7 @@ WIMLIBAPI int wimlib_open_wim(const char *wim_file, int flags,
  * closes all files associated with the WIMStruct.  */
 WIMLIBAPI void wimlib_free(WIMStruct *w)
 {
-       uint i;
+       DEBUG("Freeing WIMStruct");
 
        if (!w)
                return;
@@ -553,10 +550,16 @@ WIMLIBAPI void wimlib_free(WIMStruct *w)
        FREE(w->xml_data);
        free_wim_info(w->wim_info);
        if (w->image_metadata) {
-               for (i = 0; i < w->hdr.image_count; i++)
+               for (uint i = 0; i < w->hdr.image_count; i++)
                        destroy_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);
 }