X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdentry.c;h=3847fbb2a6fd429dd2eb925c343679f9dcc7a48e;hb=cecdece7933824c248a1b07021ce576f0f9d6892;hp=634e4def83e74d605f6306a4754acab08b119918;hpb=d5b841b4d3243c7c6922d9254fb4e5b9f0b58d41;p=wimlib

diff --git a/src/dentry.c b/src/dentry.c
index 634e4def..3847fbb2 100644
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -27,19 +27,12 @@
  * wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include <errno.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <unistd.h>
-
+#include "buffer_io.h"
 #include "dentry.h"
-#include "io.h"
 #include "lookup_table.h"
-#include "sha1.h"
 #include "timestamp.h"
 #include "wimlib_internal.h"
 
-
 /* Calculates the unaligned length, in bytes, of an on-disk WIM dentry that has
  * a file name and short name that take the specified numbers of bytes.  This
  * excludes any alternate data stream entries that may follow the dentry. */
@@ -71,16 +64,6 @@ static u64 dentry_correct_length(const struct dentry *dentry)
 	return (dentry_correct_length_unaligned(dentry) + 7) & ~7;
 }
 
-/* Return %true iff @dentry has the UTF-8 file name @name that has length
- * @name_len bytes. */
-static bool dentry_has_name(const struct dentry *dentry, const char *name,
-			    size_t name_len)
-{
-	if (dentry->file_name_utf8_len != name_len)
-		return false;
-	return memcmp(dentry->file_name_utf8, name, name_len) == 0;
-}
-
 /* Return %true iff the alternate data stream entry @entry has the UTF-8 stream
  * name @name that has length @name_len bytes. */
 static inline bool ads_entry_has_name(const struct ads_entry *entry,
@@ -100,13 +83,12 @@ int get_names(char **name_utf16_ret, char **name_utf8_ret,
 	size_t utf8_len;
 	size_t utf16_len;
 	char *name_utf16, *name_utf8;
+	int ret;
 
 	utf8_len = strlen(name);
-
-	name_utf16 = utf8_to_utf16(name, utf8_len, &utf16_len);
-
-	if (!name_utf16)
-		return WIMLIB_ERR_NOMEM;
+	ret = utf8_to_utf16(name, utf8_len, &name_utf16, &utf16_len);
+	if (ret != 0)
+		return ret;
 
 	name_utf8 = MALLOC(utf8_len + 1);
 	if (!name_utf8) {
@@ -132,11 +114,14 @@ static int change_dentry_name(struct dentry *dentry, const char *new_name)
 
 	ret = get_names(&dentry->file_name, &dentry->file_name_utf8,
 			&dentry->file_name_len, &dentry->file_name_utf8_len,
-			 new_name);
-	FREE(dentry->short_name);
-	dentry->short_name_len = 0;
-	if (ret == 0)
+			new_name);
+	if (ret == 0) {
+		if (dentry->short_name_len) {
+			FREE(dentry->short_name);
+			dentry->short_name_len = 0;
+		}
 		dentry->length = dentry_correct_length(dentry);
+	}
 	return ret;
 }
 
@@ -185,96 +170,61 @@ static u64 dentry_total_length(const struct dentry *dentry)
 	return __dentry_total_length(dentry, dentry->length);
 }
 
