X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fdentry.c;h=39505b756c81118f5927b70ab2e7728db3cebe38;hb=597e700af87a07ec12f2bd10690954473cf1ca93;hp=7575953f708a004492b28ffe5309d0e13dbd7254;hpb=8191ca50a47773d20e94ffb85bedefe199166484;p=wimlib

diff --git a/src/dentry.c b/src/dentry.c
index 7575953f..39505b75 100644
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -40,6 +40,9 @@
 #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. */
 static u64 __dentry_correct_length_unaligned(u16 file_name_len,
 					     u16 short_name_len)
 {
@@ -51,24 +54,26 @@ static u64 __dentry_correct_length_unaligned(u16 file_name_len,
 	return length;
 }
 
+/* Calculates the unaligned length, in bytes, of an on-disk WIM dentry, based on
+ * the file name length and short name length.  Note that dentry->length is
+ * ignored; also, this excludes any alternate data stream entries that may
+ * follow the dentry. */
 static u64 dentry_correct_length_unaligned(const struct dentry *dentry)
 {
 	return __dentry_correct_length_unaligned(dentry->file_name_len,
 						 dentry->short_name_len);
 }
 
-/* Return the "correct" value to write in the length field of the dentry, based
- * on the file name length and short name length */
+/* Return the "correct" value to write in the length field of a WIM dentry,
+ * based on the file name length and short name length. */
 static u64 dentry_correct_length(const struct dentry *dentry)
 {
 	return (dentry_correct_length_unaligned(dentry) + 7) & ~7;
 }
 
-/*
- * Returns true if @dentry has the UTF-8 file name @name that has length
- * @name_len.
- */
-static bool dentry_has_name(const struct dentry *dentry, const char *name, 
+/* 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)
@@ -76,6 +81,8 @@ static bool dentry_has_name(const struct dentry *dentry, const char *name,
 	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,
 				      const char *name, size_t name_len)
 {
@@ -157,26 +164,28 @@ static u64 ads_entry_total_length(const struct ads_entry *entry)
 
 static u64 __dentry_total_length(const struct dentry *dentry, u64 length)
 {
-	const struct inode *inode = dentry->inode;
+	const struct inode *inode = dentry->d_inode;
 	for (u16 i = 0; i < inode->num_ads; i++)
 		length += ads_entry_total_length(&inode->ads_entries[i]);
 	return (length + 7) & ~7;
 }
 
+/* Calculate the aligned *total* length of an on-disk WIM dentry.  This includes
+ * all alternate data streams. */
 u64 dentry_correct_total_length(const struct dentry *dentry)
 {
 	return __dentry_total_length(dentry,
 				     dentry_correct_length_unaligned(dentry));
 }
 
-/* Real length of a dentry, including the alternate data stream entries, which
- * are not included in the dentry->length field... */
+/* Like dentry_correct_total_length(), but use the existing dentry->length field
+ * instead of calculating its "correct" value. */
 static u64 dentry_total_length(const struct dentry *dentry)
 {
 	return __dentry_total_length(dentry, dentry->length);
 }
 
-/* Transfers file attributes from a `stat' buffer to an inode. */
+/* 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)) {
@@ -191,7 +200,7 @@ void stbuf_to_inode(const struct stat *stbuf, struct inode *inode)
 		inode->ino = (u64)stbuf->st_ino;
 	else
 		inode->ino = (u64)stbuf->st_ino |
-				   ((u64)stbuf->st_dev << (sizeof(ino_t) * 8));
+				   ((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);
@@ -199,7 +208,7 @@ void stbuf_to_inode(const struct stat *stbuf, struct inode *inode)
 }
 
 #ifdef WITH_FUSE
-/* Transfers file attributes from a struct inode to a `stat' buffer. 
+/* 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
@@ -244,11 +253,11 @@ int inode_to_stbuf(const struct inode *inode, struct lookup_table_entry *lte,
 }
 #endif
 
-/* 
+/*
  * Calls a function on all directory entries in a directory tree.  It is called
  * on a parent before its children.
  */
-int for_dentry_in_tree(struct dentry *root, 
+int for_dentry_in_tree(struct dentry *root,
 		       int (*visitor)(struct dentry*, void*), void *arg)
 {
 	int ret;
@@ -259,7 +268,7 @@ int for_dentry_in_tree(struct dentry *root,
 	if (ret != 0)
 		return ret;
 
-	child = root->inode->children;
+	child = root->d_inode->children;
 
 	if (!child)
 		return 0;
@@ -269,22 +278,22 @@ int for_dentry_in_tree(struct dentry *root,
 		if (ret != 0)
 			return ret;
 		child = child->next;
-	} while (child != root->inode->children);
+	} while (child != root->d_inode->children);
 	return 0;
 }
 
-/* 
+/*
  * Like for_dentry_in_tree(), but the visitor function is always called on a
  * dentry's children before on itself.
  */
-int for_dentry_in_tree_depth(struct dentry *root, 
+int for_dentry_in_tree_depth(struct dentry *root,
 			     int (*visitor)(struct dentry*, void*), void *arg)
 {
 	int ret;
 	struct dentry *child;
 	struct dentry *next;
 
-	child = root->inode->children;
+	child = root->d_inode->children;
 	if (child) {
 		do {
 			next = child->next;
@@ -292,14 +301,14 @@ int for_dentry_in_tree_depth(struct dentry *root,
 			if (ret != 0)
 				return ret;
 			child = next;
-		} while (child != root->inode->children);
+		} while (child != root->d_inode->children);
 	}
 	return visitor(root, arg);
 }
 
-/* 
+/*
  * Calculate the full path of @dentry, based on its parent's full path and on
- * its UTF-8 file name. 
+ * its UTF-8 file name.
  */
 int calculate_dentry_full_path(struct dentry *dentry, void *ignore)
 {
@@ -347,18 +356,19 @@ oom:
 	return WIMLIB_ERR_NOMEM;
 }
 
-/* 
- * Recursively calculates the subdir offsets for a directory tree. 
+/*
+ * Recursively calculates the subdir offsets for a directory tree.
  *
  * @dentry:  The root of the directory tree.
  * @subdir_offset_p:  The current subdirectory offset; i.e., the subdirectory
- * 	offset for @dentry. 
+ *		      offset for @dentry.
  */
 void calculate_subdir_offsets(struct dentry *dentry, u64 *subdir_offset_p)
 {
-	struct dentry *child;
+	struct dentry *child, *children;
 
-	child = dentry->inode->children;
+	children = dentry->d_inode->children;
+	child = children;
 	dentry->subdir_offset = *subdir_offset_p;
 
 	if (child) {
@@ -367,7 +377,7 @@ void calculate_subdir_offsets(struct dentry *dentry, u64 *subdir_offset_p)
 		do {
 			*subdir_offset_p += dentry_correct_total_length(child);
 			child = child->next;
-		} while (child != dentry->inode->children);
+		} while (child != children);
 
 		/* End-of-directory dentry on disk. */
 		*subdir_offset_p += 8;
@@ -377,7 +387,7 @@ void calculate_subdir_offsets(struct dentry *dentry, u64 *subdir_offset_p)
 		do {
 			calculate_subdir_offsets(child, subdir_offset_p);
 			child = child->next;
-		} while (child != dentry->inode->children);
+		} while (child != children);
 	} else {
 		/* On disk, childless directories have a valid subdir_offset
 		 * that points to an 8-byte end-of-directory dentry.  Regular
@@ -389,22 +399,22 @@ void calculate_subdir_offsets(struct dentry *dentry, u64 *subdir_offset_p)
 	}
 }
 
-/* Returns the child of @dentry that has the file name @name.  
+/* Returns the child of @dentry that has the file name @name.
  * Returns NULL if no child has the name. */
-struct dentry *get_dentry_child_with_name(const struct dentry *dentry, 
+struct dentry *get_dentry_child_with_name(const struct dentry *dentry,
 					  const char *name)
 {
 	struct dentry *child;
 	size_t name_len;
-	
-	child = dentry->inode->children;
+
+	child = dentry->d_inode->children;
 	if (child) {
 		name_len = strlen(name);
 		do {
 			if (dentry_has_name(child, name, name_len))
 				return child;
 			child = child->next;
-		} while (child != dentry->inode->children);
+		} while (child != dentry->d_inode->children);
 	}
 	return NULL;
 }
@@ -421,14 +431,14 @@ static struct dentry *get_dentry_relative_path(struct dentry *cur_dir,
 	if (*path == '\0')
 		return cur_dir;
 
-	child = cur_dir->inode->children;
+	child = cur_dir->d_inode->children;
 	if (child) {
 		new_path = path_next_part(path, &base_len);
 		do {
 			if (dentry_has_name(child, path, base_len))
 				return get_dentry_relative_path(child, new_path);
 			child = child->next;
-		} while (child != cur_dir->inode->children);
+		} while (child != cur_dir->d_inode->children);
 	}
 	return NULL;
 }
@@ -447,10 +457,10 @@ struct inode *wim_pathname_to_inode(WIMStruct *w, const char *path)
 {
 	struct dentry *dentry;
 	dentry = get_dentry(w, path);
-	if (!dentry)
-		return NULL;
+	if (dentry)
+		return dentry->d_inode;
 	else
-		return dentry->inode;
+		return NULL;
 }
 
 /* Returns the dentry that corresponds to the parent directory of @path, or NULL
@@ -506,7 +516,7 @@ int print_dentry(struct dentry *dentry, void *lookup_table)
 {
 	const u8 *hash;
 	struct lookup_table_entry *lte;
-	const struct inode *inode = dentry->inode;
+	const struct inode *inode = dentry->d_inode;
 	time_t time;
 	char *p;
 
@@ -551,13 +561,13 @@ int print_dentry(struct dentry *dentry, void *lookup_table)
 	puts("\"");
 	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->inode, 0, lookup_table);
+	lte = inode_stream_lte(dentry->d_inode, 0, lookup_table);
 	if (lte) {
 		print_lookup_table_entry(lte);
 	} else {
 		hash = inode_stream_hash(inode, 0);
 		if (hash) {
-			printf("Hash              = 0x"); 
+			printf("Hash              = 0x");
 			print_hash(hash);
 			putchar('\n');
 			putchar('\n');
@@ -570,7 +580,7 @@ int print_dentry(struct dentry *dentry, void *lookup_table)
 			inode->ads_entries[i].stream_name_len);
 		hash = inode_stream_hash(inode, i + 1);
 		if (hash) {
-			printf("Hash              = 0x"); 
+			printf("Hash              = 0x");
 			print_hash(hash);
 			putchar('\n');
 		}
@@ -590,27 +600,30 @@ static void dentry_common_init(struct dentry *dentry)
 static struct inode *new_timeless_inode()
 {
 	struct inode *inode = CALLOC(1, sizeof(struct inode));
-	if (!inode)
-		return NULL;
-	inode->security_id = -1;
-	inode->link_count = 1;
-	INIT_LIST_HEAD(&inode->dentry_list);
+	if (inode) {
+		inode->security_id = -1;
+		inode->link_count = 1;
+	#ifdef WITH_FUSE
+		inode->next_stream_id = 1;
+	#endif
+		INIT_LIST_HEAD(&inode->dentry_list);
+	}
 	return inode;
 }
 
 static struct inode *new_inode()
 {
 	struct inode *inode = new_timeless_inode();
-	if (!inode)
-		return NULL;
-	u64 now = get_wim_timestamp();
-	inode->creation_time = now;
-	inode->last_access_time = now;
-	inode->last_write_time = now;
+	if (inode) {
+		u64 now = get_wim_timestamp();
+		inode->creation_time = now;
+		inode->last_access_time = now;
+		inode->last_write_time = now;
+	}
 	return inode;
 }
 
-/* 
+/*
  * Creates an unlinked directory entry.
  *
  * @name:  The UTF-8 filename of the new dentry.
@@ -620,7 +633,7 @@ static struct inode *new_inode()
 struct dentry *new_dentry(const char *name)
 {
 	struct dentry *dentry;
-	
+
 	dentry = MALLOC(sizeof(struct dentry));
 	if (!dentry)
 		goto err;
@@ -647,11 +660,11 @@ static struct dentry *__new_dentry_with_inode(const char *name, bool timeless)
 	dentry = new_dentry(name);
 	if (dentry) {
 		if (timeless)
-			dentry->inode = new_timeless_inode();
+			dentry->d_inode = new_timeless_inode();
 		else
-			dentry->inode = new_inode();
-		if (dentry->inode) {
-			inode_add_dentry(dentry, dentry->inode);
+			dentry->d_inode = new_inode();
+		if (dentry->d_inode) {
+			inode_add_dentry(dentry, dentry->d_inode);
 		} else {
 			free_dentry(dentry);
 			dentry = NULL;
@@ -671,15 +684,36 @@ struct dentry *new_dentry_with_inode(const char *name)
 }
 
 
+static int init_ads_entry(struct ads_entry *ads_entry, const char *name)
+{
+	int ret = 0;
+	memset(ads_entry, 0, sizeof(*ads_entry));
+	if (name && *name)
+		ret = change_ads_name(ads_entry, name);
+	return ret;
+}
+
+static void destroy_ads_entry(struct ads_entry *ads_entry)
+{
+	FREE(ads_entry->stream_name);
+	FREE(ads_entry->stream_name_utf8);
+}
+
+
 /* Frees an inode. */
 void free_inode(struct inode *inode)
 {
 	if (inode) {
-		inode_free_ads_entries(inode);
+		if (inode->ads_entries) {
+			for (u16 i = 0; i < inode->num_ads; i++)
+				destroy_ads_entry(&inode->ads_entries[i]);
+			FREE(inode->ads_entries);
+		}
 	#ifdef WITH_FUSE
 		wimlib_assert(inode->num_opened_fds == 0);
 		FREE(inode->fds);
 	#endif
+		FREE(inode->extracted_file);
 		FREE(inode);
 	}
 }
@@ -696,12 +730,11 @@ static void put_inode(struct inode *inode)
 	#endif
 		{
 			free_inode(inode);
-			inode = NULL;
 		}
 	}
 }
 
-/* Frees a WIM dentry. 
+/* Frees a WIM dentry.
  *
  * The inode is freed only if its link count is decremented to 0.
  */
@@ -714,7 +747,8 @@ void free_dentry(struct dentry *dentry)
 	FREE(dentry->file_name_utf8);
 	FREE(dentry->short_name);
 	FREE(dentry->full_path_utf8);
-	put_inode(dentry->inode);
+	if (dentry->d_inode)
+		put_inode(dentry->d_inode);
 	FREE(dentry);
 }
 
