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

diff --git a/src/iterate_dir.c b/src/iterate_dir.c
index 042c76ac..d0311358 100644
--- a/src/iterate_dir.c
+++ b/src/iterate_dir.c
@@ -36,52 +36,43 @@
 #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);
+	if (ret)
+		return ret;
+
+	ret = utf16le_get_tstr(dentry->short_name, dentry->short_name_nbytes,
+			       &wdentry->dos_name, &dummy);
+	if (ret)
+		return ret;
 
-#if TCHAR_IS_UTF16LE
-	wdentry->filename = dentry->file_name;
-	wdentry->dos_name = dentry->short_name;
-#else
-	if (dentry_has_long_name(dentry)) {
-		ret = utf16le_to_tstr(dentry->file_name,
-				      dentry->file_name_nbytes,
-				      (tchar**)&wdentry->filename,
-				      &dummy);
-		if (ret)
-			return ret;
-	}
-	if (dentry_has_short_name(dentry)) {
-		ret = utf16le_to_tstr(dentry->short_name,
-				      dentry->short_name_nbytes,
-				      (tchar**)&wdentry->dos_name,
-				      &dummy);
-		if (ret)
-			return ret;
-	}
-#endif
 	ret = calculate_dentry_full_path(dentry);
 	if (ret)
 		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];
 	}
@@ -92,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) {
@@ -119,20 +116,16 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry,
 			wdentry->streams[
 				wdentry->num_named_streams].resource.is_missing = 1;
 		}
-	#if TCHAR_IS_UTF16LE
-		wdentry->streams[wdentry->num_named_streams].stream_name =
-				inode->i_ads_entries[i].stream_name;
-	#else
+
 		size_t dummy;
 
-		ret = utf16le_to_tstr(inode->i_ads_entries[i].stream_name,
-				      inode->i_ads_entries[i].stream_name_nbytes,
-				      (tchar**)&wdentry->streams[
-						wdentry->num_named_streams].stream_name,
-				      &dummy);
+		ret = utf16le_get_tstr(inode->i_ads_entries[i].stream_name,
+				       inode->i_ads_entries[i].stream_name_nbytes,
+				       &wdentry->streams[
+					       wdentry->num_named_streams].stream_name,
+				       &dummy);
 		if (ret)
 			return ret;
-	#endif
 	}
 	return 0;
 }
@@ -140,36 +133,13 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry,
 static void
 free_wimlib_dentry(struct wimlib_dir_entry *wdentry)
 {
-#if !TCHAR_IS_UTF16LE
-	FREE((tchar*)wdentry->filename);
-	FREE((tchar*)wdentry->dos_name);
+	utf16le_put_tstr(wdentry->filename);
+	utf16le_put_tstr(wdentry->dos_name);
 	for (unsigned i = 1; i <= wdentry->num_named_streams; i++)
-		FREE((tchar*)wdentry->streams[i].stream_name);
-#endif
+		utf16le_put_tstr(wdentry->streams[i].stream_name);
 	FREE(wdentry);
 }
 
-struct iterate_dir_tree_ctx {
-	WIMStruct *wim;
-	int flags;
-	wimlib_iterate_dir_tree_callback_t cb;
-	void *user_ctx;
-};
-
-static int
-do_iterate_dir_tree(WIMStruct *wim,
-		    struct wim_dentry *dentry, int flags,
-		    wimlib_iterate_dir_tree_callback_t cb,
-		    void *user_ctx);
-
-static int
-call_do_iterate_dir_tree(struct wim_dentry *dentry, void *_ctx)
-{
-	struct iterate_dir_tree_ctx *ctx = _ctx;
-	return do_iterate_dir_tree(ctx->wim, dentry, ctx->flags,
-				   ctx->cb, ctx->user_ctx);
-}
-
 static int
 do_iterate_dir_tree(WIMStruct *wim,
 		    struct wim_dentry *dentry, int flags,
@@ -199,13 +169,16 @@ do_iterate_dir_tree(WIMStruct *wim,
 	if (flags & (WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE |
 		     WIMLIB_ITERATE_DIR_TREE_FLAG_CHILDREN))
 	{
-		struct iterate_dir_tree_ctx ctx = {
-			.wim      = wim,
-			.flags    = flags &= ~WIMLIB_ITERATE_DIR_TREE_FLAG_CHILDREN,
-			.cb       = cb,
-			.user_ctx = user_ctx,
-		};
-		ret = for_dentry_child(dentry, call_do_iterate_dir_tree, &ctx);
+		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;
+		}
 	}
 out_free_wimlib_dentry:
 	free_wimlib_dentry(wdentry);
@@ -242,6 +215,11 @@ wimlib_iterate_dir_tree(WIMStruct *wim, int image, const tchar *_path,
 	tchar *path;
 	int ret;
 
+	if (flags & ~(WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE |
+		      WIMLIB_ITERATE_DIR_TREE_FLAG_CHILDREN |
+		      WIMLIB_ITERATE_DIR_TREE_FLAG_RESOURCES_NEEDED))
+		return WIMLIB_ERR_INVALID_PARAM;
+
 	path = canonicalize_wim_path(_path);
 	if (path == NULL)
 		return WIMLIB_ERR_NOMEM;