X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdentry.c;h=e9826b55d1e4f1ae9911e1b5dcdf0d793a1e0489;hp=677db1dbd77fdf48f47b87785316595879738ca7;hb=cf373e59a7f6ff7d1fd007c1f22defe508aa67d4;hpb=650997e4865a090b6856c7ca34b02f42994e8e29

diff --git a/src/dentry.c b/src/dentry.c
index 677db1db..e9826b55 100644
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -276,13 +276,14 @@ for_dentry_in_tree_depth(struct wim_dentry *root,
 /* Calculate the full path of @dentry.  The full path of its parent must have
  * already been calculated, or it must be the root dentry. */
 int
-calculate_dentry_full_path(struct wim_dentry *dentry, void *ignore)
+calculate_dentry_full_path(struct wim_dentry *dentry)
 {
 	tchar *full_path;
 	u32 full_path_nbytes;
+	int ret;
 
-	wimlib_assert(dentry_is_root(dentry) ||
-		      dentry->parent->full_path != NULL);
+	if (dentry->_full_path)
+		return 0;
 
 	if (dentry_is_root(dentry)) {
 		full_path = TSTRDUP(T("/"));
@@ -290,7 +291,7 @@ calculate_dentry_full_path(struct wim_dentry *dentry, void *ignore)
 			return WIMLIB_ERR_NOMEM;
 		full_path_nbytes = 1 * sizeof(tchar);
 	} else {
-		const struct wim_dentry *parent;
+		struct wim_dentry *parent;
 		tchar *parent_full_path;
 		u32 parent_full_path_nbytes;
 		size_t filename_nbytes;
@@ -300,7 +301,12 @@ calculate_dentry_full_path(struct wim_dentry *dentry, void *ignore)
 			parent_full_path = T("");
 			parent_full_path_nbytes = 0;
 		} else {
-			parent_full_path = parent->full_path;
+			if (!parent->_full_path) {
+				ret = calculate_dentry_full_path(parent);
+				if (ret)
+					return ret;
+			}
+			parent_full_path = parent->_full_path;
 			parent_full_path_nbytes = parent->full_path_nbytes;
 		}
 
@@ -336,12 +342,18 @@ calculate_dentry_full_path(struct wim_dentry *dentry, void *ignore)
 					       sizeof(tchar) + 1]);
 	#endif
 	}
-	FREE(dentry->full_path);
-	dentry->full_path = full_path;
+	dentry->_full_path = full_path;
 	dentry->full_path_nbytes= full_path_nbytes;
 	return 0;
 }
 
