Windows native build

[wimlib] / src / add_image.c

diff --git a/src/add_image.c b/src/add_image.c
index 28ece7424720a3922887504590d4506d37b6b7dd..a57541f99711d94b474df35e69400269cbaf45e2 100644 (file)
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -37,13 +37,21 @@
 #      include "timestamp.h"
 #endif
 
+#ifdef __WIN32__
+#include <shlwapi.h>
+#endif
+
 #include "wimlib_internal.h"
 #include "dentry.h"
 #include "lookup_table.h"
 #include "xml.h"
 #include <ctype.h>
 #include <errno.h>
+
+#ifndef __WIN32__
 #include <fnmatch.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -162,7 +170,7 @@ static int win32_get_security_descriptor(struct wim_dentry *dentry,
                DWORD len = lenNeeded;
                char buf[len];
                if (GetFileSecurityW(path_utf16, requestedInformation,
-                                    buf, len, &lenNeeded))
+                                    (PSECURITY_DESCRIPTOR)buf, len, &lenNeeded))
                {
                        int security_id = sd_set_add_sd(sd_set, buf, len);
                        if (security_id < 0)
@@ -1138,6 +1146,19 @@ static int capture_config_set_prefix(struct capture_config *config,
        return 0;
 }
 
+static bool path_matches_pattern(const char *path, const char *pattern)
+{
+#ifdef __WIN32__
+       return PathMatchSpecA(path, pattern);
+#else
+       return fnmatch(pattern, path, FNM_PATHNAME
+                       #ifdef FNM_CASEFOLD
+                                       | FNM_CASEFOLD
+                       #endif
+               ) == 0;
+#endif
+}
+
 static bool match_pattern(const char *path, const char *path_basename,
                          const struct pattern_list *list)
 {
@@ -1155,12 +1176,8 @@ static bool match_pattern(const char *path, const char *path_basename,
                                /* A file name pattern */
                                string = path_basename;
                }
-               if (fnmatch(pat, string, FNM_PATHNAME
-                       #ifdef FNM_CASEFOLD
-                                       | FNM_CASEFOLD
-                       #endif
-                       ) == 0)
-               {
+
+               if (path_matches_pattern(string, pat)) {
                        DEBUG("`%s' matches the pattern \"%s\"",
                              string, pat);
                        return true;
@@ -1328,9 +1345,8 @@ new_filler_directory(const char *name)
        DEBUG("Creating filler directory \"%s\"", name);
        dentry = new_dentry_with_inode(name);
        if (dentry) {
-               /* Set the inode number to 0 for now.  The final inode number
+               /* Leave the inode number as 0 for now.  The final inode number
                 * will be assigned later by assign_inode_numbers(). */
-               dentry->d_inode->i_ino = 0;
                dentry->d_inode->i_resolved = 1;
                dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
        }
@@ -1344,6 +1360,9 @@ static int do_overlay(struct wim_dentry *target, struct wim_dentry *branch)
 {
        struct rb_root *rb_root;
 
+       DEBUG("Doing overlay %s => %s",
+             branch->file_name_utf8, target->file_name_utf8);
+
        if (!dentry_is_directory(target)) {
                ERROR("Cannot overlay directory `%s' over non-directory",
                      branch->file_name_utf8);
@@ -1388,6 +1407,9 @@ static int attach_branch(struct wim_dentry **root_p,
        char *slash;
        struct wim_dentry *dentry, *parent, *target;
 
+       DEBUG("Attaching branch \"%s\" => \"%s\"",
+             branch->file_name_utf8, target_path);
+
        if (*target_path == '\0') {
                /* Target: root directory */
                if (*root_p) {