-/* Transfers file attributes from a `stat' buffer to a WIM "inode". */
-void stbuf_to_inode(const struct stat *stbuf, struct inode *inode)
-{
-	if (S_ISLNK(stbuf->st_mode)) {
-		inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
-		inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
-	} else if (S_ISDIR(stbuf->st_mode)) {
-		inode->attributes = FILE_ATTRIBUTE_DIRECTORY;
-	} else {
-		inode->attributes = FILE_ATTRIBUTE_NORMAL;
-	}
-	if (sizeof(ino_t) >= 8)
-		inode->ino = (u64)stbuf->st_ino;
-	else
-		inode->ino = (u64)stbuf->st_ino |
-				   ((u64)stbuf->st_dev << ((sizeof(ino_t) * 8) & 63));
-	/* Set timestamps */
-	inode->creation_time = timespec_to_wim_timestamp(&stbuf->st_mtim);
-	inode->last_write_time = timespec_to_wim_timestamp(&stbuf->st_mtim);
-	inode->last_access_time = timespec_to_wim_timestamp(&stbuf->st_atim);
-}
-
-#ifdef WITH_FUSE
-/* Transfers file attributes from a struct inode to a `stat' buffer.
- *
- * The lookup table entry tells us which stream in the inode we are statting.
- * For a named data stream, everything returned is the same as the unnamed data
- * stream except possibly the size and block count. */
-int inode_to_stbuf(const struct inode *inode, struct lookup_table_entry *lte,
-		   struct stat *stbuf)
+int for_dentry_in_rbtree(struct rb_node *root,
+			 int (*visitor)(struct dentry *, void *),
+			 void *arg)
 {
-	if (inode_is_symlink(inode))
-		stbuf->st_mode = S_IFLNK | 0777;
-	else if (inode_is_directory(inode))
-		stbuf->st_mode = S_IFDIR | 0755;
-	else
-		stbuf->st_mode = S_IFREG | 0644;
-
-	stbuf->st_ino   = (ino_t)inode->ino;
-	stbuf->st_nlink = inode->link_count;
-	stbuf->st_uid   = getuid();
-	stbuf->st_gid   = getgid();
-
-	if (lte) {
-		if (lte->resource_location == RESOURCE_IN_STAGING_FILE) {
-			wimlib_assert(lte->staging_file_name);
-			struct stat native_stat;
-			if (stat(lte->staging_file_name, &native_stat) != 0) {
-				DEBUG("Failed to stat `%s': %m",
-				      lte->staging_file_name);
-				return -errno;
-			}
-			stbuf->st_size = native_stat.st_size;
+	int ret;
+	struct rb_node *node = root;
+	LIST_HEAD(stack);
+	while (true) {
+		if (node) {
+			list_add(&rbnode_dentry(node)->tmp_list, &stack);
+			node = node->rb_left;
 		} else {
-			stbuf->st_size = wim_resource_size(lte);
+			struct list_head *next;
+			struct dentry *dentry;
+
+			next = stack.next;
+			if (next == &stack)
+				return 0;
+			dentry = container_of(next, struct dentry, tmp_list);
+			list_del(next);
+			ret = visitor(dentry, arg);
+			if (ret != 0)
+				return ret;
+			node = dentry->rb_node.rb_right;
 		}
-	} else {
-		stbuf->st_size = 0;
 	}
-
-	stbuf->st_atime   = wim_timestamp_to_unix(inode->last_access_time);
-	stbuf->st_mtime   = wim_timestamp_to_unix(inode->last_write_time);
-	stbuf->st_ctime   = wim_timestamp_to_unix(inode->creation_time);
-	stbuf->st_blocks  = (stbuf->st_size + 511) / 512;
-	return 0;
 }
-#endif
 
-int for_dentry_in_rbtree(struct rb_node *node,
-			 int (*visitor)(struct dentry *, void *),
-			 void *arg)
+static int for_dentry_tree_in_rbtree_depth(struct rb_node *node,
+					   int (*visitor)(struct dentry*, void*),
+					   void *arg)
 {
 	int ret;
 	if (node) {
-		ret = for_dentry_in_rbtree(node->rb_left, visitor, arg);
+		ret = for_dentry_tree_in_rbtree_depth(node->rb_left,
+						      visitor, arg);
 		if (ret != 0)
 			return ret;
-		ret = visitor(rbnode_dentry(node), arg);
+		ret = for_dentry_tree_in_rbtree_depth(node->rb_right,
+						      visitor, arg);
 		if (ret != 0)
 			return ret;
-		ret = for_dentry_in_rbtree(node->rb_right, visitor, arg);
+		ret = for_dentry_in_tree_depth(rbnode_dentry(node), visitor, arg);
 		if (ret != 0)
 			return ret;
 	}
 	return 0;
 }
 
-int for_dentry_tree_in_rbtree(struct rb_node *node,
-			      int (*visitor)(struct dentry*, void*),
-			      void *arg)
+/*#define RECURSIVE_FOR_DENTRY_IN_TREE*/
+
+#ifdef RECURSIVE_FOR_DENTRY_IN_TREE
+static int for_dentry_tree_in_rbtree(struct rb_node *node,
+				     int (*visitor)(struct dentry*, void*),
+				     void *arg)
 {
 	int ret;
 	if (node) {
@@ -290,41 +240,126 @@ int for_dentry_tree_in_rbtree(struct rb_node *node,
 	}
 	return 0;
 }
-
-static int for_dentry_tree_in_rbtree_depth(struct rb_node *node,
-					   int (*visitor)(struct dentry*, void*),
-					   void *arg)
-{
-	int ret;
-	if (node) {
-		ret = for_dentry_tree_in_rbtree_depth(node->rb_left,
-						      visitor, arg);
-		if (ret != 0)
-			return ret;
-		ret = for_dentry_tree_in_rbtree_depth(node->rb_right,
-						      visitor, arg);
-		if (ret != 0)
-			return ret;
-		ret = for_dentry_in_tree_depth(rbnode_dentry(node), visitor, arg);
-		if (ret != 0)
-			return ret;
-	}
-	return 0;
-}
+#endif
 
 /*
- * Calls a function on all directory entries in a directory tree.  It is called
- * on a parent before its children.
+ * Calls a function on all directory entries in a WIM dentry tree.  Logically,
+ * this is a pre-order traversal (the function is called on a parent dentry
+ * before its children), but sibling dentries will be visited in order as well.
+ *
+ * In reality, the data structures are more complicated than the above might
+ * suggest because there is a separate red-black tree for each dentry that
+ * contains its direct children.
  */
 int for_dentry_in_tree(struct dentry *root,
 		       int (*visitor)(struct dentry*, void*), void *arg)
 {
+#ifdef RECURSIVE_FOR_DENTRY_IN_TREE
 	int ret = visitor(root, arg);
+	if (ret != 0)
+		return ret;
+	return for_dentry_tree_in_rbtree(root->d_inode->children.rb_node, visitor, arg);
+#else
+	int ret;
+	struct list_head main_stack;
+	struct list_head sibling_stack;
+	struct list_head *sibling_stack_bottom;
+	struct dentry *main_dentry;
+	struct rb_node *node;
+	struct list_head *next_sibling;
+	struct dentry *dentry;
+
+	ret = visitor(root, arg);
 	if (ret != 0)
 		return ret;
 
-	return for_dentry_tree_in_rbtree(root->d_inode->children.rb_node,
-					 visitor, arg);
+	main_dentry = root;
+	sibling_stack_bottom = &sibling_stack;
+	INIT_LIST_HEAD(&main_stack);
+	INIT_LIST_HEAD(&sibling_stack);
+
+	list_add(&root->tmp_list, &main_stack);
+	node = root->d_inode->children.rb_node;
+
+	while (1) {
+		// Prepare for non-recursive in-order traversal of the red-black
+		// tree of this dentry's children
+
+		while (node) {
+			// Push this node to the sibling stack and examine the
+			// left neighbor, if any
+			list_add(&rbnode_dentry(node)->tmp_list, &sibling_stack);
+			node = node->rb_left;
+		}
+
+		next_sibling = sibling_stack.next;
+		if (next_sibling == sibling_stack_bottom) {
+			// Done with all siblings.  Pop the main dentry to move
+			// back up one level.
+			main_dentry = container_of(main_stack.next,
+						   struct dentry,
+						   tmp_list);
+			list_del(&main_dentry->tmp_list);
+
+			if (main_dentry == root)
+				goto out;
+
+			// Restore sibling stack bottom from the previous level
+			sibling_stack_bottom = (void*)main_dentry->parent;
+
+			// Restore the just-popped main dentry's parent
+			main_dentry->parent = container_of(main_stack.next,
+							   struct dentry,
+							   tmp_list);
+
+			// The next sibling to traverse in the previous level,
+			// in the in-order traversal of the red-black tree, is
+			// the one to the right.
+			node = main_dentry->rb_node.rb_right;
+		} else {
+			// The sibling stack is not empty, so there are more to
+			// go!
+
+			// Pop a sibling from the stack.
+			list_del(next_sibling);
+			dentry = container_of(next_sibling, struct dentry, tmp_list);
+
+			// Visit the sibling.
+			ret = visitor(dentry, arg);
+			if (ret != 0) {
+				// Failed.  Restore parent pointers for the
+				// dentries in the main stack
+				list_for_each_entry(dentry, &main_stack, tmp_list) {
+					dentry->parent = container_of(dentry->tmp_list.next,
+								      struct dentry,
+								      tmp_list);
+				}
+				goto out;
+			}
+
+			// We'd like to recursively visit the dentry tree rooted
+			// at this sibling.  To do this, add it to the main
+			// stack, save the bottom of this level's sibling stack
+			// in the dentry->parent field, re-set the bottom of the
+			// sibling stack to be its current height, and set
+			// main_dentry to the sibling so it becomes the parent
+			// dentry in the next iteration through the outer loop.
+			if (inode_has_children(dentry->d_inode)) {
+				list_add(&dentry->tmp_list, &main_stack);
+				dentry->parent = (void*)sibling_stack_bottom;
+				sibling_stack_bottom = sibling_stack.next;
+
+				main_dentry = dentry;
+				node = main_dentry->d_inode->children.rb_node;
+			} else {
+				node = dentry->rb_node.rb_right;
+			}
+		}
+	}
+out:
+	root->parent = root;
+	return ret;
+#endif
 }
 
 /*
@@ -334,12 +369,96 @@ int for_dentry_in_tree(struct dentry *root,
 int for_dentry_in_tree_depth(struct dentry *root,
 			     int (*visitor)(struct dentry*, void*), void *arg)
 {
-
-	int ret = for_dentry_tree_in_rbtree_depth(root->d_inode->children.rb_node,
-						  visitor, arg);
+#if 1
+	int ret;
+	ret = for_dentry_tree_in_rbtree_depth(root->d_inode->children.rb_node,
+					      visitor, arg);
 	if (ret != 0)
 		return ret;
 	return visitor(root, arg);
+
+#else
+	int ret;
+	struct list_head main_stack;
+	struct list_head sibling_stack;
+	struct list_head *sibling_stack_bottom;
+	struct dentry *main_dentry;
+	struct rb_node *node;
+	struct list_head *next_sibling;
+	struct dentry *dentry;
+
+	main_dentry = root;
+	sibling_stack_bottom = &sibling_stack;
+	INIT_LIST_HEAD(&main_stack);
+	INIT_LIST_HEAD(&sibling_stack);
+
+	list_add(&main_dentry->tmp_list, &main_stack);
+
+	while (1) {
+		node = main_dentry->d_inode->children.rb_node;
+
+		while (1) {
+			if (node->rb_left) {
+				list_add(&rbnode_dentry(node)->tmp_list, &sibling_stack);
+				node = node->rb_left;
+				continue;
+			}
+			if (node->rb_right) {
+				list_add(&rbnode_dentry(node)->tmp_list, &sibling_stack);
+				node = node->rb_right;
+				continue;
+			}
+			list_add(&rbnode_dentry(node)->tmp_list, &sibling_stack);
+		}
+
+	pop_sibling:
+		next_sibling = sibling_stack.next;
+		if (next_sibling == sibling_stack_bottom) {
+			main_dentry = container_of(main_stack.next,
+						   struct dentry,
+						   tmp_list);
+			list_del(&main_dentry->tmp_list);
+
+
+			sibling_stack_bottom = (void*)main_dentry->parent;
+
+			if (main_dentry == root) {
+				main_dentry->parent = main_dentry;
+				ret = visitor(dentry, arg);
+				return ret;
+			} else {
+				main_dentry->parent = container_of(main_stack.next,
+								   struct dentry,
+								   tmp_list);
+			}
+
+			ret = visitor(main_dentry, arg);
+
+			if (ret != 0) {
+				list_del(&root->tmp_list);
+				list_for_each_entry(dentry, &main_stack, tmp_list) {
+					dentry->parent = container_of(dentry->tmp_list.next,
+								      struct dentry,
+								      tmp_list);
+				}
+				root->parent = root;
+				return ret;
+			}
+			goto pop_sibling;
+		} else {
+
+			list_del(next_sibling);
+			dentry = container_of(next_sibling, struct dentry, tmp_list);
+
+
+			list_add(&dentry->tmp_list, &main_stack);
+			dentry->parent = (void*)sibling_stack_bottom;
+			sibling_stack_bottom = sibling_stack.next;
+
+			main_dentry = dentry;
+		}
+	}
+#endif
 }
 
 /*
@@ -440,15 +559,15 @@ void calculate_subdir_offsets(struct dentry *dentry, u64 *subdir_offset_p)
 	}
 }
 
-static int compare_names(const char *name_1, size_t len_1,
-			 const char *name_2, size_t len_2)
+static int compare_names(const char *name_1, u16 len_1,
+			 const char *name_2, u16 len_2)
 {
-	if (len_1 < len_2)
-		return -1;
-	else if (len_1 > len_2)
-		return 1;
-	else
-		return memcmp(name_1, name_2, len_1);
+	int result = strncasecmp(name_1, name_2, min(len_1, len_2));
+	if (result) {
+		return result;
+	} else {
+		return (int)len_1 - (int)len_2;
+	}
 }
 
 static int dentry_compare_names(const struct dentry *d1, const struct dentry *d2)
@@ -586,49 +705,37 @@ int print_dentry(struct dentry *dentry, void *lookup_table)
 	const u8 *hash;
 	struct lookup_table_entry *lte;
 	const struct inode *inode = dentry->d_inode;
-	time_t time;
-	char *p;
+	char buf[50];
 
 	printf("[DENTRY]\n");
 	printf("Length            = %"PRIu64"\n", dentry->length);
 	printf("Attributes        = 0x%x\n", inode->attributes);
-	for (unsigned i = 0; i < ARRAY_LEN(file_attr_flags); i++)
+	for (size_t i = 0; i < ARRAY_LEN(file_attr_flags); i++)
 		if (file_attr_flags[i].flag & inode->attributes)
 			printf("    FILE_ATTRIBUTE_%s is set\n",
 				file_attr_flags[i].name);
 	printf("Security ID       = %d\n", inode->security_id);
 	printf("Subdir offset     = %"PRIu64"\n", dentry->subdir_offset);
 
-	/* Translate the timestamps into something readable */
-	time = wim_timestamp_to_unix(inode->creation_time);
-	p = asctime(gmtime(&time));
-	*(strrchr(p, '\n')) = '\0';
-	printf("Creation Time     = %s UTC\n", p);
+	wim_timestamp_to_str(inode->creation_time, buf, sizeof(buf));
+	printf("Creation Time     = %s\n", buf);
 
-	time = wim_timestamp_to_unix(inode->last_access_time);
-	p = asctime(gmtime(&time));
-	*(strrchr(p, '\n')) = '\0';
-	printf("Last Access Time  = %s UTC\n", p);
+	wim_timestamp_to_str(inode->last_access_time, buf, sizeof(buf));
+	printf("Last Access Time  = %s\n", buf);
 
-	time = wim_timestamp_to_unix(inode->last_write_time);
-	p = asctime(gmtime(&time));
-	*(strrchr(p, '\n')) = '\0';
-	printf("Last Write Time   = %s UTC\n", p);
+	wim_timestamp_to_str(inode->last_write_time, buf, sizeof(buf));
+	printf("Last Write Time   = %s\n", buf);
 
 	printf("Reparse Tag       = 0x%"PRIx32"\n", inode->reparse_tag);
 	printf("Hard Link Group   = 0x%"PRIx64"\n", inode->ino);
 	printf("Hard Link Group Size = %"PRIu32"\n", inode->link_count);
 	printf("Number of Alternate Data Streams = %hu\n", inode->num_ads);
-	printf("Filename          = \"");
-	print_string(dentry->file_name, dentry->file_name_len);
-	puts("\"");
-	printf("Filename Length   = %hu\n", dentry->file_name_len);
 	printf("Filename (UTF-8)  = \"%s\"\n", dentry->file_name_utf8);
-	printf("Filename (UTF-8) Length = %hu\n", dentry->file_name_utf8_len);
-	printf("Short Name        = \"");
+	/*printf("Filename (UTF-8) Length = %hu\n", dentry->file_name_utf8_len);*/
+	printf("Short Name (UTF-16LE) = \"");
 	print_string(dentry->short_name, dentry->short_name_len);
 	puts("\"");
-	printf("Short Name Length = %hu\n", dentry->short_name_len);
+	/*printf("Short Name Length = %hu\n", dentry->short_name_len);*/
 	printf("Full Path (UTF-8) = \"%s\"\n", dentry->full_path_utf8);
 	lte = inode_stream_lte(dentry->d_inode, 0, lookup_table);
 	if (lte) {
@@ -674,6 +781,11 @@ static struct inode *new_timeless_inode()
 		inode->link_count = 1;
 	#ifdef WITH_FUSE
 		inode->next_stream_id = 1;
+		if (pthread_mutex_init(&inode->i_mutex, NULL) != 0) {
+			ERROR_WITH_ERRNO("Error initializing mutex");
+			FREE(inode);
+			return NULL;
+		}
 	#endif
 		INIT_LIST_HEAD(&inode->dentry_list);
 	}
@@ -699,6 +811,9 @@ static struct inode *new_inode()
  *
  * Returns a pointer to the new dentry, or NULL if out of memory.
  */
+#ifndef WITH_FUSE
+static
+#endif
 struct dentry *new_dentry(const char *name)
 {
 	struct dentry *dentry;
@@ -716,7 +831,7 @@ struct dentry *new_dentry(const char *name)
 	return dentry;
 err:
 	FREE(dentry);
-	ERROR("Failed to allocate new dentry");
+	ERROR_WITH_ERRNO("Failed to create new dentry with name \"%s\"", name);
 	return NULL;
 }
 
@@ -779,6 +894,9 @@ void free_inode(struct inode *inode)
 	#ifdef WITH_FUSE
 		wimlib_assert(inode->num_opened_fds == 0);
 		FREE(inode->fds);
+		pthread_mutex_destroy(&inode->i_mutex);
+		if (inode->hlist.pprev)
+			hlist_safe_del(&inode->hlist);
 	#endif
 		FREE(inode->extracted_file);
 		FREE(inode);
@@ -789,8 +907,7 @@ void free_inode(struct inode *inode)
  * */
 static void put_inode(struct inode *inode)
 {
-	wimlib_assert(inode);
-	wimlib_assert(inode->link_count);
+	wimlib_assert(inode->link_count != 0);
 	if (--inode->link_count == 0) {
 	#ifdef WITH_FUSE
 		if (inode->num_opened_fds == 0)
@@ -807,7 +924,6 @@ static void put_inode(struct inode *inode)
  */
 void free_dentry(struct dentry *dentry)
 {
-	wimlib_assert(dentry != NULL);
 	FREE(dentry->file_name);
 	FREE(dentry->file_name_utf8);
 	FREE(dentry->short_name);
@@ -819,9 +935,7 @@ void free_dentry(struct dentry *dentry)
 
 void put_dentry(struct dentry *dentry)
 {
-	wimlib_assert(dentry != NULL);
 	wimlib_assert(dentry->refcnt != 0);
-
 	if (--dentry->refcnt == 0)
 		free_dentry(dentry);
 }
@@ -838,7 +952,7 @@ static int do_free_dentry(struct dentry *dentry, void *__lookup_table)
 	if (lookup_table) {
 		struct lookup_table_entry *lte;
 		struct inode *inode = dentry->d_inode;
-		wimlib_assert(inode->link_count);
+		wimlib_assert(inode->link_count != 0);
 		for (i = 0; i <= inode->num_ads; i++) {
 			lte = inode_stream_lte(inode, i, lookup_table);
 			if (lte)
@@ -861,9 +975,8 @@ static int do_free_dentry(struct dentry *dentry, void *__lookup_table)
  */
 void free_dentry_tree(struct dentry *root, struct lookup_table *lookup_table)
 {
-	if (!root || !root->parent)
-		return;
-	for_dentry_in_tree_depth(root, do_free_dentry, lookup_table);
+	if (root)
+		for_dentry_in_tree_depth(root, do_free_dentry, lookup_table);
 }
 
 int increment_dentry_refcnt(struct dentry *dentry, void *ignore)
@@ -921,141 +1034,6 @@ void unlink_dentry(struct dentry *dentry)
 }
 #endif
 
-static inline struct dentry *inode_first_dentry(struct inode *inode)
-{
-	wimlib_assert(inode->dentry_list.next != &inode->dentry_list);
-	return container_of(inode->dentry_list.next, struct dentry,
-		 	    inode_dentry_list);
-}
-
-static int verify_inode(struct inode *inode, const WIMStruct *w)
-{
-	const struct lookup_table *table = w->lookup_table;
-	const struct wim_security_data *sd = wim_const_security_data(w);
-	const struct dentry *first_dentry = inode_first_dentry(inode);
-	int ret = WIMLIB_ERR_INVALID_DENTRY;
-
-	/* Check the security ID */
-	if (inode->security_id < -1) {
-		ERROR("Dentry `%s' has an invalid security ID (%d)",
-			first_dentry->full_path_utf8, inode->security_id);
-		goto out;
-	}
-	if (inode->security_id >= sd->num_entries) {
-		ERROR("Dentry `%s' has an invalid security ID (%d) "
-		      "(there are only %u entries in the security table)",
-			first_dentry->full_path_utf8, inode->security_id,
-			sd->num_entries);
-		goto out;
-	}
-
-	/* Check that lookup table entries for all the resources exist, except
-	 * if the SHA1 message digest is all 0's, which indicates there is
-	 * intentionally no resource there.  */
-	if (w->hdr.total_parts == 1) {
-		for (unsigned i = 0; i <= inode->num_ads; i++) {
-			struct lookup_table_entry *lte;
-			const u8 *hash;
-			hash = inode_stream_hash_unresolved(inode, i);
-			lte = __lookup_resource(table, hash);
-			if (!lte && !is_zero_hash(hash)) {
-				ERROR("Could not find lookup table entry for stream "
-				      "%u of dentry `%s'", i, first_dentry->full_path_utf8);
-				goto out;
-			}
-			if (lte && (lte->real_refcnt += inode->link_count) > lte->refcnt)
-			{
-			#ifdef ENABLE_ERROR_MESSAGES
-				WARNING("The following lookup table entry "
-					"has a reference count of %u, but",
-					lte->refcnt);
-				WARNING("We found %u references to it",
-					lte->real_refcnt);
-				WARNING("(One dentry referencing it is at `%s')",
-					 first_dentry->full_path_utf8);
-
-				print_lookup_table_entry(lte);
-			#endif
-				/* Guess what!  install.wim for Windows 8
-				 * contains a stream with 2 dentries referencing
-				 * it, but the lookup table entry has reference
-				 * count of 1.  So we will need to handle this
-				 * case and not just make it be an error...  I'm
-				 * just setting the reference count to the
-				 * number of references we found.
-				 * (Unfortunately, even after doing this, the
-				 * reference count could be too low if it's also
-				 * referenced in other WIM images) */
-
-			#if 1
-				lte->refcnt = lte->real_refcnt;
-				WARNING("Fixing reference count");
-			#else
-				goto out;
-			#endif
-			}
-		}
-	}
-
-	/* Make sure there is only one un-named stream. */
-	unsigned num_unnamed_streams = 0;
-	for (unsigned i = 0; i <= inode->num_ads; i++) {
-		const u8 *hash;
-		hash = inode_stream_hash_unresolved(inode, i);
-		if (!inode_stream_name_len(inode, i) && !is_zero_hash(hash))
-			num_unnamed_streams++;
-	}
-	if (num_unnamed_streams > 1) {
-		ERROR("Dentry `%s' has multiple (%u) un-named streams",
-		      first_dentry->full_path_utf8, num_unnamed_streams);
-		goto out;
-	}
-	inode->verified = true;
-	ret = 0;
-out:
-	return ret;
-}
-
-/* Run some miscellaneous verifications on a WIM dentry */
-int verify_dentry(struct dentry *dentry, void *wim)
-{
-	int ret;
-
-	if (!dentry->d_inode->verified) {
-		ret = verify_inode(dentry->d_inode, wim);
-		if (ret != 0)
-			return ret;
-	}
-
-	/* Cannot have a short name but no long name */
-	if (dentry->short_name_len && !dentry->file_name_len) {
-		ERROR("Dentry `%s' has a short name but no long name",
-		      dentry->full_path_utf8);
-		return WIMLIB_ERR_INVALID_DENTRY;
-	}
-
-	/* Make sure root dentry is unnamed */
-	if (dentry_is_root(dentry)) {
-		if (dentry->file_name_len) {
-			ERROR("The root dentry is named `%s', but it must "
-			      "be unnamed", dentry->file_name_utf8);
-			return WIMLIB_ERR_INVALID_DENTRY;
-		}
-	}
-
-#if 0
-	/* Check timestamps */
-	if (inode->last_access_time < inode->creation_time ||
-	    inode->last_write_time < inode->creation_time) {
-		WARNING("Dentry `%s' was created after it was last accessed or "
-		      "written to", dentry->full_path_utf8);
-	}
-#endif
-
-	return 0;
-}
-
-
 #ifdef WITH_FUSE
 /* Returns the alternate data stream entry belonging to @inode that has the
  * stream name @stream_name. */
@@ -1278,15 +1256,14 @@ static int read_ads_entries(const u8 *p, struct inode *inode,
 			}
 			get_bytes(p, cur_entry->stream_name_len,
 				  (u8*)cur_entry->stream_name);
-			cur_entry->stream_name_utf8 = utf16_to_utf8(cur_entry->stream_name,
-								    cur_entry->stream_name_len,
-								    &utf8_len);
-			cur_entry->stream_name_utf8_len = utf8_len;
 
-			if (!cur_entry->stream_name_utf8) {
-				ret = WIMLIB_ERR_NOMEM;
+			ret = utf16_to_utf8(cur_entry->stream_name,
+					    cur_entry->stream_name_len,
+					    &cur_entry->stream_name_utf8,
+					    &utf8_len);
+			if (ret != 0)
 				goto out_free_ads_entries;
-			}
+			cur_entry->stream_name_utf8_len = utf8_len;
 		}
 		/* It's expected that the size of every ADS entry is a multiple
 		 * of 8.  However, to be safe, I'm allowing the possibility of
@@ -1323,11 +1300,11 @@ out_free_ads_entries:
  * @offset:	Offset of this directory entry in the metadata resource.
  * @dentry:	A `struct dentry' that will be filled in by this function.
  *
- * Return 0 on success or nonzero on failure.  On failure, @dentry have been
- * modified, bu it will be left with no pointers to any allocated buffers.
- * On success, the dentry->length field must be examined.  If zero, this was a
- * special "end of directory" dentry and not a real dentry.  If nonzero, this
- * was a real dentry.
+ * Return 0 on success or nonzero on failure.  On failure, @dentry will have
+ * been modified, but it will not be left with pointers to any allocated
+ * buffers.  On success, the dentry->length field must be examined.  If zero,
+ * this was a special "end of directory" dentry and not a real dentry.  If
+ * nonzero, this was a real dentry.
  */
 int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 		u64 offset, struct dentry *dentry)
@@ -1461,15 +1438,10 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 		p = get_bytes(p, file_name_len, file_name);
 
 		/* Convert filename to UTF-8. */
-		file_name_utf8 = utf16_to_utf8(file_name, file_name_len,
-					       &file_name_utf8_len);
-
-		if (!file_name_utf8) {
-			ERROR("Failed to allocate memory to convert UTF-16 "
-			      "filename (%hu bytes) to UTF-8", file_name_len);
-			ret = WIMLIB_ERR_NOMEM;
+		ret = utf16_to_utf8(file_name, file_name_len, &file_name_utf8,
+				    &file_name_utf8_len);
+		if (ret != 0)
 			goto out_free_file_name;
-		}
 		if (*(u16*)p)
 			WARNING("Expected two zero bytes following the file name "
 				"`%s', but found non-zero bytes", file_name_utf8);
@@ -1607,8 +1579,6 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
 		     struct dentry *dentry)
 {
 	u64 cur_offset = dentry->subdir_offset;
-	struct dentry *prev_child = NULL;
-	struct dentry *first_child = NULL;
 	struct dentry *child;
 	struct dentry cur_child;
 	int ret;
@@ -1645,9 +1615,7 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
 			break;
 		}
 		memcpy(child, &cur_child, sizeof(struct dentry));
-
 		dentry_add_child(dentry, child);
-
 		inode_add_dentry(child, child->d_inode);
 
 		/* If there are children of this child, call this procedure
@@ -1813,4 +1781,3 @@ u8 *write_dentry_tree(const struct dentry *root, u8 *p)
 	/* Recursively write the rest of the dentry tree. */
 	return write_dentry_tree_recursive(root, p);
 }
-