X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fverify.c;h=a9de114642138b6aa1bbcb2c9b1f8b012c0366e6;hp=d348e302b2d65edfc4ff29ed66e698d875c660ac;hb=3bb3e3c3806a121686cec80c56f2718c714915ef;hpb=9c7e852e60e96935beef11a28b0f010f7e24e863

diff --git a/src/verify.c b/src/verify.c
index d348e302..a9de1146 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -1,8 +1,7 @@
 /*
  * verify.c
  *
- * Some functions to verify that stuff in the WIM is valid.  Of course, not
- * *all* the verifications of the input data are in this file.
+ * Verify WIM inodes and stream reference counts.
  */
 
 /*
@@ -34,12 +33,19 @@
 #include "wimlib/metadata.h"
 #include "wimlib/security.h"
 
-static int
-verify_inode(struct wim_inode *inode, const WIMStruct *w)
+/*
+ * Verify a WIM inode:
+ *
+ * - Check to make sure the security ID is valid
+ * - Check to make sure there is at most one unnamed stream
+ * - Check to make sure there is at most one DOS name.
+ *
+ * Return values:
+ *	WIMLIB_ERR_SUCCESS (0)
+ */
+int
+verify_inode(struct wim_inode *inode, const struct wim_security_data *sd)
 {
-	const struct wim_lookup_table *table = w->lookup_table;
-	const struct wim_security_data *sd = wim_const_security_data(w);
-	struct wim_dentry *first_dentry = inode_first_dentry(inode);
 	struct wim_dentry *dentry;
 
 	/* Check the security ID.  -1 is valid and means "no security
@@ -50,32 +56,10 @@ verify_inode(struct wim_inode *inode, const WIMStruct *w)
 	     inode->i_security_id >= sd->num_entries))
 	{
 		WARNING("\"%"TS"\" has an invalid security ID (%d)",
-			dentry_full_path(first_dentry), inode->i_security_id);
+			inode_first_full_path(inode), inode->i_security_id);
 		inode->i_security_id = -1;
 	}
 
-	/* Check that lookup table entries for all the inode's stream exist,
-	 * except if the SHA1 message digest is all 0's, which indicates an
-	 * empty stream.
-	 *
-	 * This check is skipped on split WIMs. */
-	if (w->hdr.total_parts == 1 && !inode->i_resolved) {
-		for (unsigned i = 0; i <= inode->i_num_ads; i++) {
-			struct wim_lookup_table_entry *lte;
-			const u8 *hash;
-			hash = inode_stream_hash(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 `%"TS"'",
-				      i, dentry_full_path(first_dentry));
-				return WIMLIB_ERR_INVALID_DENTRY;
-			}
-			if (lte)
-				lte->real_refcnt += inode->i_nlink;
-		}
-	}
-
 	/* Make sure there is only one unnamed data stream. */
 	unsigned num_unnamed_streams = 0;
 	for (unsigned i = 0; i <= inode->i_num_ads; i++) {
@@ -86,7 +70,7 @@ verify_inode(struct wim_inode *inode, const WIMStruct *w)
 	}
 	if (num_unnamed_streams > 1) {
 		WARNING("\"%"TS"\" has multiple (%u) un-named streams",
-			dentry_full_path(first_dentry), num_unnamed_streams);
+			inode_first_full_path(inode), num_unnamed_streams);
 	}
 
 	/* Files cannot have multiple DOS names, even if they have multiple
@@ -105,7 +89,7 @@ verify_inode(struct wim_inode *inode, const WIMStruct *w)
 				      "both `%"TS"' and `%"TS"'",
 				      dentry_full_path(dentry_with_dos_name),
 				      dentry_full_path(dentry));
-				return WIMLIB_ERR_INVALID_DENTRY;
+				return WIMLIB_ERR_INVALID_METADATA_RESOURCE;
 			#else
 				dentry->dos_name_invalid = 1;
 			#endif
@@ -113,87 +97,52 @@ verify_inode(struct wim_inode *inode, const WIMStruct *w)
 			dentry_with_dos_name = dentry;
 		}
 	}
-
-	inode->i_verified = 1;
 	return 0;
 }
 