@@ -727,32 +761,31 @@ void put_dentry(struct dentry *dentry)
 		free_dentry(dentry);
 }
 
-/* 
+/*
  * This function is passed as an argument to for_dentry_in_tree_depth() in order
  * to free a directory tree.  __args is a pointer to a `struct free_dentry_args'.
  */
 static int do_free_dentry(struct dentry *dentry, void *__lookup_table)
 {
 	struct lookup_table *lookup_table = __lookup_table;
-	struct lookup_table_entry *lte;
-	struct inode *inode = dentry->inode;
 	unsigned i;
 
 	if (lookup_table) {
+		struct lookup_table_entry *lte;
+		struct inode *inode = dentry->d_inode;
 		wimlib_assert(inode->link_count);
 		for (i = 0; i <= inode->num_ads; i++) {
 			lte = inode_stream_lte(inode, i, lookup_table);
-			lte_decrement_refcnt(lte, lookup_table);
+			if (lte)
+				lte_decrement_refcnt(lte, lookup_table);
 		}
 	}
 
-	wimlib_assert(dentry->refcnt != 0);
-	if (--dentry->refcnt == 0)
-		free_dentry(dentry);
+	put_dentry(dentry);
 	return 0;
 }
 
-/* 
+/*
  * Unlinks and frees a dentry tree.
  *
  * @root: 		The root of the tree.
@@ -774,7 +807,7 @@ int increment_dentry_refcnt(struct dentry *dentry, void *ignore)
 	return 0;
 }
 
-/* 
+/*
  * Links a dentry into the directory tree.
  *
  * @dentry: The dentry to link.
@@ -784,23 +817,24 @@ void link_dentry(struct dentry *dentry, struct dentry *parent)
 {
 	wimlib_assert(dentry_is_directory(parent));
 	dentry->parent = parent;
-	if (parent->inode->children) {
+	if (parent->d_inode->children) {
 		/* Not an only child; link to siblings. */
