X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flookup_table.c;h=54b5d7567dc5d8b3342a270465f52c7b3f0ef22a;hp=92fb8a9f178b0713bea0b6000e2fbc18b781edd6;hb=67f45cecd793345416d5d85fbe37ec54b1bb6ef8;hpb=c6127ff151b2963c5b90e4018f08f53051a97dfd diff --git a/src/lookup_table.c b/src/lookup_table.c index 92fb8a9f..54b5d756 100644 --- a/src/lookup_table.c +++ b/src/lookup_table.c @@ -11,16 +11,16 @@ * This file is part of wimlib, a library for working with WIM files. * * wimlib 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 2.1 of the License, or (at your option) + * 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 Lesser General Public License for more + * A PARTICULAR PURPOSE. See the GNU General Public License for more * details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ @@ -73,11 +73,32 @@ struct lookup_table_entry *new_lookup_table_entry() void free_lookup_table_entry(struct lookup_table_entry *lte) { if (lte) { +#ifdef WITH_FUSE if (lte->staging_list.next) list_del(<e->staging_list); - if (lte->resource_location != RESOURCE_IN_WIM && - lte->resource_location != RESOURCE_NONEXISTENT) +#endif + switch (lte->resource_location) { + case RESOURCE_IN_STAGING_FILE: + case RESOURCE_IN_ATTACHED_BUFFER: + case RESOURCE_IN_FILE_ON_DISK: + wimlib_assert(((void*)<e->file_on_disk == + (void*)<e->staging_file_name) + && ((void*)<e->file_on_disk == + (void*)<e->attached_buffer)); FREE(lte->file_on_disk); + break; +#ifdef WITH_NTFS_3G + case RESOURCE_IN_NTFS_VOLUME: + if (lte->ntfs_loc) { + FREE(lte->ntfs_loc->path_utf8); + FREE(lte->ntfs_loc->stream_name_utf16); + FREE(lte->ntfs_loc); + } + break; +#endif + default: + break; + } FREE(lte); } } @@ -92,7 +113,7 @@ static int do_free_lookup_table_entry(struct lookup_table_entry *entry, void free_lookup_table(struct lookup_table *table) { - DEBUG("Freeing lookup table"); + DEBUG2("Freeing lookup table"); if (table) { if (table->array) { for_lookup_table_entry(table, @@ -133,7 +154,10 @@ lte_decrement_refcnt(struct lookup_table_entry *lte, struct lookup_table *table) wimlib_assert(lte->refcnt); if (--lte->refcnt == 0) { lookup_table_unlink(table, lte); - if (lte->num_opened_fds == 0) { + #ifdef WITH_FUSE + if (lte->num_opened_fds == 0) + #endif + { free_lookup_table_entry(lte); lte = NULL; } @@ -176,6 +200,7 @@ int read_lookup_table(WIMStruct *w) u8 buf[WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE]; int ret; struct lookup_table *table; + struct lookup_table_entry *cur_entry = NULL, *duplicate_entry; DEBUG("Reading lookup table: offset %"PRIu64", size %"PRIu64"", w->hdr.lookup_table_res_entry.offset, @@ -196,7 +221,6 @@ int read_lookup_table(WIMStruct *w) while (num_entries--) { 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)) { @@ -221,12 +245,20 @@ int read_lookup_table(WIMStruct *w) p = get_u32(p, &cur_entry->refcnt); p = get_bytes(p, SHA1_HASH_SIZE, cur_entry->hash); + if (cur_entry->part_number != w->hdr.part_number) { + ERROR("A lookup table entry in part %hu of the WIM " + "points to part %hu", + 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)) { ERROR("The WIM lookup table contains an entry with a " "SHA1 message digest of all 0's"); ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY; - FREE(cur_entry); - goto out; + goto out_free_cur_entry; } duplicate_entry = __lookup_resource(table, cur_entry->hash); @@ -238,10 +270,8 @@ int read_lookup_table(WIMStruct *w) ERROR("The second entry is:"); print_lookup_table_entry(cur_entry); ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY; - FREE(cur_entry); - goto out; + goto out_free_cur_entry; } - lookup_table_insert(table, cur_entry); if (!(cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED) && (cur_entry->resource_entry.size != @@ -252,12 +282,16 @@ int read_lookup_table(WIMStruct *w) 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; + goto out_free_cur_entry; } + lookup_table_insert(table, cur_entry); + } DEBUG("Done reading lookup table."); w->lookup_table = table; return 0; +out_free_cur_entry: + FREE(cur_entry); out: free_lookup_table(table); return ret; @@ -344,6 +378,8 @@ void print_lookup_table_entry(const struct lookup_table_entry *lte) case RESOURCE_IN_STAGING_FILE: printf("Staging File = `%s'\n", lte->staging_file_name); break; + default: + break; } putchar('\n'); } @@ -386,7 +422,7 @@ __lookup_resource(const struct lookup_table *table, const u8 hash[]) * Finds the dentry, lookup table entry, and stream index for a WIM file stream, * given a path name. * - * This is only for pre-resolved dentries. + * This is only for pre-resolved inodes. */ int lookup_resource(WIMStruct *w, const char *path, int lookup_flags, @@ -397,7 +433,8 @@ int lookup_resource(WIMStruct *w, const char *path, struct dentry *dentry; struct lookup_table_entry *lte; unsigned stream_idx; - const char *stream_name; + const char *stream_name = NULL; + struct inode *inode; char *p = NULL; if (lookup_flags & LOOKUP_FLAG_ADS_OK) { @@ -414,22 +451,25 @@ int lookup_resource(WIMStruct *w, const char *path, if (!dentry) return -ENOENT; - wimlib_assert(dentry->resolved); + inode = dentry->inode; + + wimlib_assert(inode->resolved); - lte = dentry->lte; if (!(lookup_flags & LOOKUP_FLAG_DIRECTORY_OK) - && dentry_is_directory(dentry)) + && inode_is_directory(inode)) return -EISDIR; + + lte = inode->lte; stream_idx = 0; 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], + for (u16 i = 0; i < inode->num_ads; i++) { + if (ads_entry_has_name(inode->ads_entries[i], stream_name, stream_name_len)) { stream_idx = i + 1; - lte = dentry->ads_entries[i].lte; + lte = inode->ads_entries[i]->lte; goto out; } } @@ -445,6 +485,36 @@ out: return 0; } +static int inode_resolve_ltes(struct inode *inode, struct lookup_table *table) +{ + struct lookup_table_entry *lte; + + /* Resolve the default file stream */ + lte = __lookup_resource(table, inode->hash); + if (lte) + list_add(&inode->lte_group_list.list, <e->lte_group_list); + else + INIT_LIST_HEAD(&inode->lte_group_list.list); + inode->lte = lte; + inode->lte_group_list.type = STREAM_TYPE_NORMAL; + inode->resolved = true; + + /* Resolve the alternate data streams */ + for (u16 i = 0; i < inode->num_ads; i++) { + struct ads_entry *cur_entry = inode->ads_entries[i]; + + lte = __lookup_resource(table, cur_entry->hash); + if (lte) + list_add(&cur_entry->lte_group_list.list, + <e->lte_group_list); + else + INIT_LIST_HEAD(&cur_entry->lte_group_list.list); + cur_entry->lte = lte; + cur_entry->lte_group_list.type = STREAM_TYPE_ADS; + } + return 0; +} + /* Resolve a dentry's lookup table entries * * This replaces the SHA1 hash fields (which are used to lookup an entry in the @@ -454,65 +524,40 @@ out: * This function always succeeds; unresolved lookup table entries are given a * NULL pointer. */ -int dentry_resolve_ltes(struct dentry *dentry, void *__table) +int dentry_resolve_ltes(struct dentry *dentry, void *table) { - struct lookup_table *table = __table; - struct lookup_table_entry *lte; - - if (dentry->resolved) + if (dentry->inode->resolved) return 0; - - /* Resolve the default file stream */ - lte = __lookup_resource(table, dentry->hash); - if (lte) - list_add(&dentry->lte_group_list.list, <e->lte_group_list); else - INIT_LIST_HEAD(&dentry->lte_group_list.list); - dentry->lte = lte; - dentry->lte_group_list.type = STREAM_TYPE_NORMAL; - dentry->resolved = true; - - /* Resolve the alternate data streams */ - if (dentry->ads_entries_status != ADS_ENTRIES_USER) { - for (u16 i = 0; i < dentry->num_ads; i++) { - struct ads_entry *cur_entry = &dentry->ads_entries[i]; - - lte = __lookup_resource(table, cur_entry->hash); - if (lte) - list_add(&cur_entry->lte_group_list.list, - <e->lte_group_list); - else - INIT_LIST_HEAD(&cur_entry->lte_group_list.list); - cur_entry->lte = lte; - cur_entry->lte_group_list.type = STREAM_TYPE_ADS; - } - } - return 0; + return inode_resolve_ltes(dentry->inode, table); } -/* Return the lookup table entry for the unnamed data stream of a dentry, or + + + +/* Return the lookup table entry for the unnamed data stream of a inode, or * NULL if there is none. * * You'd think this would be easier than it actually is, since the unnamed data - * stream should be the one referenced from the dentry itself. Alas, if there + * stream should be the one referenced from the inode itself. Alas, if there * are named data streams, Microsoft's "imagex.exe" program will put the unnamed * data stream in one of the alternate data streams instead of inside the - * dentry. So we need to check the alternate data streams too. + * inode. 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 + * Also, note that a inode may appear to have 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 dentry's own file stream when the + * 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 * missing entry as an empty file or empty named data stream. */ struct lookup_table_entry * -dentry_unnamed_lte(const struct dentry *dentry, +inode_unnamed_lte(const struct inode *inode, const struct lookup_table *table) { - if (dentry->resolved) - return dentry_unnamed_lte_resolved(dentry); + if (inode->resolved) + return inode_unnamed_lte_resolved(inode); else - return dentry_unnamed_lte_unresolved(dentry, table); + return inode_unnamed_lte_unresolved(inode, table); }