-/* Run some miscellaneous verifications on a WIM dentry */
-int
-verify_dentry(struct wim_dentry *dentry, void *wim)
+static int
+lte_fix_refcnt(struct wim_lookup_table_entry *lte, void *ctr)
 {
-	int ret;
-	WIMStruct *w = wim;
-
-	/* Verify the associated inode, but only one time no matter how many
-	 * dentries it has (unless we are doing a full verification of the WIM,
-	 * in which case we need to force the inode to be verified again.) */
-	if (!dentry->d_inode->i_verified) {
-		ret = verify_inode(dentry->d_inode, w);
-		if (ret)
-			return ret;
-	}
-
-	/* Make sure root dentry is unnamed, while every other dentry has at
-	 * least a long name.
-	 *
-	 * I am assuming that dentries having only a DOS name is illegal; i.e.,
-	 * Windows will always combine the Win32 name and DOS name for a file
-	 * into a single WIM dentry, even if they are stored separately on NTFS.
-	 * (This seems to be the case...) */
-	if (dentry_is_root(dentry)) {
-		if (dentry_has_long_name(dentry) || dentry_has_short_name(dentry)) {
-			WARNING("The root dentry has a nonempty name");
-			FREE(dentry->file_name);
-			FREE(dentry->short_name);
-			dentry->file_name = NULL;
-			dentry->short_name = NULL;
-			dentry->file_name_nbytes = 0;
-			dentry->short_name_nbytes = 0;
+	if (lte->refcnt != lte->real_refcnt) {
+		if (wimlib_print_errors) {
+			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);
+			print_lookup_table_entry(lte, stderr);
 		}
+		lte->refcnt = lte->real_refcnt;
+		++*(unsigned long *)ctr;
 	}
-
-#if 0
-	/* Check timestamps */
-	if (inode->i_last_access_time < inode->i_creation_time ||
-	    inode->i_last_write_time < inode->i_creation_time) {
-		WARNING("Dentry `%"TS"' was created after it was last accessed or "
-			"written to", dentry->full_path);
-	}
-#endif
-
 	return 0;
 }
 
-static int
-image_run_full_verifications(WIMStruct *w)
+static void
+tally_inode_refcnts(const struct wim_inode *inode,
+		    const struct wim_lookup_table *lookup_table)
 {
-	struct wim_image_metadata *imd;
-	struct wim_inode *inode;
-
-	imd = wim_get_current_image_metadata(w);
-	image_for_each_inode(inode, imd)
-		inode->i_verified = 0;
-	return for_dentry_in_tree(imd->root_dentry, verify_dentry, w);
+	for (unsigned i = 0; i <= inode->i_num_ads; i++) {
+		struct wim_lookup_table_entry *lte;
+		lte = inode_stream_lte(inode, i, lookup_table);
+		if (lte)
+			lte->real_refcnt += inode->i_nlink;
+	}
 }
 
+
 static int
-lte_fix_refcnt(struct wim_lookup_table_entry *lte, void *ctr)
+tally_image_refcnts(WIMStruct *wim)
 {
-	if (lte->refcnt != lte->real_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);
-		print_lookup_table_entry(lte, stderr);
-	#endif
-		lte->refcnt = lte->real_refcnt;
-		++*(unsigned long *)ctr;
-	}
+	const struct wim_image_metadata *imd;
+	const struct wim_inode *inode;
+
+	imd = wim_get_current_image_metadata(wim);
+	image_for_each_inode(inode, imd)
+		tally_inode_refcnts(inode, wim->lookup_table);
 	return 0;
 }
 
+
 /* Ideally this would be unnecessary... however, the WIMs for Windows 8 are
  * screwed up because some lookup table entries are referenced more times than
  * their stated reference counts.  So theoretically, if we delete all the
@@ -203,27 +152,24 @@ lte_fix_refcnt(struct wim_lookup_table_entry *lte, void *ctr)
  * EVERY lookup table entry.  This only absolutely has to be done before an image
  * is deleted or before an image is mounted read-write. */
 int
-wim_run_full_verifications(WIMStruct *w)
+wim_recalculate_refcnts(WIMStruct *wim)
 {
+	unsigned long num_ltes_with_bogus_refcnt = 0;
 	int ret;
 
-	for_lookup_table_entry(w->lookup_table, lte_zero_real_refcnt, NULL);
-
-	w->all_images_verified = 1; /* Set *before* image_run_full_verifications,
-				       because of check in read_metadata_resource() */
-	ret = for_image(w, WIMLIB_ALL_IMAGES, image_run_full_verifications);
-	if (ret == 0) {
-		unsigned long num_ltes_with_bogus_refcnt = 0;
-		for_lookup_table_entry(w->lookup_table, lte_fix_refcnt,
-				       &num_ltes_with_bogus_refcnt);
-		if (num_ltes_with_bogus_refcnt != 0) {
-			WARNING("A total of %lu entries in the WIM's stream "
-				"lookup table had to have\n"
-				"          their reference counts fixed.",
-				num_ltes_with_bogus_refcnt);
-		}
-	} else {
-		w->all_images_verified = 0;
+	for_lookup_table_entry(wim->lookup_table, lte_zero_real_refcnt, NULL);
+	ret = for_image(wim, WIMLIB_ALL_IMAGES, tally_image_refcnts);
+	if (ret)
+		return ret;
+	num_ltes_with_bogus_refcnt = 0;
+	for_lookup_table_entry(wim->lookup_table, lte_fix_refcnt,
+			       &num_ltes_with_bogus_refcnt);
+	if (num_ltes_with_bogus_refcnt != 0) {
+		WARNING("A total of %lu entries in the WIM's stream "
+			"lookup table had to have\n"
+			"          their reference counts fixed.",
+			num_ltes_with_bogus_refcnt);
 	}
-	return ret;
+	wim->refcnts_ok = 1;
+	return 0;
 }