Make win32.h includable on non-Windows

[wimlib] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index 68fab3fd2e95f3e30be19bf6e2dbf5514ae600bf..b14489379d0275e3b734e73c81e4af02fb7a2a70 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -58,12 +58,10 @@
 #include "wimlib/resource.h"
 #include "wimlib/security.h"
 #include "wimlib/unix_data.h"
-#ifdef __WIN32__
-#  include "wimlib/win32.h" /* for realpath() equivalent */
-#endif
-#include "wimlib/xml.h"
 #include "wimlib/wildcard.h"
 #include "wimlib/wim.h"
+#include "wimlib/win32.h" /* for realpath() equivalent */
+#include "wimlib/xml.h"
 
 #define WIMLIB_EXTRACT_FLAG_FROM_PIPE   0x80000000
 #define WIMLIB_EXTRACT_FLAG_IMAGEMODE   0x40000000
@@ -181,10 +179,8 @@ read_pwm_blob_header(WIMStruct *pwm, struct blob_descriptor *blob,
        reshdr.offset_in_wim = pwm->in_fd.offset;
        reshdr.uncompressed_size = le64_to_cpu(buf.blob_hdr.uncompressed_size);
        wim_res_hdr_to_desc(&reshdr, pwm, rdesc);
-       blob_set_is_located_in_wim_resource(blob, rdesc);
-       blob->flags = rdesc->flags;
-       blob->size = rdesc->uncompressed_size;
-       blob->offset_in_res = 0;
+       blob_set_is_located_in_nonsolid_wim_resource(blob, rdesc);
+       blob->is_metadata = (rdesc->flags & WIM_RESHDR_FLAG_METADATA) != 0;
        return 0;
 
 read_error:
@@ -230,16 +226,12 @@ read_blobs_from_pipe(struct apply_ctx *ctx,
                        goto out;
 
                if ((found_blob->blob_location != BLOB_NONEXISTENT)
-                   && !(found_blob->flags & WIM_RESHDR_FLAG_METADATA)
+                   && !found_blob->is_metadata
                    && (needed_blob = lookup_blob(blob_table, found_blob->hash))
                    && (needed_blob->out_refcnt))
                {
-                       needed_blob->offset_in_res = found_blob->offset_in_res;
-                       needed_blob->flags = found_blob->flags;
-                       needed_blob->size = found_blob->size;
-
                        blob_unset_is_located_in_wim_resource(found_blob);
-                       blob_set_is_located_in_wim_resource(needed_blob, rdesc);
+                       blob_set_is_located_in_nonsolid_wim_resource(needed_blob, rdesc);
 
                        ret = (*cbs->begin_blob)(needed_blob,
                                                 cbs->begin_blob_ctx);
@@ -512,8 +504,8 @@ end_extract_blob_wrapper(struct blob_descriptor *blob, int status, void *_ctx)
  * MAX_OPEN_FILES locations, as measured by the 'out_refcnt' of each blob.
  * Therefore, the apply_operations implementation need not worry about running
  * out of file descriptors, unless it might open more than one file descriptor
- * per nominal destination (e.g. Win32 currently might because the destination
- * file system might not support hard links).
+ * per 'blob_extraction_target' (e.g. Win32 currently might because the
+ * destination file system might not support hard links).
  */
 int
 extract_blob_list(struct apply_ctx *ctx,
@@ -1926,8 +1918,7 @@ wimlib_extract_image_from_pipe_with_progress(int pipe_fd,
                if (ret)
                        goto out_wimlib_free;
 
-               if (!(xml_blob.flags & WIM_RESHDR_FLAG_METADATA))
-               {
+               if (!xml_blob.is_metadata) {
                        ERROR("Expected XML data, but found non-metadata resource.");
                        ret = WIMLIB_ERR_INVALID_PIPABLE_WIM;
                        goto out_wimlib_free;
@@ -1996,7 +1987,7 @@ wimlib_extract_image_from_pipe_with_progress(int pipe_fd,
                        goto out_wimlib_free;
                }
 
-               if (!(metadata_blob->flags & WIM_RESHDR_FLAG_METADATA)) {
+               if (!metadata_blob->is_metadata) {
                        ERROR("Expected metadata resource, but found "
                              "non-metadata resource.");
                        ret = WIMLIB_ERR_INVALID_PIPABLE_WIM;