X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fiterate_dir.c;h=d0311358b60c15924336a9d5d67f6f0f161ec72f;hb=57318a10de8d50cd338fa4c0e4e0b9f60e7c0143;hp=db43f502d12cb4dbd900ba9f6264cb83db294595;hpb=ced16a28e197645a40fa04a54793d117a04526d7;p=wimlib

diff --git a/src/iterate_dir.c b/src/iterate_dir.c
index db43f502..d0311358 100644
--- a/src/iterate_dir.c
+++ b/src/iterate_dir.c
@@ -36,20 +36,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 +66,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 +83,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) {