X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Finode_fixup.c;h=51893fc19096463098f32151bef7304839abdf7a;hp=c634cfd4f4b57cc82db0b86145f4f86ae9bdc518;hb=8b676e7d340fb8197824745eb387e1d3154e6f60;hpb=bb839af2a594f0d98aa0f75e81d6a7f0efe28917 diff --git a/src/inode_fixup.c b/src/inode_fixup.c index c634cfd4..51893fc1 100644 --- a/src/inode_fixup.c +++ b/src/inode_fixup.c @@ -5,20 +5,18 @@ /* * Copyright (C) 2012, 2013, 2014 Eric Biggers * - * This file is part of wimlib, a library for working with WIM files. + * This file is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) any + * later version. * - * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at your option) - * any later version. - * - * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU General Public License for more + * This file is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. * - * You should have received a copy of the GNU General Public License - * along with wimlib; if not, see http://www.gnu.org/licenses/. + * You should have received a copy of the GNU Lesser General Public License + * along with this file; if not, see http://www.gnu.org/licenses/. */ #ifdef HAVE_CONFIG_H @@ -29,7 +27,6 @@ #include "wimlib/error.h" #include "wimlib/inode.h" #include "wimlib/inode_table.h" -#include "wimlib/lookup_table.h" struct inode_fixup_params { struct wim_inode_table inode_table; @@ -39,41 +36,25 @@ struct inode_fixup_params { #define MAX_DIR_HARD_LINK_WARNINGS 8 -static bool -ads_entries_have_same_name(const struct wim_ads_entry *entry_1, - const struct wim_ads_entry *entry_2) -{ - return entry_1->stream_name_nbytes == entry_2->stream_name_nbytes && - !memcmp(entry_1->stream_name, entry_2->stream_name, - entry_1->stream_name_nbytes); -} - static bool inodes_consistent(const struct wim_inode *inode_1, const struct wim_inode *inode_2) { - if (inode_1->i_num_ads != inode_2->i_num_ads) - return false; - - for (u32 i = 0; i <= inode_1->i_num_ads; i++) { - const u8 *hash_1 = inode_stream_hash_unresolved(inode_1, i); - const u8 *hash_2 = inode_stream_hash_unresolved(inode_2, i); - - if (!hashes_equal(hash_1, hash_2) && !is_zero_hash(hash_1)) - return false; - - if (i && !ads_entries_have_same_name(&inode_1->i_ads_entries[i - 1], - &inode_2->i_ads_entries[i - 1])) - return false; - } - - if (inode_1->i_attributes != inode_2->i_attributes) - return false; - - if (inode_1->i_security_id != inode_2->i_security_id) - return false; - - return true; + /* This certainly isn't the only thing we need to check to make sure the + * inodes are consistent. However, this seems to be the only thing that + * the MS implementation checks when working around its own bug. + * + * (Tested: If two dentries share the same hard link group ID, Windows + * 8.1 DISM will link them if they have the same unnamed stream hash, + * even if the dentries provide different timestamps, attributes, + * alternate data streams, and security IDs! And the one that gets used + * will change if you merely swap the filenames. But if you use + * different unnamed stream hashes with everything else the same, it + * doesn't link the dentries.) + * + * For non-buggy WIMs this function will always return true. */ + return hashes_equal(inode_get_hash_of_unnamed_data_stream(inode_1), + inode_get_hash_of_unnamed_data_stream(inode_2)); } static int @@ -84,16 +65,15 @@ inode_table_insert(struct wim_dentry *dentry, void *_params) struct wim_inode *d_inode = dentry->d_inode; size_t pos; struct wim_inode *inode; - struct hlist_node *cur; if (d_inode->i_ino == 0) { - list_add_tail(&d_inode->i_list, &table->extra_inodes); + hlist_add_head(&d_inode->i_hlist_node, &table->extra_inodes); return 0; } /* Try adding this dentry to an existing inode. */ pos = d_inode->i_ino % table->capacity; - hlist_for_each_entry(inode, cur, &table->array[pos], i_hlist) { + hlist_for_each_entry(inode, &table->array[pos], i_hlist_node) { if (inode->i_ino != d_inode->i_ino) { continue; } @@ -101,7 +81,9 @@ inode_table_insert(struct wim_dentry *dentry, void *_params) params->num_inconsistent_inodes++; continue; } - if (unlikely(d_inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY)) { + if (unlikely((d_inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) || + (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY))) + { params->num_dir_hard_links++; if (params->num_dir_hard_links <= MAX_DIR_HARD_LINK_WARNINGS) @@ -109,7 +91,7 @@ inode_table_insert(struct wim_dentry *dentry, void *_params) WARNING("Unsupported directory hard link " "\"%"TS"\" <=> \"%"TS"\"", dentry_full_path(dentry), - inode_first_full_path(inode)); + inode_any_full_path(inode)); } else if (params->num_dir_hard_links == MAX_DIR_HARD_LINK_WARNINGS + 1) { @@ -119,44 +101,45 @@ inode_table_insert(struct wim_dentry *dentry, void *_params) continue; } /* Transfer this dentry to the existing inode. */ - free_inode(d_inode); - dentry->d_inode = inode; - inode->i_nlink++; - inode_add_dentry(dentry, inode); + d_disassociate(dentry); + d_associate(dentry, inode); return 0; } /* Keep this dentry's inode. */ - hlist_add_head(&d_inode->i_hlist, &table->array[pos]); + hlist_add_head(&d_inode->i_hlist_node, &table->array[pos]); return 0; } +static void +hlist_move_all(struct hlist_head *src, struct hlist_head *dest) +{ + struct hlist_node *node; + + while ((node = src->first) != NULL) { + hlist_del(node); + hlist_add_head(node, dest); + } +} + /* Move the inodes from the 'struct wim_inode_table' to the 'inode_list'. */ static void build_inode_list(struct wim_inode_table *inode_table, - struct list_head *inode_list) + struct hlist_head *inode_list) { - list_splice(&inode_table->extra_inodes, inode_list); - for (size_t i = 0; i < inode_table->capacity; i++) { - while (!hlist_empty(&inode_table->array[i])) { - struct wim_inode *inode; - - inode = hlist_entry(inode_table->array[i].first, - struct wim_inode, i_hlist); - hlist_del(&inode->i_hlist); - list_add(&inode->i_list, inode_list); - } - } + hlist_move_all(&inode_table->extra_inodes, inode_list); + for (size_t i = 0; i < inode_table->capacity; i++) + hlist_move_all(&inode_table->array[i], inode_list); } /* Re-assign inode numbers to the inodes in the list. */ static void -reassign_inode_numbers(struct list_head *inode_list) +reassign_inode_numbers(struct hlist_head *inode_list) { struct wim_inode *inode; u64 cur_ino = 1; - list_for_each_entry(inode, inode_list, i_list) + hlist_for_each_entry(inode, inode_list, i_hlist_node) inode->i_ino = cur_ino++; } @@ -177,18 +160,15 @@ reassign_inode_numbers(struct list_head *inode_list) * - Due to bugs in the Microsoft implementation, dentries with different * 'hard_link_group_id' fields may, in fact, need to be interpreted as * naming different inodes. This seems to mostly affect images in - * install.wim for Windows 7. I still have not been able to determine - * precisely how Microsoft's implementation generates and handles this - * invalid case, but we can at least try doing something reasonable by - * only joining a dentry with a different inode when this would not - * change the file's meaning (e.g. its contents or attributes). + * install.wim for Windows 7. I try to work around this in the same way + * the Microsoft implementation works around this. * * Returns 0 or WIMLIB_ERR_NOMEM. On success, the resulting inodes will be * appended to the @inode_list, and they will have consistent numbers in their * i_ino fields. */ int -dentry_tree_fix_inodes(struct wim_dentry *root, struct list_head *inode_list) +dentry_tree_fix_inodes(struct wim_dentry *root, struct hlist_head *inode_list) { struct inode_fixup_params params; int ret;