X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fhardlink.c;h=5e2c62618ad43b5e2641d97a31cb86f899425e97;hp=ff42f26f32ba0955aee94f895059cb7f88f523e9;hb=389f993fdf085a9bf120f8a17464e321d6e42898;hpb=c6a1140e085f633273fcf47a6462bd9382ce118a

diff --git a/src/hardlink.c b/src/hardlink.c
index ff42f26f..5e2c6261 100644
--- a/src/hardlink.c
+++ b/src/hardlink.c
@@ -23,10 +23,14 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
-#include "dentry.h"
-#include "list.h"
-#include "lookup_table.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib/capture.h"
+#include "wimlib/dentry.h"
+#include "wimlib/error.h"
+#include "wimlib/lookup_table.h"
 
 /*                             NULL        NULL
  *                              ^           ^
@@ -60,7 +64,7 @@ init_inode_table(struct wim_inode_table *table, size_t capacity)
 	}
 	table->num_entries  = 0;
 	table->capacity     = capacity;
-	INIT_HLIST_HEAD(&table->extra_inodes);
+	INIT_LIST_HEAD(&table->extra_inodes);
 	return 0;
 }
 
@@ -87,7 +91,7 @@ inode_table_insert(struct wim_dentry *dentry, void *_table)
 		/* A dentry with a hard link group ID of 0 indicates that it's
 		 * in a hard link group by itself.  Add it to the list of extra
 		 * inodes rather than inserting it into the hash lists. */
-		hlist_add_head(&d_inode->i_hlist, &table->extra_inodes);
+		list_add_tail(&d_inode->i_list, &table->extra_inodes);
 
 		wimlib_assert(d_inode->i_dentry.next == &dentry->d_alias);
 		wimlib_assert(d_inode->i_dentry.prev == &dentry->d_alias);
@@ -148,6 +152,17 @@ inode_table_get_inode(struct wim_inode_table *table, u64 ino, u64 devno)
 	return inode;
 }
 
