win32_apply.c: test for EFS data before reparse data

[wimlib] / src / iterate_dir.c

diff --git a/src/iterate_dir.c b/src/iterate_dir.c
index db43f502d12cb4dbd900ba9f6264cb83db294595..76bb2b3c2d9a28d8f1d841fe4115f02e18a18f99 100644 (file)
--- a/src/iterate_dir.c
+++ b/src/iterate_dir.c
@@ -8,20 +8,18 @@
 /*
  * Copyright (C) 2013 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * 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
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -36,20 +34,20 @@
 #include "wimlib/paths.h"
 #include "wimlib/security.h"
 #include "wimlib/timestamp.h"
+#include "wimlib/unix_data.h"
 #include "wimlib/util.h"
 #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;
        const struct wim_inode *inode = dentry->d_inode;
        struct wim_lookup_table_entry *lte;
        const u8 *hash;
+       struct wimlib_unix_data unix_data;
 
        ret = utf16le_get_tstr(dentry->file_name, dentry->file_name_nbytes,
                               &wdentry->filename, &dummy);
@@ -66,11 +64,13 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry,
                return ret;
        wdentry->full_path = dentry->_full_path;
 
-       for (struct wim_dentry *d = dentry; !dentry_is_root(d); d = d->parent)
+       for (struct wim_dentry *d = dentry; !dentry_is_root(d); d = d->d_parent)
                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];
        }
@@ -81,6 +81,12 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry,
        wdentry->creation_time = wim_timestamp_to_timespec(inode->i_creation_time);
        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);
+       if (inode_get_unix_data(inode, &unix_data)) {
+               wdentry->unix_uid = unix_data.uid;
+               wdentry->unix_gid = unix_data.gid;
+               wdentry->unix_mode = unix_data.mode;
+               wdentry->unix_rdev = unix_data.rdev;
+       }
 
        lte = inode_unnamed_lte(inode, wim->lookup_table);
        if (lte) {
@@ -93,7 +99,7 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry,
        }
 
        for (unsigned i = 0; i < inode->i_num_ads; i++) {
-               if (!ads_entry_is_named_stream(&inode->i_ads_entries[i]))
+               if (!inode->i_ads_entries[i].stream_name_nbytes)
                        continue;
                lte = inode_stream_lte(inode, i + 1, wim->lookup_table);
                wdentry->num_named_streams++;
@@ -164,12 +170,22 @@ do_iterate_dir_tree(WIMStruct *wim,
                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;
+               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;
+                       }
                }
        }
 out_free_wimlib_dentry: