X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fiterate_dir.c;h=d0311358b60c15924336a9d5d67f6f0f161ec72f;hp=dc953c75ac9d6448fc04158733b635600c182e9f;hb=fe548d263d477a745dfa5057f540cc5c35ecce89;hpb=71d3401258fb14dcfc921f53452ba972e27e8b8b

diff --git a/src/iterate_dir.c b/src/iterate_dir.c
index dc953c75..d0311358 100644
--- a/src/iterate_dir.c
+++ b/src/iterate_dir.c
@@ -36,6 +36,7 @@
 #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"
 
@@ -48,6 +49,7 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry,
 	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);
@@ -64,7 +66,7 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry,
 		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) {
@@ -81,11 +83,12 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry,
 	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);
-
-	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;
+	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) {