-		dentry->next = parent->inode->children;
-		dentry->prev = parent->inode->children->prev;
+		dentry->next = parent->d_inode->children;
+		dentry->prev = parent->d_inode->children->prev;
 		dentry->next->prev = dentry;
 		dentry->prev->next = dentry;
 	} else {
 		/* Only child; link to parent. */
-		parent->inode->children = dentry;
+		parent->d_inode->children = dentry;
 		dentry->next = dentry;
 		dentry->prev = dentry;
 	}
 }
 
 
-/* 
- * Unlink a dentry from the directory tree. 
+#ifdef WITH_FUSE
+/*
+ * Unlink a dentry from the directory tree.
  *
  * Note: This merely removes it from the in-memory tree structure.
  */
@@ -809,67 +843,15 @@ void unlink_dentry(struct dentry *dentry)
 	if (dentry_is_root(dentry))
 		return;
 	if (dentry_is_only_child(dentry)) {
-		dentry->parent->inode->children = NULL;
+		dentry->parent->d_inode->children = NULL;
 	} else {
 		if (dentry_is_first_sibling(dentry))
-			dentry->parent->inode->children = dentry->next;
+			dentry->parent->d_inode->children = dentry->next;
 		dentry->next->prev = dentry->prev;
 		dentry->prev->next = dentry->next;
 	}
 }
