X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Flookup_table.c;h=c491f076e23c682c473ce5e0c824ac51c0796887;hb=d675548e8fb3013d58e7e5d058a2a87ad452c7ce;hp=2ccb0ef81ed9d2d2c2952f61995f2480111338c4;hpb=b0b65688a9fb875e464457ee6449b8793f0f8a03;p=wimlib diff --git a/src/lookup_table.c b/src/lookup_table.c index 2ccb0ef8..c491f076 100644 --- a/src/lookup_table.c +++ b/src/lookup_table.c @@ -75,7 +75,9 @@ void free_lookup_table_entry(struct lookup_table_entry *lte) if (lte) { if (lte->staging_list.next) list_del(<e->staging_list); - FREE(lte->file_on_disk); + if (lte->resource_location != RESOURCE_IN_WIM && + lte->resource_location != RESOURCE_NONEXISTENT) + FREE(lte->file_on_disk); FREE(lte); } } @@ -167,41 +169,37 @@ int for_lookup_table_entry(struct lookup_table *table, /* * Reads the lookup table from a WIM file. - * - * @fp: The FILE* for the WIM file. - * @offset: The offset of the lookup table resource. - * @size: The size of the lookup table resource. - * @lookup_table_ret: A pointer to a struct lookup_table structure into which the - * lookup table will be returned. - * @return: True on success, false on failure. */ -int read_lookup_table(FILE *fp, u64 offset, u64 size, - struct lookup_table **table_ret) +int read_lookup_table(WIMStruct *w) { - size_t num_entries; + u64 num_entries; u8 buf[WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE]; int ret; struct lookup_table *table; - const u8 *p; - struct lookup_table_entry *cur_entry; DEBUG("Reading lookup table: offset %"PRIu64", size %"PRIu64"", - offset, size); + w->hdr.lookup_table_res_entry.offset, + w->hdr.lookup_table_res_entry.original_size); - if (fseeko(fp, offset, SEEK_SET) != 0) { + if (fseeko(w->fp, w->hdr.lookup_table_res_entry.offset, SEEK_SET) != 0) { ERROR_WITH_ERRNO("Failed to seek to byte %"PRIu64" to read " - "lookup table", offset); + "lookup table", + w->hdr.lookup_table_res_entry.offset); return WIMLIB_ERR_READ; } - num_entries = size / WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE; + num_entries = w->hdr.lookup_table_res_entry.original_size / + WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE; table = new_lookup_table(num_entries * 2 + 1); if (!table) return WIMLIB_ERR_NOMEM; while (num_entries--) { - if (fread(buf, 1, sizeof(buf), fp) != sizeof(buf)) { - if (feof(fp)) { + const u8 *p; + struct lookup_table_entry *cur_entry, *duplicate_entry; + + if (fread(buf, 1, sizeof(buf), w->fp) != sizeof(buf)) { + if (feof(w->fp)) { ERROR("Unexpected EOF in WIM lookup table!"); } else { ERROR_WITH_ERRNO("Error reading WIM lookup " @@ -215,15 +213,41 @@ int read_lookup_table(FILE *fp, u64 offset, u64 size, ret = WIMLIB_ERR_NOMEM; goto out; } + cur_entry->wim = w; + cur_entry->resource_location = RESOURCE_IN_WIM; p = get_resource_entry(buf, &cur_entry->resource_entry); p = get_u16(p, &cur_entry->part_number); p = get_u32(p, &cur_entry->refcnt); - p = get_bytes(p, WIM_HASH_SIZE, cur_entry->hash); + p = get_bytes(p, SHA1_HASH_SIZE, cur_entry->hash); + + duplicate_entry = __lookup_resource(table, cur_entry->hash); + if (duplicate_entry) { + ERROR("The WIM lookup table contains two entries with the " + "same SHA1 message digest!"); + ERROR("The first entry is:"); + print_lookup_table_entry(duplicate_entry); + ERROR("The second entry is:"); + print_lookup_table_entry(cur_entry); + ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY; + goto out; + } lookup_table_insert(table, cur_entry); + + if (!(cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED) + && (cur_entry->resource_entry.size != + cur_entry->resource_entry.original_size)) + { + ERROR("Found uncompressed resource with original size " + "not the same as compressed size"); + ERROR("The lookup table entry for the resource is as follows:"); + print_lookup_table_entry(cur_entry); + ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY; + goto out; + } } DEBUG("Done reading lookup table."); - *table_ret = table; + w->lookup_table = table; return 0; out: free_lookup_table(table); @@ -258,7 +282,7 @@ int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out) p = put_resource_entry(buf, <e->output_resource_entry); p = put_u16(p, lte->part_number); p = put_u32(p, lte->out_refcnt); - p = put_bytes(p, WIM_HASH_SIZE, lte->hash); + p = put_bytes(p, SHA1_HASH_SIZE, lte->hash); if (fwrite(buf, 1, sizeof(buf), out) != sizeof(buf)) { ERROR_WITH_ERRNO("Failed to write lookup table entry"); return WIMLIB_ERR_WRITE; @@ -274,8 +298,12 @@ int zero_out_refcnts(struct lookup_table_entry *entry, void *ignore) return 0; } -int print_lookup_table_entry(struct lookup_table_entry *lte, void *ignore) +void print_lookup_table_entry(const struct lookup_table_entry *lte) { + if (!lte) { + putchar('\n'); + return; + } printf("Offset = %"PRIu64" bytes\n", lte->resource_entry.offset); printf("Size = %"PRIu64" bytes\n", @@ -284,7 +312,7 @@ int print_lookup_table_entry(struct lookup_table_entry *lte, void *ignore) lte->resource_entry.original_size); printf("Part Number = %hu\n", lte->part_number); printf("Reference Count = %u\n", lte->refcnt); - printf("Hash = "); + printf("Hash = 0x"); print_hash(lte->hash); putchar('\n'); printf("Flags = "); @@ -298,9 +326,27 @@ int print_lookup_table_entry(struct lookup_table_entry *lte, void *ignore) if (flags & WIM_RESHDR_FLAG_SPANNED) fputs("WIM_RESHDR_FLAG_SPANNED, ", stdout); putchar('\n'); - if (lte->file_on_disk && !lte->is_symlink) + switch (lte->resource_location) { + case RESOURCE_IN_WIM: + if (lte->wim->filename) { + printf("WIM file = `%s'\n", + lte->wim->filename); + } + break; + case RESOURCE_IN_FILE_ON_DISK: printf("File on Disk = `%s'\n", lte->file_on_disk); + break; + case RESOURCE_IN_STAGING_FILE: + printf("Staging File = `%s'\n", lte->staging_file_name); + break; + } putchar('\n'); +} + +static int do_print_lookup_table_entry(struct lookup_table_entry *lte, + void *ignore) +{ + print_lookup_table_entry(lte); return 0; } @@ -310,7 +356,7 @@ int print_lookup_table_entry(struct lookup_table_entry *lte, void *ignore) WIMLIBAPI void wimlib_print_lookup_table(WIMStruct *w) { for_lookup_table_entry(w->lookup_table, - print_lookup_table_entry, + do_print_lookup_table_entry, NULL); } @@ -326,7 +372,7 @@ __lookup_resource(const struct lookup_table *table, const u8 hash[]) i = *(size_t*)hash % table->capacity; hlist_for_each_entry(lte, pos, &table->array[i], hash_list) - if (memcmp(hash, lte->hash, WIM_HASH_SIZE) == 0) + if (hashes_equal(hash, lte->hash)) return lte; return NULL; } @@ -346,7 +392,20 @@ int lookup_resource(WIMStruct *w, const char *path, struct dentry *dentry; struct lookup_table_entry *lte; unsigned stream_idx; + const char *stream_name; + char *p = NULL; + + if (lookup_flags & LOOKUP_FLAG_ADS_OK) { + stream_name = path_stream_name(path); + if (stream_name) { + p = (char*)stream_name - 1; + *p = '\0'; + } + } + dentry = get_dentry(w, path); + if (p) + *p = ':'; if (!dentry) return -ENOENT; @@ -357,22 +416,19 @@ int lookup_resource(WIMStruct *w, const char *path, && dentry_is_directory(dentry)) return -EISDIR; stream_idx = 0; - if (lookup_flags & LOOKUP_FLAG_ADS_OK) { - const char *stream_name = path_stream_name(path); - if (stream_name) { - size_t stream_name_len = strlen(stream_name); - for (u16 i = 0; i < dentry->num_ads; i++) { - if (ads_entry_has_name(&dentry->ads_entries[i], - stream_name, - stream_name_len)) - { - stream_idx = i + 1; - lte = dentry->ads_entries[i].lte; - goto out; - } + if (stream_name) { + size_t stream_name_len = strlen(stream_name); + for (u16 i = 0; i < dentry->num_ads; i++) { + if (ads_entry_has_name(&dentry->ads_entries[i], + stream_name, + stream_name_len)) + { + stream_idx = i + 1; + lte = dentry->ads_entries[i].lte; + goto out; } - return -ENOENT; } + return -ENOENT; } out: if (dentry_ret) @@ -398,7 +454,8 @@ int dentry_resolve_ltes(struct dentry *dentry, void *__table) struct lookup_table *table = __table; struct lookup_table_entry *lte; - wimlib_assert(!dentry->resolved); + if (dentry->resolved) + return 0; /* Resolve the default file stream */ lte = __lookup_resource(table, dentry->hash); @@ -427,3 +484,13 @@ int dentry_resolve_ltes(struct dentry *dentry, void *__table) } return 0; } + +struct lookup_table_entry * +dentry_first_lte(const struct dentry *dentry, const struct lookup_table *table) +{ + if (dentry->resolved) + return dentry_first_lte_resolved(dentry); + else + return dentry_first_lte_unresolved(dentry, table); +} +