libattr is no longer needed

[wimlib] / src / iterate_dir.c

diff --git a/src/iterate_dir.c b/src/iterate_dir.c
index 7dc63486618d4f93065c251ca7387829abdb8084..55d2a2a751a2a51dacea48111ea109133efdf180 100644 (file)
--- a/src/iterate_dir.c
+++ b/src/iterate_dir.c
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2013, 2015 Eric Biggers
+ * Copyright (C) 2013-2016 Eric Biggers
  *
  * This file is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the Free
@@ -31,6 +31,7 @@
 #include "wimlib/dentry.h"
 #include "wimlib/encoding.h"
 #include "wimlib/metadata.h"
+#include "wimlib/object_id.h"
 #include "wimlib/paths.h"
 #include "wimlib/security.h"
 #include "wimlib/timestamp.h"
@@ -49,12 +50,11 @@ stream_to_wimlib_stream_entry(const struct wim_inode *inode,
        const u8 *hash;
 
        if (stream_is_named(strm)) {
-               size_t dummy;
                int ret;
 
                ret = utf16le_get_tstr(strm->stream_name,
                                       utf16le_len_bytes(strm->stream_name),
-                                      &wstream->stream_name, &dummy);
+                                      &wstream->stream_name, NULL);
                if (ret)
                        return ret;
        }
@@ -86,30 +86,31 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry,
                   WIMStruct *wim, int flags)
 {
        int ret;
-       size_t dummy;
        const struct wim_inode *inode = dentry->d_inode;
        const struct wim_inode_stream *strm;
        struct wimlib_unix_data unix_data;
+       const void *object_id;
+       u32 object_id_len;
 
-       ret = utf16le_get_tstr(dentry->file_name, dentry->file_name_nbytes,
-                              &wdentry->filename, &dummy);
+       ret = utf16le_get_tstr(dentry->d_name, dentry->d_name_nbytes,
+                              &wdentry->filename, NULL);
        if (ret)
                return ret;
 
-       ret = utf16le_get_tstr(dentry->short_name, dentry->short_name_nbytes,
-                              &wdentry->dos_name, &dummy);
+       ret = utf16le_get_tstr(dentry->d_short_name, dentry->d_short_name_nbytes,
+                              &wdentry->dos_name, NULL);
        if (ret)
                return ret;
 
        ret = calculate_dentry_full_path(dentry);
        if (ret)
                return ret;
-       wdentry->full_path = dentry->_full_path;
+       wdentry->full_path = dentry->d_full_path;
 
        for (struct wim_dentry *d = dentry; !dentry_is_root(d); d = d->d_parent)
                wdentry->depth++;
 
-       if (inode->i_security_id >= 0) {
+       if (inode_has_security_descriptor(inode)) {
                struct wim_security_data *sd;
 
                sd = wim_get_current_security_data(wim);
@@ -129,6 +130,11 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry,
                wdentry->unix_mode = unix_data.mode;
                wdentry->unix_rdev = unix_data.rdev;
        }
+       object_id = inode_get_object_id(inode, &object_id_len);
+       if (unlikely(object_id != NULL)) {
+               memcpy(&wdentry->object_id, object_id,
+                      min(object_id_len, sizeof(wdentry->object_id)));
+       }
 
        strm = inode_get_unnamed_stream(inode, get_default_stream_type(inode));
        if (strm) {
@@ -200,25 +206,17 @@ do_iterate_dir_tree(WIMStruct *wim,
                struct wim_dentry *child;
 
                ret = 0;
-               if (default_ignore_case) {
-                       for_dentry_child_case_insensitive(child, dentry) {
-                               ret = do_iterate_dir_tree(wim, child,
-                                                         flags & ~WIMLIB_ITERATE_DIR_TREE_FLAG_CHILDREN,
-                                                         cb, user_ctx);
-                               if (ret)
-                                       break;
-                       }
-               } else {
-                       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;
-                       }
+               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(dentry->d_full_path);
+       dentry->d_full_path = NULL;
        free_wimlib_dentry(wdentry);
 out:
        return ret;
@@ -261,6 +259,11 @@ wimlib_iterate_dir_tree(WIMStruct *wim, int image, const tchar *_path,
        path = canonicalize_wim_path(_path);
        if (path == NULL)
                return WIMLIB_ERR_NOMEM;
+
+       ret = wim_checksum_unhashed_blobs(wim);
+       if (ret)
+               return ret;
+
        struct image_iterate_dir_tree_ctx ctx = {
                .path = path,
                .flags = flags,