+tchar *
+dentry_full_path(struct wim_dentry *dentry)
+{
+	calculate_dentry_full_path(dentry);
+	return dentry->_full_path;
+}
+
 static int
 increment_subdir_offset(struct wim_dentry *dentry, void *subdir_offset_p)
 {
@@ -559,10 +571,15 @@ get_parent_dentry(WIMStruct *w, const tchar *path)
 
 /* Prints the full path of a dentry. */
 int
-print_dentry_full_path(struct wim_dentry *dentry, void *ignore)
+print_dentry_full_path(struct wim_dentry *dentry, void *_ignore)
 {
-	if (dentry->full_path)
-		tprintf(T("%"TS"\n"), dentry->full_path);
+	int ret = calculate_dentry_full_path(dentry);
+	if (ret)
+		return ret;
+	tprintf(T("%"TS"\n"), dentry->_full_path);
+	FREE(dentry->_full_path);
+	dentry->_full_path = NULL;
+	dentry->full_path_nbytes = 0;
 	return 0;
 }
 
@@ -628,8 +645,8 @@ print_dentry(struct wim_dentry *dentry, void *lookup_table)
 		wimlib_printf(T("Filename = \"%"WS"\"\n"), dentry->file_name);
 	if (dentry_has_short_name(dentry))
 		wimlib_printf(T("Short Name \"%"WS"\"\n"), dentry->short_name);
-	if (dentry->full_path)
-		tprintf(T("Full Path = \"%"TS"\"\n"), dentry->full_path);
+	if (dentry->_full_path)
+		tprintf(T("Full Path = \"%"TS"\"\n"), dentry->_full_path);
 
 	lte = inode_stream_lte(dentry->d_inode, 0, lookup_table);
 	if (lte) {
@@ -638,7 +655,7 @@ print_dentry(struct wim_dentry *dentry, void *lookup_table)
 		hash = inode_stream_hash(inode, 0);
 		if (hash) {
 			tprintf(T("Hash              = 0x"));
-			print_hash(hash);
+			print_hash(hash, stdout);
 			tputchar(T('\n'));
 			tputchar(T('\n'));
 		}
@@ -652,7 +669,7 @@ print_dentry(struct wim_dentry *dentry, void *lookup_table)
 		hash = inode_stream_hash(inode, i + 1);
 		if (hash) {
 			tprintf(T("Hash              = 0x"));
-			print_hash(hash);
+			print_hash(hash, stdout);
 			tputchar(T('\n'));
 		}
 		print_lookup_table_entry(inode_stream_lte(inode, i + 1, lookup_table),
@@ -666,18 +683,17 @@ static void
 dentry_common_init(struct wim_dentry *dentry)
 {
 	memset(dentry, 0, sizeof(struct wim_dentry));
-	dentry->refcnt = 1;
 }
 
-static struct wim_inode *
+struct wim_inode *
 new_timeless_inode()
 {
 	struct wim_inode *inode = CALLOC(1, sizeof(struct wim_inode));
 	if (inode) {
 		inode->i_security_id = -1;
 		inode->i_nlink = 1;
-	#ifdef WITH_FUSE
 		inode->i_next_stream_id = 1;
+	#ifdef WITH_FUSE
 		if (pthread_mutex_init(&inode->i_mutex, NULL) != 0) {
 			ERROR_WITH_ERRNO("Error initializing mutex");
 			FREE(inode);
@@ -781,7 +797,7 @@ init_ads_entry(struct wim_ads_entry *ads_entry, const void *name,
 		ads_entry->stream_name = p;
 		ads_entry->stream_name_nbytes = name_nbytes;
 	} else {
-		if (name && *(const tchar*)name == T('\0')) {
+		if (name && *(const tchar*)name != T('\0')) {
 			ret = get_utf16le_name(name, &ads_entry->stream_name,
 					       &ads_entry->stream_name_nbytes);
 		}
@@ -796,7 +812,8 @@ destroy_ads_entry(struct wim_ads_entry *ads_entry)
 }
 
 /* Frees an inode. */
-void free_inode(struct wim_inode *inode)
+void
+free_inode(struct wim_inode *inode)
 {
 	if (inode) {
 		if (inode->i_ads_entries) {
@@ -818,7 +835,8 @@ void free_inode(struct wim_inode *inode)
 
 /* Decrements link count on an inode and frees it if the link count reaches 0.
  * */
-static void put_inode(struct wim_inode *inode)
+static void
+put_inode(struct wim_inode *inode)
 {
 	wimlib_assert(inode->i_nlink != 0);
 	if (--inode->i_nlink == 0) {
@@ -836,26 +854,21 @@ static void put_inode(struct wim_inode *inode)
  * The corresponding inode (if any) is freed only if its link count is
  * decremented to 0.
  */
-void free_dentry(struct wim_dentry *dentry)
+void
+free_dentry(struct wim_dentry *dentry)
 {
 	FREE(dentry->file_name);
 	FREE(dentry->short_name);
-	FREE(dentry->full_path);
+	FREE(dentry->_full_path);
 	if (dentry->d_inode)
 		put_inode(dentry->d_inode);
 	FREE(dentry);
 }
 
-void put_dentry(struct wim_dentry *dentry)
-{
-	wimlib_assert(dentry->refcnt != 0);
-	if (--dentry->refcnt == 0)
-		free_dentry(dentry);
-}
-
 /* This function is passed as an argument to for_dentry_in_tree_depth() in order
  * to free a directory tree. */
-static int do_free_dentry(struct wim_dentry *dentry, void *__lookup_table)
+static int
+do_free_dentry(struct wim_dentry *dentry, void *__lookup_table)
 {
 	struct wim_lookup_table *lookup_table = __lookup_table;
 	unsigned i;
@@ -870,8 +883,7 @@ static int do_free_dentry(struct wim_dentry *dentry, void *__lookup_table)
 				lte_decrement_refcnt(lte, lookup_table);
 		}
 	}
-
-	put_dentry(dentry);
+	free_dentry(dentry);
 	return 0;
 }
 
@@ -884,18 +896,13 @@ static int do_free_dentry(struct wim_dentry *dentry, void *__lookup_table)
  * 			table entries corresponding to the dentries will be
  * 			decremented.
  */
-void free_dentry_tree(struct wim_dentry *root, struct wim_lookup_table *lookup_table)
+void
+free_dentry_tree(struct wim_dentry *root, struct wim_lookup_table *lookup_table)
 {
 	if (root)
 		for_dentry_in_tree_depth(root, do_free_dentry, lookup_table);
 }
 
-int increment_dentry_refcnt(struct wim_dentry *dentry, void *ignore)
-{
-	dentry->refcnt++;
-	return 0;
-}
-
 /*
  * Links a dentry into the directory tree.
  *
@@ -1018,9 +1025,7 @@ do_inode_add_ads(struct wim_inode *inode, const void *stream_name,
 	new_entry = &inode->i_ads_entries[num_ads - 1];
 	if (init_ads_entry(new_entry, stream_name, stream_name_nbytes, is_utf16le))
 		return NULL;
-#ifdef WITH_FUSE
 	new_entry->stream_id = inode->i_next_stream_id++;
-#endif
 	inode->i_num_ads = num_ads;
 	return new_entry;
 }
@@ -1151,7 +1156,7 @@ inode_get_unix_data(const struct wim_inode *inode,
 	if (size != sizeof(struct wimlib_unix_data))
 		return BAD_UNIX_DATA;
 
-	ret = read_full_wim_resource(lte, unix_data, 0);
+	ret = read_full_resource_into_buf(lte, unix_data, true);
 	if (ret)
 		return ret;
 
@@ -1438,19 +1443,16 @@ read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 
 	p = get_bytes(p, SHA1_HASH_SIZE, inode->i_hash);
 
-	/*
-	 * I don't know what's going on here.  It seems like M$ screwed up the
+	/* 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
-	 * document it.  The WIM_HDR_FLAG_RP_FIX flag in the WIM header might
-	 * have something to do with this, but it's not documented.
-	 */
+	 * document it.  */
 	if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
-		/* ??? */
 		p += 4;
 		p = get_u32(p, &inode->i_reparse_tag);
 		p += 4;
 	} else {
-		p = get_u32(p, &inode->i_reparse_tag);
+		p += 4;
+		/* i_reparse_tag is irrelevant; just leave it at 0. */
 		p = get_u64(p, &inode->i_ino);
 	}