-
-
-/* Parameters for calculate_dentry_statistics(). */
-struct image_statistics {
-	struct lookup_table *lookup_table;
-	u64 *dir_count;
-	u64 *file_count;
-	u64 *total_bytes;
-	u64 *hard_link_bytes;
-};
-
-static int calculate_dentry_statistics(struct dentry *dentry, void *arg)
-{
-	struct image_statistics *stats;
-	struct lookup_table_entry *lte; 
-	
-	stats = arg;
-
-	if (dentry_is_directory(dentry) && !dentry_is_root(dentry))
-		++*stats->dir_count;
-	else
-		++*stats->file_count;
-
-	for (unsigned i = 0; i <= dentry->inode->num_ads; i++) {
-		lte = inode_stream_lte(dentry->inode, i, stats->lookup_table);
-		if (lte) {
-			*stats->total_bytes += wim_resource_size(lte);
-			if (++lte->out_refcnt == 1)
-				*stats->hard_link_bytes += wim_resource_size(lte);
-		}
-	}
-	return 0;
-}
-
-/* Calculates some statistics about a dentry tree. */
-void calculate_dir_tree_statistics(struct dentry *root, struct lookup_table *table, 
-				   u64 *dir_count_ret, u64 *file_count_ret, 
-				   u64 *total_bytes_ret, 
-				   u64 *hard_link_bytes_ret)
-{
-	struct image_statistics stats;
-	*dir_count_ret         = 0;
-	*file_count_ret        = 0;
-	*total_bytes_ret       = 0;
-	*hard_link_bytes_ret   = 0;
-	stats.lookup_table     = table;
-	stats.dir_count       = dir_count_ret;
-	stats.file_count      = file_count_ret;
-	stats.total_bytes     = total_bytes_ret;
-	stats.hard_link_bytes = hard_link_bytes_ret;
-	for_lookup_table_entry(table, lte_zero_out_refcnt, NULL);
-	for_dentry_in_tree(root, calculate_dentry_statistics, &stats);
-}
+#endif
 
 static inline struct dentry *inode_first_dentry(struct inode *inode)
 {
@@ -956,7 +938,7 @@ static int verify_inode(struct inode *inode, const WIMStruct *w)
 			num_unnamed_streams++;
 	}
 	if (num_unnamed_streams > 1) {
-		ERROR("Dentry `%s' has multiple (%u) un-named streams", 
+		ERROR("Dentry `%s' has multiple (%u) un-named streams",
 		      first_dentry->full_path_utf8, num_unnamed_streams);
 		goto out;
 	}
@@ -970,20 +952,20 @@ out:
 int verify_dentry(struct dentry *dentry, void *wim)
 {
 	const WIMStruct *w = wim;
-	const struct inode *inode = dentry->inode;
-	int ret = WIMLIB_ERR_INVALID_DENTRY;
+	const struct inode *inode = dentry->d_inode;
+	int ret;
 
-	if (!dentry->inode->verified) {
-		ret = verify_inode(dentry->inode, w);
+	if (!dentry->d_inode->verified) {
+		ret = verify_inode(dentry->d_inode, w);
 		if (ret != 0)
-			goto out;
+			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);
-		goto out;
+		return WIMLIB_ERR_INVALID_DENTRY;
 	}
 
 	/* Make sure root dentry is unnamed */
@@ -991,7 +973,7 @@ int verify_dentry(struct dentry *dentry, void *wim)
 		if (dentry->file_name_len) {
 			ERROR("The root dentry is named `%s', but it must "
 			      "be unnamed", dentry->file_name_utf8);
-			goto out;
+			return WIMLIB_ERR_INVALID_DENTRY;
 		}
 	}
 
@@ -1004,9 +986,7 @@ int verify_dentry(struct dentry *dentry, void *wim)
 	}
 #endif
 
