X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Finode_fixup.c;h=d98ffc2d082158317e06ba3c73227f3a2547c741;hb=56dcd8f3979d785b3b3caefbb7a20013877993d0;hp=799f3ba27868187d20be7806b4c62f81eec7a115;hpb=39baf46ecec78f739ee9a68201f96fbdc917f62a;p=wimlib diff --git a/src/inode_fixup.c b/src/inode_fixup.c index 799f3ba2..d98ffc2d 100644 --- a/src/inode_fixup.c +++ b/src/inode_fixup.c @@ -56,9 +56,9 @@ static void inconsistent_inode(const struct wim_inode *inode) { if (wimlib_print_errors) { - ERROR("An inconsistent hard link group that cannot be corrected has " - "been detected"); - ERROR("The dentries are located at the following paths:"); + WARNING("An inconsistent hard link group that cannot be corrected has " + "been detected"); + WARNING("The dentries are located at the following paths:"); print_inode_dentries(inode); } } @@ -97,27 +97,63 @@ ref_inodes_consistent(const struct wim_inode * restrict ref_inode_1, return true; } +/* Returns true iff the specified inode has any data streams with nonzero hash. + */ static bool -inodes_consistent(const struct wim_inode * restrict ref_inode, - const struct wim_inode * restrict inode) +inode_has_data_streams(const struct wim_inode *inode) { - wimlib_assert(ref_inode != inode); + for (unsigned i = 0; i <= inode->i_num_ads; i++) + if (!is_zero_hash(inode_stream_hash(inode, i))) + return true; + return false; +} - if (ref_inode->i_num_ads != inode->i_num_ads && - inode->i_num_ads != 0) +/* Returns true iff the specified dentry has any data streams with nonzero hash. + */ +static bool +dentry_has_data_streams(const struct wim_dentry *dentry) +{ + return inode_has_data_streams(dentry->d_inode); +} + +static bool +inodes_consistent(const struct wim_inode *ref_inode, + const struct wim_inode *inode) +{ + if (ref_inode->i_security_id != inode->i_security_id) { + WARNING("Security ID mismatch: %d != %d", + ref_inode->i_security_id, inode->i_security_id); return false; - if (ref_inode->i_security_id != inode->i_security_id - || ref_inode->i_attributes != inode->i_attributes) + } + + if (ref_inode->i_attributes != inode->i_attributes) { + WARNING("Attributes mismatch: 0x%08x != 0x%08x", + ref_inode->i_attributes, inode->i_attributes); return false; - for (unsigned i = 0; i <= min(ref_inode->i_num_ads, inode->i_num_ads); i++) { - const u8 *ref_hash, *hash; - ref_hash = inode_stream_hash(ref_inode, i); - hash = inode_stream_hash(inode, i); - if (!hashes_equal(ref_hash, hash) && !is_zero_hash(hash)) - return false; - if (i && !ads_entries_have_same_name(&ref_inode->i_ads_entries[i - 1], - &inode->i_ads_entries[i - 1])) + } + + if (inode_has_data_streams(inode)) { + if (ref_inode->i_num_ads != inode->i_num_ads) { + WARNING("Stream count mismatch: %u != %u", + ref_inode->i_num_ads, inode->i_num_ads); return false; + } + for (unsigned i = 0; i <= ref_inode->i_num_ads; i++) { + const u8 *ref_hash, *hash; + + ref_hash = inode_stream_hash(ref_inode, i); + hash = inode_stream_hash(inode, i); + if (!hashes_equal(ref_hash, hash) && !is_zero_hash(hash)) { + WARNING("Stream hash mismatch"); + return false; + } + if (i && !ads_entries_have_same_name(&ref_inode->i_ads_entries[i - 1], + &inode->i_ads_entries[i - 1])) + { + WARNING("Stream name mismatch"); + return false; + } + } } return true; } @@ -153,10 +189,8 @@ fix_true_inode(struct wim_inode *inode, struct list_head *inode_list) inode_for_each_dentry(dentry, ref_inode) { if (dentry != ref_dentry) { - if (!inodes_consistent(ref_inode, dentry->d_inode)) { + if (!inodes_consistent(ref_inode, dentry->d_inode)) inconsistent_inode(ref_inode); - return WIMLIB_ERR_INVALID_METADATA_RESOURCE; - } /* Free the unneeded `struct wim_inode'. */ wimlib_assert(dentry->d_inode->i_nlink == 1); free_inode(dentry->d_inode); @@ -202,19 +236,10 @@ fix_nominal_inode(struct wim_inode *inode, struct list_head *inode_list, * least one data stream with a non-zero hash, and another list that * contains the dentries that have a zero hash for all data streams. */ inode_for_each_dentry(dentry, inode) { - for (unsigned i = 0; i <= dentry->d_inode->i_num_ads; i++) { - const u8 *hash; - hash = inode_stream_hash(dentry->d_inode, i); - if (!is_zero_hash(hash)) { - list_add(&dentry->tmp_list, - &dentries_with_data_streams); - goto next_dentry; - } - } - list_add(&dentry->tmp_list, - &dentries_with_no_data_streams); - next_dentry: - ; + if (dentry_has_data_streams(dentry)) + list_add(&dentry->tmp_list, &dentries_with_data_streams); + else + list_add(&dentry->tmp_list, &dentries_with_no_data_streams); } /* If there are no dentries with data streams, we require the nominal