X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fmount_image.c;h=a7dc82a17effae690f2da278dd51dc71f3d3198d;hb=df09d8752e02a9ef4c8908e3ad4a710d684722ac;hp=cf5d43538685c2c0a4ff17077591968a1de59a1d;hpb=6c22a824ca41822f106c1d5764526ff1dfd5e87b;p=wimlib

diff --git a/src/mount_image.c b/src/mount_image.c
index cf5d4353..a7dc82a1 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (C) 2012, 2013 Eric Biggers
+ * Copyright (C) 2012, 2013, 2014 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -2045,32 +2045,6 @@ wimfs_read(const char *path, char *buf, size_t size,
 	return ret;
 }
 
-struct fill_params {
-	void *buf;
-	fuse_fill_dir_t filler;
-};
-
-static int
-dentry_fuse_fill(struct wim_dentry *dentry, void *arg)
-{
-	struct fill_params *fill_params = arg;
-
-	char *file_name_mbs;
-	size_t file_name_mbs_nbytes;
-	int ret;
-
-	ret = utf16le_to_tstr(dentry->file_name,
-			      dentry->file_name_nbytes,
-			      &file_name_mbs,
-			      &file_name_mbs_nbytes);
-	if (ret)
-		return -errno;
-
-	ret = fill_params->filler(fill_params->buf, file_name_mbs, NULL, 0);
-	FREE(file_name_mbs);
-	return ret;
-}
-
 /* Fills in the entries of the directory specified by @path using the
  * FUSE-provided function @filler.  */
 static int
@@ -2079,22 +2053,38 @@ wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
 {
 	struct wimfs_fd *fd = (struct wimfs_fd*)(uintptr_t)fi->fh;
 	struct wim_inode *inode;
+	struct wim_dentry *child;
+	int ret;
 
 	if (!fd)
 		return -EBADF;
 
 	inode = fd->f_inode;
 
-	struct fill_params fill_params = {
-		.buf = buf,
-		.filler = filler,
-	};
+	ret = filler(buf, ".", NULL, 0);
+	if (ret)
+		return ret;
+	ret = filler(buf, "..", NULL, 0);
+	if (ret)
+		return ret;
 
-	filler(buf, ".", NULL, 0);
-	filler(buf, "..", NULL, 0);
+	for_inode_child(child, inode) {
+		char *file_name_mbs;
+		size_t file_name_mbs_nbytes;
 
-	return for_dentry_in_rbtree(inode->i_children.rb_node,
-				    dentry_fuse_fill, &fill_params);
+		ret = utf16le_to_tstr(child->file_name,
+				      child->file_name_nbytes,
+				      &file_name_mbs,
+				      &file_name_mbs_nbytes);
+		if (ret)
+			return -errno;
+
+		ret = filler(buf, file_name_mbs, NULL, 0);
+		FREE(file_name_mbs);
+		if (ret)
+			return ret;
+	}
+	return 0;
 }
 
 
@@ -2345,14 +2335,12 @@ wimfs_unlink(const char *path)
 static int
 wimfs_utimens(const char *path, const struct timespec tv[2])
 {
-	struct wim_dentry *dentry;
 	struct wim_inode *inode;
 	WIMStruct *wim = wimfs_get_WIMStruct();
 
-	dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
-	if (!dentry)
+	inode = wim_pathname_to_inode(wim, path);
+	if (!inode)
 		return -errno;
-	inode = dentry->d_inode;
 
 	if (tv[0].tv_nsec != UTIME_OMIT) {
 		if (tv[0].tv_nsec == UTIME_NOW)
@@ -2372,14 +2360,12 @@ wimfs_utimens(const char *path, const struct timespec tv[2])
 static int
 wimfs_utime(const char *path, struct utimbuf *times)
 {
-	struct wim_dentry *dentry;
 	struct wim_inode *inode;
 	WIMStruct *wim = wimfs_get_WIMStruct();
 
-	dentry = get_dentry(wim, path, WIMLIB_CASE_SENSITIVE);
-	if (!dentry)
+	inode = wim_pathname_to_inode(wim, path);
+	if (!inode)
 		return -errno;
-	inode = dentry->d_inode;
 
 	inode->i_last_write_time = unix_timestamp_to_wim(times->modtime);
 	inode->i_last_access_time = unix_timestamp_to_wim(times->actime);