-	ret = 0;
-out:
-	return ret;
+	return 0;
 }
 
 
@@ -1037,34 +1017,8 @@ struct ads_entry *inode_get_ads_entry(struct inode *inode,
 }
 #endif
 
-
-static int init_ads_entry(struct ads_entry *ads_entry, const char *name)
-{
-	int ret = 0;
-	memset(ads_entry, 0, sizeof(*ads_entry));
-	if (name && *name)
-		ret = change_ads_name(ads_entry, name);
-	return ret;
-}
-
-static void destroy_ads_entry(struct ads_entry *ads_entry)
-{
-	FREE(ads_entry->stream_name);
-	FREE(ads_entry->stream_name_utf8);
-}
-
-
-void inode_free_ads_entries(struct inode *inode)
-{
-	if (inode->ads_entries) {
-		for (u16 i = 0; i < inode->num_ads; i++)
-			destroy_ads_entry(&inode->ads_entries[i]);
-		FREE(inode->ads_entries);
-	}
-}
-
 #if defined(WITH_FUSE) || defined(WITH_NTFS_3G)
-/* 
+/*
  * Add an alternate stream entry to an inode and return a pointer to it, or NULL
  * if memory could not be allocated.
  */
@@ -1074,6 +1028,8 @@ struct ads_entry *inode_add_ads(struct inode *inode, const char *stream_name)
 	struct ads_entry *ads_entries;
 	struct ads_entry *new_entry;
 
