X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fmount_image.c;h=aaad08c3ca2b7a5a16a354fdf22a47150d5773bb;hb=c97b3097024081df0e955171363f8e727b115440;hp=0ae5f2162c2397a9887c20ab1e2ea38b4e0e1e4a;hpb=6460a27c606eed49e900c73a3316ac12d77a3a2e;p=wimlib

diff --git a/src/mount_image.c b/src/mount_image.c
index 0ae5f216..aaad08c3 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -1678,7 +1678,7 @@ wimfs_read(const char *path, char *buf, size_t size,
 			ret = size;
 		break;
 	case BLOB_IN_STAGING_FILE:
-		ret = raw_pread(&fd->f_staging_fd, buf, size, offset);
+		ret = pread(fd->f_staging_fd.fd, buf, size, offset);
 		if (ret < 0)
 			ret = -errno;
 		break;
@@ -1712,18 +1712,15 @@ wimfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
 		return ret;
 
 	for_inode_child(child, inode) {
-		char *file_name_mbs;
-		size_t file_name_mbs_nbytes;
+		char *name;
+		size_t name_nbytes;
 
-		ret = utf16le_to_tstr(child->file_name,
-				      child->file_name_nbytes,
-				      &file_name_mbs,
-				      &file_name_mbs_nbytes);
-		if (ret)
+		if (utf16le_to_tstr(child->d_name, child->d_name_nbytes,
+				    &name, &name_nbytes))
 			return -errno;
 
-		ret = filler(buf, file_name_mbs, NULL, 0);
-		FREE(file_name_mbs);
+		ret = filler(buf, name, NULL, 0);
+		FREE(name);
 		if (ret)
 			return ret;
 	}
@@ -2037,7 +2034,7 @@ wimfs_write(const char *path, const char *buf, size_t size,
 	struct wimfs_fd *fd = WIMFS_FD(fi);
 	ssize_t ret;
 
-	ret = raw_pwrite(&fd->f_staging_fd, buf, size, offset);
+	ret = pwrite(fd->f_staging_fd.fd, buf, size, offset);
 	if (ret < 0)
 		return -errno;