X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flookup_table.c;h=36d2d13f69430518dcdafbf59b2649a75af25152;hp=e0fca5d47ea1cb596b5ffc65c30d86cb1f8548da;hb=9b25b1a8e4c01e57f2872fe9e825f0dc81329008;hpb=50670821723291959a6f35442c523800d369c934 diff --git a/src/lookup_table.c b/src/lookup_table.c index e0fca5d4..36d2d13f 100644 --- a/src/lookup_table.c +++ b/src/lookup_table.c @@ -59,20 +59,78 @@ err: struct lookup_table_entry *new_lookup_table_entry() { struct lookup_table_entry *lte; - + lte = CALLOC(1, sizeof(struct lookup_table_entry)); - if (!lte) { + if (lte) { + lte->part_number = 1; + lte->refcnt = 1; + } else { ERROR("Out of memory (tried to allocate %zu bytes for " "lookup table entry)", sizeof(struct lookup_table_entry)); - return NULL; } - - lte->part_number = 1; - lte->refcnt = 1; return lte; } +struct lookup_table_entry * +clone_lookup_table_entry(const struct lookup_table_entry *old) +{ + struct lookup_table_entry *new; + + new = MALLOC(sizeof(*new)); + if (!new) + return NULL; + + memcpy(new, old, sizeof(*old)); + new->extracted_file = NULL; + switch (new->resource_location) { + case RESOURCE_IN_STAGING_FILE: + case RESOURCE_IN_FILE_ON_DISK: + wimlib_assert((void*)&old->file_on_disk == + (void*)&old->staging_file_name); + new->staging_file_name = STRDUP(old->staging_file_name); + if (!new->staging_file_name) + goto out_free; + break; + case RESOURCE_IN_ATTACHED_BUFFER: + new->attached_buffer = MALLOC(wim_resource_size(old)); + if (!new->attached_buffer) + goto out_free; + memcpy(new->attached_buffer, old->attached_buffer, + wim_resource_size(old)); + break; +#ifdef WITH_NTFS_3G + case RESOURCE_IN_NTFS_VOLUME: + if (old->ntfs_loc) { + struct ntfs_location *loc; + loc = MALLOC(sizeof(*loc)); + if (!loc) + goto out_free; + memcpy(loc, old->ntfs_loc, sizeof(*loc)); + loc->path_utf8 = NULL; + loc->stream_name_utf16 = NULL; + new->ntfs_loc = loc; + loc->path_utf8 = STRDUP(old->ntfs_loc->path_utf8); + if (!loc->path_utf8) + goto out_free; + loc->stream_name_utf16 = MALLOC(loc->stream_name_utf16_num_chars * 2); + if (!loc->stream_name_utf16) + goto out_free; + memcpy(loc->stream_name_utf16, + old->ntfs_loc->stream_name_utf16, + loc->stream_name_utf16_num_chars * 2); + } + break; +#endif + default: + break; + } + return new; +out_free: + free_lookup_table_entry(new); + return NULL; +} + void free_lookup_table_entry(struct lookup_table_entry *lte) { if (lte) { @@ -131,7 +189,7 @@ void free_lookup_table(struct lookup_table *table) * @table: A pointer to the lookup table. * @entry: A pointer to the entry to insert. */ -void lookup_table_insert(struct lookup_table *table, +void lookup_table_insert(struct lookup_table *table, struct lookup_table_entry *lte) { size_t i = lte->hash_short % table->capacity; @@ -147,6 +205,7 @@ static void finalize_lte(struct lookup_table_entry *lte) if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { unlink(lte->staging_file_name); wimlib_assert(lte->staging_list.next); + wimlib_assert(lte->staging_list.prev); list_del(<e->staging_list); } #endif @@ -157,47 +216,35 @@ static void finalize_lte(struct lookup_table_entry *lte) * reference count reaches 0, it is unlinked from the lookup table. If, * furthermore, the entry has no opened file descriptors associated with it, the * entry is freed. */ -struct lookup_table_entry * -lte_decrement_refcnt(struct lookup_table_entry *lte, struct lookup_table *table) +void lte_decrement_refcnt(struct lookup_table_entry *lte, + struct lookup_table *table) { - if (lte) { - wimlib_assert(lte->refcnt); - if (--lte->refcnt == 0) { - lookup_table_unlink(table, lte); - #ifdef WITH_FUSE - if (lte->num_opened_fds == 0) - #endif - { - finalize_lte(lte); - lte = NULL; - } - } + wimlib_assert(lte != NULL); + wimlib_assert(lte->refcnt != 0); + if (--lte->refcnt == 0) { + lookup_table_unlink(table, lte); + #ifdef WITH_FUSE + if (lte->num_opened_fds == 0) + #endif + finalize_lte(lte); } - return lte; } #ifdef WITH_FUSE -struct lookup_table_entry * -lte_decrement_num_opened_fds(struct lookup_table_entry *lte, - struct lookup_table *table) +void lte_decrement_num_opened_fds(struct lookup_table_entry *lte) { - if (lte) { - wimlib_assert(lte->num_opened_fds); - if (--lte->num_opened_fds == 0 && lte->refcnt == 0) { - lookup_table_unlink(table, lte); - finalize_lte(lte); - lte = NULL; - } - } - return lte; + wimlib_assert(lte != NULL); + wimlib_assert(lte->num_opened_fds != 0); + if (atomic_dec(<e->num_opened_fds) == 0 && lte->refcnt == 0) + finalize_lte(lte); } #endif -/* +/* * Calls a function on all the entries in the lookup table. Stop early and * return nonzero if any call to the function returns nonzero. */ -int for_lookup_table_entry(struct lookup_table *table, +int for_lookup_table_entry(struct lookup_table *table, int (*visitor)(struct lookup_table_entry *, void *), void *arg) { @@ -233,7 +280,8 @@ int read_lookup_table(WIMStruct *w) w->hdr.lookup_table_res_entry.offset, w->hdr.lookup_table_res_entry.original_size); - if (fseeko(w->fp, w->hdr.lookup_table_res_entry.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", w->hdr.lookup_table_res_entry.offset); @@ -266,7 +314,7 @@ int read_lookup_table(WIMStruct *w) } 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); @@ -278,7 +326,6 @@ int read_lookup_table(WIMStruct *w) w->hdr.part_number, cur_entry->part_number); ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY; goto out_free_cur_entry; - } if (is_zero_hash(cur_entry->hash)) { @@ -288,8 +335,15 @@ int read_lookup_table(WIMStruct *w) goto out_free_cur_entry; } + /* Ordinarily, no two streams should share the same SHA1 message + * digest. However, this constraint can be broken for metadata + * resources--- two identical images will have the same metadata + * resource, but their lookup table entries are not shared. */ duplicate_entry = __lookup_resource(table, cur_entry->hash); - if (duplicate_entry) { + if (duplicate_entry + && !((duplicate_entry->resource_entry.flags & WIM_RESHDR_FLAG_METADATA) + && cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_METADATA)) + { ERROR("The WIM lookup table contains two entries with the " "same SHA1 message digest!"); ERROR("The first entry is:"); @@ -302,7 +356,7 @@ int read_lookup_table(WIMStruct *w) if (!(cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED) && (cur_entry->resource_entry.size != - cur_entry->resource_entry.original_size)) + cur_entry->resource_entry.original_size)) { ERROR("Found uncompressed resource with original size " "not the same as compressed size"); @@ -325,7 +379,7 @@ out: } -/* +/* * Writes a lookup table entry to the output file. */ int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out) @@ -382,11 +436,11 @@ void print_lookup_table_entry(const struct lookup_table_entry *lte) putchar('\n'); return; } - printf("Offset = %"PRIu64" bytes\n", + printf("Offset = %"PRIu64" bytes\n", lte->resource_entry.offset); - printf("Size = %"PRIu64" bytes\n", + printf("Size = %"PRIu64" bytes\n", (u64)lte->resource_entry.size); - printf("Original size = %"PRIu64" bytes\n", + printf("Original size = %"PRIu64" bytes\n", lte->resource_entry.original_size); printf("Part Number = %hu\n", lte->part_number); printf("Reference Count = %u\n", lte->refcnt); @@ -431,16 +485,16 @@ static int do_print_lookup_table_entry(struct lookup_table_entry *lte, } /* - * Prints the lookup table of a WIM file. + * Prints the lookup table of a WIM file. */ WIMLIBAPI void wimlib_print_lookup_table(WIMStruct *w) { - for_lookup_table_entry(w->lookup_table, + for_lookup_table_entry(w->lookup_table, do_print_lookup_table_entry, NULL); } -/* +/* * Looks up an entry in the lookup table. */ struct lookup_table_entry * @@ -450,6 +504,9 @@ __lookup_resource(const struct lookup_table *table, const u8 hash[]) struct lookup_table_entry *lte; struct hlist_node *pos; + wimlib_assert(table != NULL); + wimlib_assert(hash != NULL); + i = *(size_t*)hash % table->capacity; hlist_for_each_entry(lte, pos, &table->array[i], hash_list) if (hashes_equal(hash, lte->hash)) @@ -458,7 +515,7 @@ __lookup_resource(const struct lookup_table *table, const u8 hash[]) } #ifdef WITH_FUSE -/* +/* * Finds the dentry, lookup table entry, and stream index for a WIM file stream, * given a path name. * @@ -491,7 +548,7 @@ int lookup_resource(WIMStruct *w, const char *path, if (!dentry) return -ENOENT; - inode = dentry->inode; + inode = dentry->d_inode; wimlib_assert(inode->resolved); @@ -530,6 +587,8 @@ static void inode_resolve_ltes(struct inode *inode, struct lookup_table *table) { struct lookup_table_entry *lte; + wimlib_assert(!inode->resolved); + /* Resolve the default file stream */ lte = __lookup_resource(table, inode->hash); inode->lte = lte; @@ -543,7 +602,25 @@ static void inode_resolve_ltes(struct inode *inode, struct lookup_table *table) } } -/* Resolve a dentry's lookup table entries +static void inode_unresolve_ltes(struct inode *inode) +{ + wimlib_assert(inode->resolved); + if (inode->lte) + copy_hash(inode->hash, inode->lte->hash); + else + zero_out_hash(inode->hash); + + for (u16 i = 0; i < inode->num_ads; i++) { + if (inode->ads_entries[i].lte) + copy_hash(inode->ads_entries[i].hash, + inode->ads_entries[i].lte->hash); + else + zero_out_hash(inode->ads_entries[i].hash); + } + inode->resolved = false; +} + +/* Resolve a dentry's lookup table entries * * This replaces the SHA1 hash fields (which are used to lookup an entry in the * lookup table) with pointers directly to the lookup table entries. A circular @@ -554,8 +631,15 @@ static void inode_resolve_ltes(struct inode *inode, struct lookup_table *table) */ int dentry_resolve_ltes(struct dentry *dentry, void *table) { - if (!dentry->inode->resolved) - inode_resolve_ltes(dentry->inode, table); + if (!dentry->d_inode->resolved) + inode_resolve_ltes(dentry->d_inode, table); + return 0; +} + +int dentry_unresolve_ltes(struct dentry *dentry, void *ignore) +{ + if (dentry->d_inode->resolved) + inode_unresolve_ltes(dentry->d_inode); return 0; } @@ -568,8 +652,8 @@ int dentry_resolve_ltes(struct dentry *dentry, void *table) * data stream in one of the alternate data streams instead of inside the WIM * dentry itself. So we need to check the alternate data streams too. * - * Also, note that a dentry may appear to have than one unnamed stream, but if - * the SHA1 message digest is all 0's then the corresponding stream does not + * Also, note that a dentry may appear to have more than one unnamed stream, but + * if the SHA1 message digest is all 0's then the corresponding stream does not * really "count" (this is the case for the inode's own file stream when the * file stream that should be there is actually in one of the alternate stream * entries.). This is despite the fact that we may need to extract such a