X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount_image.c;h=e2f0ffbccac4e4f7498809adaf658fac3a71a631;hp=eeacf94d138864ab9c0bae8975d1ff0e475302a3;hb=ee547cc83f231d727e4d9984c23e86d96d3da769;hpb=5538002965b9a7f08aef62c7b03194aa40bb0751 diff --git a/src/mount_image.c b/src/mount_image.c index eeacf94d..e2f0ffbc 100644 --- a/src/mount_image.c +++ b/src/mount_image.c @@ -511,7 +511,7 @@ create_file(struct fuse_context *fuse_ctx, const char *path, } } - hlist_add_head(&inode->i_hlist, + hlist_add_head(&inode->i_hlist_node, &wim_get_current_image_metadata(wimfs_ctx->wim)->inode_list); dentry_add_child(parent, dentry); @@ -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; }