X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fiterate_dir.c;h=8e7f6cc3878d6c59c8229b20ee65c2dda795cc13;hb=3872f9e0d30f6439b2a08e091fbd3df042841b6a;hp=c295dd1858f03af0829583988082bca7e246a349;hpb=27b30056e4520e9b5b9d0846f438311746345f83;p=wimlib

diff --git a/src/iterate_dir.c b/src/iterate_dir.c
index c295dd18..8e7f6cc3 100644
--- 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
@@ -66,7 +64,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) {
@@ -87,6 +85,7 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry,
 		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);
@@ -100,7 +99,7 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry,
 	}
 
 	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++;