+void
+inode_ref_streams(struct wim_inode *inode)
+{
+	for (unsigned i = 0; i <= inode->i_num_ads; i++) {
+		struct wim_lookup_table_entry *lte;
+		lte = inode_stream_lte_resolved(inode, i);
+		if (lte)
+			lte->refcnt++;
+	}
+}
+
 /* Given a directory entry with the name @name for the file with the inode
  * number @ino and device number @devno, create a new WIM dentry with an
  * associated inode, where the inode is shared if an inode with the same @ino
@@ -157,23 +172,32 @@ inode_table_get_inode(struct wim_inode_table *table, u64 ino, u64 devno)
  */
 int
 inode_table_new_dentry(struct wim_inode_table *table, const tchar *name,
-		       u64 ino, u64 devno, struct wim_dentry **dentry_ret)
+		       u64 ino, u64 devno, bool noshare,
+		       struct wim_dentry **dentry_ret)
 {
 	struct wim_dentry *dentry;
 	struct wim_inode *inode;
 	int ret;
 
-	ret = new_dentry(name, &dentry);
-	if (ret)
-		return ret;
-
-	inode = inode_table_get_inode(table, ino, devno);
-	if (!inode) {
-		free_dentry(dentry);
-		return WIMLIB_ERR_NOMEM;
+	if (noshare) {
+		ret = new_dentry_with_timeless_inode(name, &dentry);
+		if (ret)
+			return ret;
+		list_add_tail(&dentry->d_inode->i_list, &table->extra_inodes);
+	} else {
+		ret = new_dentry(name, &dentry);
+		if (ret)
+			return ret;
+		inode = inode_table_get_inode(table, ino, devno);
+		if (!inode) {
+			free_dentry(dentry);
+			return WIMLIB_ERR_NOMEM;
+		}
+		if (inode->i_nlink > 1)
+			inode_ref_streams(inode);
+		dentry->d_inode = inode;
+		inode_add_dentry(dentry, inode);
 	}
-	dentry->d_inode = inode;
-	inode_add_dentry(dentry, inode);
 	*dentry_ret = dentry;
 	return 0;
 }
@@ -184,7 +208,7 @@ print_inode_dentries(const struct wim_inode *inode)
 {
 	struct wim_dentry *dentry;
 	inode_for_each_dentry(dentry, inode)
-		tprintf(T("`%"TS"'\n"), dentry->full_path);
+		tfprintf(stderr, T("%"TS"\n"), dentry_full_path(dentry));
 }
 #endif
 
@@ -251,7 +275,7 @@ inodes_consistent(const struct wim_inode * restrict ref_inode,
 
 /* Fix up a "true" inode and check for inconsistencies */
 static int
-fix_true_inode(struct wim_inode *inode, struct hlist_head *inode_list)
+fix_true_inode(struct wim_inode *inode, struct list_head *inode_list)
 {
 	struct wim_dentry *dentry;
 	struct wim_dentry *ref_dentry = NULL;
@@ -273,7 +297,7 @@ fix_true_inode(struct wim_inode *inode, struct hlist_head *inode_list)
 
 	ref_inode = ref_dentry->d_inode;
 	ref_inode->i_nlink = 1;
-	hlist_add_head(&ref_inode->i_hlist, inode_list);
+	list_add_tail(&ref_inode->i_list, inode_list);
 
 	list_del(&inode->i_dentry);
 	list_add(&ref_inode->i_dentry, &ref_dentry->d_alias);
@@ -285,8 +309,6 @@ fix_true_inode(struct wim_inode *inode, struct hlist_head *inode_list)
 				return WIMLIB_ERR_INVALID_DENTRY;
 			}
 			/* Free the unneeded `struct wim_inode'. */
-			dentry->d_inode->i_hlist.next = NULL;
-			dentry->d_inode->i_hlist.pprev = NULL;
 			free_inode(dentry->d_inode);
 			dentry->d_inode = ref_inode;
 			ref_inode->i_nlink++;
@@ -314,7 +336,7 @@ fix_true_inode(struct wim_inode *inode, struct hlist_head *inode_list)
  * group remaining.
  */
 static int
-fix_nominal_inode(struct wim_inode *inode, struct hlist_head *inode_list,
+fix_nominal_inode(struct wim_inode *inode, struct list_head *inode_list,
 		  bool *ino_changes_needed)
 {
 	struct wim_dentry *dentry;
@@ -324,6 +346,13 @@ fix_nominal_inode(struct wim_inode *inode, struct hlist_head *inode_list,
 
 	wimlib_assert(inode->i_nlink == inode_link_count(inode));
 
+	if (inode->i_nlink > 1 &&
+	    (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY))
+	{
+		ERROR("Found unsupported directory hard link!");
+		return WIMLIB_ERR_INVALID_DENTRY;
+	}
+
 	LIST_HEAD(dentries_with_data_streams);
 	LIST_HEAD(dentries_with_no_data_streams);
 	HLIST_HEAD(true_inodes);
@@ -429,29 +458,29 @@ next_dentry_2:
 
 	hlist_for_each_entry_safe(inode, cur, tmp, &true_inodes, i_hlist) {
 		ret = fix_true_inode(inode, inode_list);
-		if (ret != 0)
+		if (ret)
 			return ret;
 	}
 	return 0;
 }
 
 static int
-fix_inodes(struct wim_inode_table *table, struct hlist_head *inode_list,
+fix_inodes(struct wim_inode_table *table, struct list_head *inode_list,
 	   bool *ino_changes_needed)
 {
 	struct wim_inode *inode;
 	struct hlist_node *cur, *tmp;
 	int ret;
-	INIT_HLIST_HEAD(inode_list);
+	INIT_LIST_HEAD(inode_list);
 	for (u64 i = 0; i < table->capacity; i++) {
 		hlist_for_each_entry_safe(inode, cur, tmp, &table->array[i], i_hlist) {
+			INIT_LIST_HEAD(&inode->i_list);
 			ret = fix_nominal_inode(inode, inode_list, ino_changes_needed);
-			if (ret != 0)
+			if (ret)
 				return ret;
 		}
 	}
-	hlist_for_each_safe(cur, tmp, &table->extra_inodes)
-		hlist_add_head(cur, inode_list);
+	list_splice_tail(&table->extra_inodes, inode_list);
 	return 0;
 }
 
@@ -484,7 +513,7 @@ fix_inodes(struct wim_inode_table *table, struct hlist_head *inode_list,
  * is returned in the hlist @inode_list.
  */
 int
-dentry_tree_fix_inodes(struct wim_dentry *root, struct hlist_head *inode_list)
+dentry_tree_fix_inodes(struct wim_dentry *root, struct list_head *inode_list)
 {
 	struct wim_inode_table inode_tab;
 	int ret;
@@ -504,11 +533,10 @@ dentry_tree_fix_inodes(struct wim_dentry *root, struct hlist_head *inode_list)
 
 	if (ret == 0 && ino_changes_needed) {
 		u64 cur_ino = 1;
-		struct hlist_node *tmp;
 		struct wim_inode *inode;
 
 		WARNING("Re-assigning inode numbers due to inode inconsistencies");
-		hlist_for_each_entry(inode, tmp, inode_list, i_hlist) {
+		list_for_each_entry(inode, inode_list, i_list) {
 			if (inode->i_nlink > 1)
 				inode->i_ino = cur_ino++;
 			else
@@ -522,13 +550,19 @@ dentry_tree_fix_inodes(struct wim_dentry *root, struct hlist_head *inode_list)
  * the inodes to a single list @head. */
 void
 inode_table_prepare_inode_list(struct wim_inode_table *table,
-			       struct hlist_head *head)
+			       struct list_head *head)
 {
 	struct wim_inode *inode;
 	struct hlist_node *cur, *tmp;
 	u64 cur_ino = 1;
 
-	INIT_HLIST_HEAD(head);
+	list_for_each_entry(inode, head, i_list) {
+		if (inode->i_nlink > 1)
+			inode->i_ino = cur_ino++;
+		else
+			inode->i_ino = 0;
+	}
+
 	for (size_t i = 0; i < table->capacity; i++) {
 		hlist_for_each_entry_safe(inode, cur, tmp, &table->array[i], i_hlist)
 		{
@@ -536,9 +570,10 @@ inode_table_prepare_inode_list(struct wim_inode_table *table,
 				inode->i_ino = cur_ino++;
 			else
 				inode->i_ino = 0;
-			hlist_add_head(&inode->i_hlist, head);
+			list_add_tail(&inode->i_list, head);
 		}
 		INIT_HLIST_HEAD(&table->array[i]);
 	}
+	list_splice_tail(&table->extra_inodes, head);
 	table->num_entries = 0;
 }