update_image.c: Fix call to progress function in handle_conflict()

[wimlib] / src / iterate_dir.c

diff --git a/src/iterate_dir.c b/src/iterate_dir.c
index 042c76ac07d030f78d40a4b8c40d18ae13071533..dc953c75ac9d6448fc04158733b635600c182e9f 100644 (file)
--- a/src/iterate_dir.c
+++ b/src/iterate_dir.c
@@ -40,10 +40,8 @@
 #include "wimlib/wim.h"
 
 static int
-init_wimlib_dentry(struct wimlib_dir_entry *wdentry,
-                  struct wim_dentry *dentry,
-                  const WIMStruct *wim,
-                  int flags)
+init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry,
+                  WIMStruct *wim, int flags)
 {
        int ret;
        size_t dummy;
@@ -51,27 +49,16 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry,
        struct wim_lookup_table_entry *lte;
        const u8 *hash;
 
-#if TCHAR_IS_UTF16LE
-       wdentry->filename = dentry->file_name;
-       wdentry->dos_name = dentry->short_name;
-#else
-       if (dentry_has_long_name(dentry)) {
-               ret = utf16le_to_tstr(dentry->file_name,
-                                     dentry->file_name_nbytes,
-                                     (tchar**)&wdentry->filename,
-                                     &dummy);
-               if (ret)
-                       return ret;
-       }
-       if (dentry_has_short_name(dentry)) {
-               ret = utf16le_to_tstr(dentry->short_name,
-                                     dentry->short_name_nbytes,
-                                     (tchar**)&wdentry->dos_name,
-                                     &dummy);
-               if (ret)
-                       return ret;
-       }
-#endif
+       ret = utf16le_get_tstr(dentry->file_name, dentry->file_name_nbytes,
+                              &wdentry->filename, &dummy);
+       if (ret)
+               return ret;
+
+       ret = utf16le_get_tstr(dentry->short_name, dentry->short_name_nbytes,
+                              &wdentry->dos_name, &dummy);
+       if (ret)
+               return ret;
+
        ret = calculate_dentry_full_path(dentry);
        if (ret)
                return ret;
@@ -81,7 +68,9 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry,
                wdentry->depth++;
 
        if (inode->i_security_id >= 0) {
-               const struct wim_security_data *sd = wim_const_security_data(wim);
+               struct wim_security_data *sd;
+
+               sd = wim_get_current_security_data(wim);
                wdentry->security_descriptor = sd->descriptors[inode->i_security_id];
                wdentry->security_descriptor_size = sd->sizes[inode->i_security_id];
        }
@@ -93,6 +82,11 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry,
        wdentry->last_write_time = wim_timestamp_to_timespec(inode->i_last_write_time);
        wdentry->last_access_time = wim_timestamp_to_timespec(inode->i_last_access_time);
 
+       wdentry->unix_uid = inode->i_unix_data.uid;
+       wdentry->unix_gid = inode->i_unix_data.gid;
+       wdentry->unix_mode = inode->i_unix_data.mode;
+       wdentry->unix_reserved = inode->i_unix_data.reserved;
+
        lte = inode_unnamed_lte(inode, wim->lookup_table);
        if (lte) {
                lte_to_wimlib_resource_entry(lte, &wdentry->streams[0].resource);
@@ -119,20 +113,16 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry,
                        wdentry->streams[
                                wdentry->num_named_streams].resource.is_missing = 1;
                }
-       #if TCHAR_IS_UTF16LE
-               wdentry->streams[wdentry->num_named_streams].stream_name =
-                               inode->i_ads_entries[i].stream_name;
-       #else
+
                size_t dummy;
 
-               ret = utf16le_to_tstr(inode->i_ads_entries[i].stream_name,
-                                     inode->i_ads_entries[i].stream_name_nbytes,
-                                     (tchar**)&wdentry->streams[
-                                               wdentry->num_named_streams].stream_name,
-                                     &dummy);
+               ret = utf16le_get_tstr(inode->i_ads_entries[i].stream_name,
+                                      inode->i_ads_entries[i].stream_name_nbytes,
+                                      &wdentry->streams[
+                                              wdentry->num_named_streams].stream_name,
+                                      &dummy);
                if (ret)
                        return ret;
-       #endif
        }
        return 0;
 }
@@ -140,36 +130,13 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry,
 static void
 free_wimlib_dentry(struct wimlib_dir_entry *wdentry)
 {
-#if !TCHAR_IS_UTF16LE
-       FREE((tchar*)wdentry->filename);
-       FREE((tchar*)wdentry->dos_name);
+       utf16le_put_tstr(wdentry->filename);
+       utf16le_put_tstr(wdentry->dos_name);
        for (unsigned i = 1; i <= wdentry->num_named_streams; i++)
-               FREE((tchar*)wdentry->streams[i].stream_name);
-#endif
+               utf16le_put_tstr(wdentry->streams[i].stream_name);
        FREE(wdentry);
 }
 
-struct iterate_dir_tree_ctx {
-       WIMStruct *wim;
-       int flags;
-       wimlib_iterate_dir_tree_callback_t cb;
-       void *user_ctx;
-};
-
-static int
-do_iterate_dir_tree(WIMStruct *wim,
-                   struct wim_dentry *dentry, int flags,
-                   wimlib_iterate_dir_tree_callback_t cb,
-                   void *user_ctx);
-
-static int
-call_do_iterate_dir_tree(struct wim_dentry *dentry, void *_ctx)
-{
-       struct iterate_dir_tree_ctx *ctx = _ctx;
-       return do_iterate_dir_tree(ctx->wim, dentry, ctx->flags,
-                                  ctx->cb, ctx->user_ctx);
-}
-
 static int
 do_iterate_dir_tree(WIMStruct *wim,
                    struct wim_dentry *dentry, int flags,
@@ -199,13 +166,16 @@ do_iterate_dir_tree(WIMStruct *wim,
        if (flags & (WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE |
                     WIMLIB_ITERATE_DIR_TREE_FLAG_CHILDREN))
        {
-               struct iterate_dir_tree_ctx ctx = {
-                       .wim      = wim,
-                       .flags    = flags &= ~WIMLIB_ITERATE_DIR_TREE_FLAG_CHILDREN,
-                       .cb       = cb,
-                       .user_ctx = user_ctx,
-               };
-               ret = for_dentry_child(dentry, call_do_iterate_dir_tree, &ctx);
+               struct wim_dentry *child;
+
+               ret = 0;
+               for_dentry_child(child, dentry) {
+                       ret = do_iterate_dir_tree(wim, child,
+                                                 flags & ~WIMLIB_ITERATE_DIR_TREE_FLAG_CHILDREN,
+                                                 cb, user_ctx);
+                       if (ret)
+                               break;
+               }
        }
 out_free_wimlib_dentry:
        free_wimlib_dentry(wdentry);
@@ -242,6 +212,11 @@ wimlib_iterate_dir_tree(WIMStruct *wim, int image, const tchar *_path,
        tchar *path;
        int ret;
 
+       if (flags & ~(WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE |
+                     WIMLIB_ITERATE_DIR_TREE_FLAG_CHILDREN |
+                     WIMLIB_ITERATE_DIR_TREE_FLAG_RESOURCES_NEEDED))
+               return WIMLIB_ERR_INVALID_PARAM;
+
        path = canonicalize_wim_path(_path);
        if (path == NULL)
                return WIMLIB_ERR_NOMEM;