+	DEBUG("Add alternate data stream \"%s\"", stream_name);
+
 	if (inode->num_ads >= 0xfffe) {
 		ERROR("Too many alternate data streams in one inode!");
 		return NULL;
@@ -1093,6 +1049,7 @@ struct ads_entry *inode_add_ads(struct inode *inode, const char *stream_name)
 #ifdef WITH_FUSE
 	new_entry->stream_id = inode->next_stream_id++;
 #endif
+	inode->num_ads = num_ads;
 	return new_entry;
 }
 #endif
@@ -1105,19 +1062,19 @@ void inode_remove_ads(struct inode *inode, u16 idx,
 	struct ads_entry *ads_entry;
 	struct lookup_table_entry *lte;
 
+	wimlib_assert(idx < inode->num_ads);
+	wimlib_assert(inode->resolved);
+
 	ads_entry = &inode->ads_entries[idx];
 
-	wimlib_assert(ads_entry);
-	wimlib_assert(inode->resolved);
+	DEBUG("Remove alternate data stream \"%s\"", ads_entry->stream_name_utf8);
 
 	lte = ads_entry->lte;
-
 	if (lte)
 		lte_decrement_refcnt(lte, lookup_table);
 
 	destroy_ads_entry(ads_entry);
 
-	wimlib_assert(inode->num_ads);
 	memcpy(&inode->ads_entries[idx],
 	       &inode->ads_entries[idx + 1],
 	       (inode->num_ads - idx - 1) * sizeof(inode->ads_entries[0]));
@@ -1127,7 +1084,7 @@ void inode_remove_ads(struct inode *inode, u16 idx,
 
 
 
-/* 
+/*
  * Reads the alternate data stream entries for a dentry.
  *
  * @p:	Pointer to buffer that starts with the first alternate stream entry.
@@ -1143,7 +1100,7 @@ void inode_remove_ads(struct inode *inode, u16 idx,
  *
  * struct ads_entry_on_disk {
  * 	u64  length;          // Length of the entry, in bytes.  This includes
- *				    all fields (including the stream name and 
+ *				    all fields (including the stream name and
  *				    null terminator if present, AND the padding!).
  * 	u64  reserved;        // Seems to be unused
  * 	u8   hash[20];        // SHA1 message digest of the uncompressed stream
@@ -1291,7 +1248,7 @@ out_free_ads_entries:
 	return ret;
 }
 
-/* 
+/*
  * Reads a directory entry, including all alternate data stream entries that
  * follow it, from the WIM image's metadata resource.
  *
@@ -1306,7 +1263,7 @@ out_free_ads_entries:
  * 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, 
+int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 		u64 offset, struct dentry *dentry)
 {
 	const u8 *p;
@@ -1381,7 +1338,7 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 	p = get_u64(p, &inode->last_write_time);
 
 	p = get_bytes(p, SHA1_HASH_SIZE, inode->hash);
-	
+
 	/*
 	 * I don't know what's going on here.  It seems like M$ screwed up the
 	 * reparse points, then put the fields in the same place and didn't
@@ -1400,14 +1357,14 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 
 	/* By the way, the reparse_reserved field does not actually exist (at
 	 * least when the file is not a reparse point) */
-	
+
 	p = get_u16(p, &inode->num_ads);
 
 	p = get_u16(p, &short_name_len);
 	p = get_u16(p, &file_name_len);
 
 	/* We now know the length of the file name and short name.  Make sure
-	 * the length of the dentry is large enough to actually hold them. 
+	 * the length of the dentry is large enough to actually hold them.
 	 *
 	 * The calculated length here is unaligned to allow for the possibility
 	 * that the dentry->length names an unaligned length, although this
@@ -1418,7 +1375,7 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 	if (dentry->length < calculated_size) {
 		ERROR("Unexpected end of directory entry! (Expected "
 		      "at least %"PRIu64" bytes, got %"PRIu64" bytes. "
-		      "short_name_len = %hu, file_name_len = %hu)", 
+		      "short_name_len = %hu, file_name_len = %hu)",
 		      calculated_size, dentry->length,
 		      short_name_len, file_name_len);
 		return WIMLIB_ERR_INVALID_DENTRY;
@@ -1436,7 +1393,7 @@ 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 = utf16_to_utf8(file_name, file_name_len,
 					       &file_name_utf8_len);
 
 		if (!file_name_utf8) {
@@ -1496,12 +1453,12 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 
 		p = get_bytes(p, short_name_len, short_name);
 		if (*(u16*)p)
-			WARNING("Expected two zero bytes following the file name "
+			WARNING("Expected two zero bytes following the short name of "
 				"`%s', but found non-zero bytes", file_name_utf8);
 		p += 2;
 	}
 
-	/* 
+	/*
 	 * Read the alternate data streams, if present.  dentry->num_ads tells
 	 * us how many they are, and they will directly follow the dentry
 	 * on-disk.
@@ -1511,22 +1468,39 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 	 * included in the dentry->length field for some reason.
 	 */
 	if (inode->num_ads != 0) {
-		if (calculated_size > metadata_resource_len - offset) {
-			ERROR("Not enough space in metadata resource for "
-			      "alternate stream entries");
-			ret = WIMLIB_ERR_INVALID_DENTRY;
-			goto out_free_short_name;
+
+		/* Trying different lengths is just a hack to make sure we have
+		 * a chance of reading the ADS entries correctly despite the
+		 * poor documentation. */
+
+		if (calculated_size != dentry->length) {
+			WARNING("Trying calculated dentry length (%"PRIu64") "
+				"instead of dentry->length field (%"PRIu64") "
+				"to read ADS entries",
+				calculated_size, dentry->length);
 		}
-		ret = read_ads_entries(&metadata_resource[offset + calculated_size],
-				       inode,
-				       metadata_resource_len - offset - calculated_size);
-		if (ret != 0)
-			goto out_free_short_name;
+		u64 lengths_to_try[3] = {calculated_size,
+					 dentry->length + 7 & ~7,
+					 dentry->length};
+		ret = WIMLIB_ERR_INVALID_DENTRY;
+		for (size_t i = 0; i < ARRAY_LEN(lengths_to_try); i++) {
+			if (lengths_to_try[i] > metadata_resource_len - offset)
+				continue;
+			ret = read_ads_entries(&metadata_resource[offset + lengths_to_try[i]],
+					       inode,
+					       metadata_resource_len - offset - lengths_to_try[i]);
+			if (ret == 0)
+				goto out;
+		}
+		ERROR("Failed to read alternate data stream "
+		      "entries of `%s'", dentry->file_name_utf8);
+		goto out_free_short_name;
 	}
+out:
 
 	/* We've read all the data for this dentry.  Set the names and their
 	 * lengths, and we've done. */
-	dentry->inode              = inode;
+	dentry->d_inode              = inode;
 	dentry->file_name          = file_name;
 	dentry->file_name_utf8     = file_name_utf8;
 	dentry->short_name         = short_name;
@@ -1571,7 +1545,7 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
 	struct dentry cur_child;
 	int ret;
 
-	/* 
+	/*
 	 * If @dentry has no child dentries, nothing more needs to be done for
 	 * this branch.  This is the case for regular files, symbolic links, and
 	 * *possibly* empty directories (although an empty directory may also
@@ -1584,7 +1558,7 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
 	while (1) {
 
 		/* Read next child of @dentry into @cur_child. */
-		ret = read_dentry(metadata_resource, metadata_resource_len, 
+		ret = read_dentry(metadata_resource, metadata_resource_len,
 				  cur_offset, &cur_child);
 		if (ret != 0)
 			break;
@@ -1613,12 +1587,12 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
 
 		child->parent = dentry;
 		prev_child = child;
-		inode_add_dentry(child, child->inode);
+		inode_add_dentry(child, child->d_inode);
 
 		/* If there are children of this child, call this procedure
 		 * recursively. */
 		if (child->subdir_offset != 0) {
-			ret = read_dentry_tree(metadata_resource, 
+			ret = read_dentry_tree(metadata_resource,
 					       metadata_resource_len, child);
 			if (ret != 0)
 				break;
@@ -1638,11 +1612,11 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
 		prev_child->next = first_child;
 		first_child->prev = prev_child;
 	}
-	dentry->inode->children = first_child;
+	dentry->d_inode->children = first_child;
 	return ret;
 }
 
-/* 
+/*
  * Writes a WIM dentry to an output buffer.
  *
  * @dentry:  The dentry structure.
@@ -1654,7 +1628,7 @@ static u8 *write_dentry(const struct dentry *dentry, u8 *p)
 {
 	u8 *orig_p = p;
 	const u8 *hash;
-	const struct inode *inode = dentry->inode;
+	const struct inode *inode = dentry->d_inode;
 
 	/* We calculate the correct length of the dentry ourselves because the
 	 * dentry->length field may been set to an unexpected value from when we
@@ -1699,8 +1673,7 @@ static u8 *write_dentry(const struct dentry *dentry, u8 *p)
 	}
 
 	/* Align to 8-byte boundary */
-	wimlib_assert(length >= (p - orig_p)
-			&& length - (p - orig_p) <= 7);
+	wimlib_assert(length >= (p - orig_p) && length - (p - orig_p) <= 7);
 	p = put_zeroes(p, length - (p - orig_p));
 
 	/* Write the alternate data streams, if there are any.  Please see
@@ -1719,9 +1692,7 @@ static u8 *write_dentry(const struct dentry *dentry, u8 *p)
 		}
 		p = put_zeroes(p, (8 - (p - orig_p) % 8) % 8);
 	}
-#ifdef ENABLE_ASSERTIONS
 	wimlib_assert(p - orig_p == __dentry_total_length(dentry, length));
-#endif
 	return p;
 }
 
@@ -1729,24 +1700,25 @@ static u8 *write_dentry(const struct dentry *dentry, u8 *p)
  * @parent itself, which has already been written. */
 static u8 *write_dentry_tree_recursive(const struct dentry *parent, u8 *p)
 {
-	const struct dentry *child;
+	const struct dentry *child, *children;
 
 	/* Nothing to do if this dentry has no children. */
 	if (parent->subdir_offset == 0)
 		return p;
 
-	/* Write child dentries and end-of-directory entry. 
+	/* Write child dentries and end-of-directory entry.
 	 *
 	 * Note: we need to write all of this dentry's children before
 	 * recursively writing the directory trees rooted at each of the child
 	 * dentries, since the on-disk dentries for a dentry's children are
 	 * always located at consecutive positions in the metadata resource! */
-	child = parent->inode->children;
+	children = parent->d_inode->children;
+	child = children;
 	if (child) {
 		do {
 			p = write_dentry(child, p);
 			child = child->next;
-		} while (child != parent->inode->children);
+		} while (child != children);
 	}
 
 	/* write end of directory entry */
@@ -1757,7 +1729,7 @@ static u8 *write_dentry_tree_recursive(const struct dentry *parent, u8 *p)
 		do {
 			p = write_dentry_tree_recursive(child, p);
 			child = child->next;
-		} while (child != parent->inode->children);
+		} while (child != children);
 	}
 	return p;
 }
@@ -1771,6 +1743,7 @@ static u8 *write_dentry_tree_recursive(const struct dentry *parent, u8 *p)
  */
 u8 *write_dentry_tree(const struct dentry *root, u8 *p)
 {
+	DEBUG("Writing dentry tree.");
 	wimlib_assert(dentry_is_root(root));
 
 	/* If we're the root dentry, we have no parent that already