X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fverify.c;h=e11561efcf790021799ea9f4193924f38f5f4146;hp=063834fbeda83aa879b4c41147aadb9484c01bf8;hb=3d71e838902b0b6f5321484ca965c1cd888fb91e;hpb=5d3d469e410dc5f4a28814ad231336fc174cba56 diff --git a/src/verify.c b/src/verify.c index 063834fb..e11561ef 100644 --- a/src/verify.c +++ b/src/verify.c @@ -1,108 +1,187 @@ /* * verify.c * - * Verify stream reference counts. + * Verify WIM files. */ /* - * Copyright (C) 2012, 2013 Eric Biggers + * 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 # include "config.h" #endif +#include "wimlib/blob_table.h" #include "wimlib/dentry.h" #include "wimlib/error.h" -#include "wimlib/lookup_table.h" #include "wimlib/metadata.h" +#include "wimlib/progress.h" #include "wimlib/security.h" static int -lte_fix_refcnt(struct wim_lookup_table_entry *lte, void *ctr) +append_blob_to_list(struct blob_descriptor *blob, void *_list) { - 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; - } + list_add(&blob->extraction_list, (struct list_head *)_list); return 0; } -static void -tally_inode_refcnts(const struct wim_inode *inode, - const struct wim_lookup_table *lookup_table) +struct verify_blob_list_ctx { + wimlib_progress_func_t progfunc; + void *progctx; + union wimlib_progress_info *progress; + u64 next_progress; + u64 cur_blob_offset; + u64 cur_blob_size; +}; + +static int +verify_begin_blob(struct blob_descriptor *blob, void *_ctx) { - 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; - } -} + struct verify_blob_list_ctx *ctx = _ctx; + ctx->cur_blob_offset = 0; + ctx->cur_blob_size = blob->size; + return 0; +} static int -tally_image_refcnts(WIMStruct *wim) +verify_consume_chunk(const void *chunk, size_t size, void *_ctx) { - const struct wim_image_metadata *imd; - const struct wim_inode *inode; + struct verify_blob_list_ctx *ctx = _ctx; + union wimlib_progress_info *progress = ctx->progress; + + ctx->cur_blob_offset += size; + if (ctx->cur_blob_offset == ctx->cur_blob_size) + progress->verify_streams.completed_streams++; + + progress->verify_streams.completed_bytes += size; - imd = wim_get_current_image_metadata(wim); - image_for_each_inode(inode, imd) - tally_inode_refcnts(inode, wim->lookup_table); + if (progress->verify_streams.completed_bytes >= ctx->next_progress) { + + int ret = call_progress(ctx->progfunc, + WIMLIB_PROGRESS_MSG_VERIFY_STREAMS, + progress, ctx->progctx); + if (ret) + return ret; + + set_next_progress(progress->verify_streams.completed_bytes, + progress->verify_streams.total_bytes, + &ctx->next_progress); + } return 0; } +static int +verify_file_data_present(struct wim_image_metadata *imd, + struct blob_table *blob_table) +{ + struct wim_inode *inode; + int ret; -/* 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 - * references to a stream and then remove it, it might still be referenced - * somewhere else, making a file be missing from the WIM... So, work around this - * problem by looking at ALL the images to re-calculate the reference count of - * 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_recalculate_refcnts(WIMStruct *wim) + image_for_each_inode(inode, imd) { + ret = inode_resolve_streams(inode, blob_table, false); + if (ret) + return ret; + } + return 0; +} + +/* API function documented in wimlib.h */ +WIMLIBAPI int +wimlib_verify_wim(WIMStruct *wim, int verify_flags) { - unsigned long num_ltes_with_bogus_refcnt = 0; int ret; + LIST_HEAD(blob_list); + union wimlib_progress_info progress; + struct verify_blob_list_ctx ctx; + struct blob_descriptor *blob; + struct read_blob_callbacks cbs = { + .begin_blob = verify_begin_blob, + .consume_chunk = verify_consume_chunk, + .ctx = &ctx, + }; + + /* Check parameters */ - for_lookup_table_entry(wim->lookup_table, lte_zero_real_refcnt, NULL); - ret = for_image(wim, WIMLIB_ALL_IMAGES, tally_image_refcnts); + if (!wim) + return WIMLIB_ERR_INVALID_PARAM; + + if (verify_flags) + return WIMLIB_ERR_INVALID_PARAM; + + /* Verify the images */ + + if (wim_has_metadata(wim)) { + + memset(&progress, 0, sizeof(progress)); + progress.verify_image.wimfile = wim->filename; + progress.verify_image.total_images = wim->hdr.image_count; + + for (int i = 1; i <= wim->hdr.image_count; i++) { + + progress.verify_image.current_image = i; + + ret = call_progress(wim->progfunc, WIMLIB_PROGRESS_MSG_BEGIN_VERIFY_IMAGE, + &progress, wim->progctx); + if (ret) + return ret; + + ret = select_wim_image(wim, i); + if (ret) + return ret; + + ret = verify_file_data_present(wim_get_current_image_metadata(wim), + wim->blob_table); + if (ret) + return ret; + + ret = call_progress(wim->progfunc, WIMLIB_PROGRESS_MSG_END_VERIFY_IMAGE, + &progress, wim->progctx); + if (ret) + return ret; + } + } else { + WARNING("\"%"TS"\" does not contain image metadata. Skipping image verification.", + wim->filename); + } + + /* Verify the blobs: SHA-1 message digests must match */ + + for_blob_in_table(wim->blob_table, append_blob_to_list, &blob_list); + + memset(&progress, 0, sizeof(progress)); + + progress.verify_streams.wimfile = wim->filename; + list_for_each_entry(blob, &blob_list, extraction_list) { + progress.verify_streams.total_streams++; + progress.verify_streams.total_bytes += blob->size; + } + + ctx.progfunc = wim->progfunc; + ctx.progctx = wim->progctx; + ctx.progress = &progress; + ctx.next_progress = 0; + + ret = call_progress(ctx.progfunc, WIMLIB_PROGRESS_MSG_VERIFY_STREAMS, + ctx.progress, ctx.progctx); 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); - } - wim->refcnts_ok = 1; - return 0; + + return read_blob_list(&blob_list, + offsetof(struct blob_descriptor, extraction_list), + &cbs, VERIFY_BLOB_HASHES); }