Windows native build

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index e1698952e0f5c889ca9ff8bbb6449a223ad5d536..1ffc3fef442dccb5e0760bcd28db5f3cbbd99a31 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * wimlib - Library for working with WIM files
  *
@@ -24,6 +24,14 @@
  */
 
 #include "config.h"
+
+#ifdef __WIN32__
+#      include <windows.h>
+#      ifdef ERROR
+#              undef ERROR
+#      endif
+#endif
+
 #include <limits.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -43,6 +51,32 @@
 #include "lookup_table.h"
 #include "xml.h"
 
+#ifdef __WIN32__
+static char *realpath(const char *path, char *resolved_path)
+{
+       DWORD ret;
+       wimlib_assert(resolved_path == NULL);
+
+       ret = GetFullPathNameA(path, 0, NULL, NULL);
+       if (!ret)
+               goto fail_win32;
+
+       resolved_path = MALLOC(ret + 1);
+       if (!resolved_path)
+               goto fail;
+       ret = GetFullPathNameA(path, ret, resolved_path, NULL);
+       if (!ret) {
+               free(resolved_path);
+               goto fail_win32;
+       }
+       return resolved_path;
+fail_win32:
+       win32_error(GetLastError());
+fail:
+       return NULL;
+}
+#endif
+
 static int image_print_metadata(WIMStruct *w)
 {
        DEBUG("Printing metadata for image %d", w->current_image);
@@ -233,10 +267,9 @@ int select_wim_image(WIMStruct *w, int image)
                        imd->security_data = NULL;
                        INIT_HLIST_HEAD(&imd->inode_list);
                }
-               w->current_image = WIMLIB_NO_IMAGE;
        }
-
-       imd = wim_get_current_image_metadata(w);
+       w->current_image = image;
+       imd = &w->image_metadata[image - 1];
        if (imd->root_dentry) {
                ret = 0;
        } else {
@@ -246,9 +279,9 @@ int select_wim_image(WIMStruct *w, int image)
                print_lookup_table_entry(imd->metadata_lte, stdout);
                #endif
                ret = read_metadata_resource(w, imd);
+               if (ret)
+                       w->current_image = WIMLIB_NO_IMAGE;
        }
-       if (ret == 0)
-               w->current_image = image;
        return ret;
 }
 
@@ -600,7 +633,7 @@ void destroy_image_metadata(struct wim_image_metadata *imd,
  * closes all files associated with the WIMStruct.  */
 WIMLIBAPI void wimlib_free(WIMStruct *w)
 {
-       DEBUG2("Freeing WIMStruct");
+       DEBUG("Freeing WIMStruct");
 
        if (!w)
                return;
@@ -636,6 +669,7 @@ WIMLIBAPI void wimlib_free(WIMStruct *w)
        }
 #endif
        FREE(w);
+       DEBUG("Freed WIMStruct");
 }
 
 /* Get global memory allocations out of the way.  Not strictly necessary in