X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Finode.c;h=57d92fb265b0cbbb2429636f7cdc8d5a95073ba3;hp=a8214b3c371bf52888dc3711b5ea17d77a0190fa;hb=27b30056e4520e9b5b9d0846f438311746345f83;hpb=edf0f7f5331e626b55819dcafa88e202cdb82a32

diff --git a/src/inode.c b/src/inode.c
index a8214b3c..57d92fb2 100644
--- a/src/inode.c
+++ b/src/inode.c
@@ -108,6 +108,8 @@ free_inode(struct wim_inode *inode)
 			destroy_ads_entry(&inode->i_ads_entries[i]);
 		FREE(inode->i_ads_entries);
 	}
+	if (inode->i_extra)
+		FREE(inode->i_extra);
 	/* HACK: This may instead delete the inode from i_list, but hlist_del()
 	 * behaves the same as list_del(). */
 	if (!hlist_unhashed(&inode->i_hlist))
@@ -326,87 +328,6 @@ inode_remove_ads(struct wim_inode *inode, u16 idx,
 	inode->i_num_ads--;
 }
 
-bool
-inode_has_unix_data(const struct wim_inode *inode)
-{
-	for (u16 i = 0; i < inode->i_num_ads; i++)
-		if (ads_entry_is_unix_data(&inode->i_ads_entries[i]))
-			return true;
-	return false;
-}
-
-#ifndef __WIN32__
-int
-inode_get_unix_data(const struct wim_inode *inode,
-		    struct wimlib_unix_data *unix_data,
-		    u16 *stream_idx_ret)
-{
-	const struct wim_ads_entry *ads_entry;
-	const struct wim_lookup_table_entry *lte;
-	size_t size;
-	int ret;
-
-	wimlib_assert(inode->i_resolved);
-
-	ads_entry = inode_get_ads_entry((struct wim_inode*)inode,
-					WIMLIB_UNIX_DATA_TAG, NULL);
-	if (ads_entry == NULL)
-		return NO_UNIX_DATA;
-
-	if (stream_idx_ret)
-		*stream_idx_ret = ads_entry - inode->i_ads_entries;
-
-	lte = ads_entry->lte;
-	if (lte == NULL)
-		return NO_UNIX_DATA;
-
-	size = lte->size;
-	if (size != sizeof(struct wimlib_unix_data))
-		return BAD_UNIX_DATA;
-
-	ret = read_full_stream_into_buf(lte, unix_data);
-	if (ret)
-		return ret;
-
-	if (unix_data->version != 0)
-		return BAD_UNIX_DATA;
-	return 0;
-}
-
-int
-inode_set_unix_data(struct wim_inode *inode, u16 uid, u16 gid, u16 mode,
-		    struct wim_lookup_table *lookup_table, int which)
-{
-	struct wimlib_unix_data unix_data;
-	int ret;
-	bool have_good_unix_data = false;
-	bool have_unix_data = false;
-	u16 stream_idx;
-
-	if (!(which & UNIX_DATA_CREATE)) {
-		ret = inode_get_unix_data(inode, &unix_data, &stream_idx);
-		if (ret == 0 || ret == BAD_UNIX_DATA || ret > 0)
-			have_unix_data = true;
-		if (ret == 0)
-			have_good_unix_data = true;
-	}
-	unix_data.version = 0;
-	if (which & UNIX_DATA_UID || !have_good_unix_data)
-		unix_data.uid = uid;
-	if (which & UNIX_DATA_GID || !have_good_unix_data)
-		unix_data.gid = gid;
-	if (which & UNIX_DATA_MODE || !have_good_unix_data)
-		unix_data.mode = mode;
-	ret = inode_add_ads_with_data(inode, WIMLIB_UNIX_DATA_TAG,
-				      &unix_data,
-				      sizeof(struct wimlib_unix_data),
-				      lookup_table);
-	if (ret == 0 && have_unix_data)
-		inode_remove_ads(inode, stream_idx, lookup_table);
-	return ret;
-}
-#endif /* __WIN32__  */
-
 /*
  * Resolve an inode's lookup table entries.
  *