X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flookup_table.c;h=61cc5a83ab663132dc87b3d581c9b64fefa2862a;hp=54b5d7567dc5d8b3342a270465f52c7b3f0ef22a;hb=63a5804943519281f206ca0fefacfe2b99fc9958;hpb=67f45cecd793345416d5d85fbe37ec54b1bb6ef8 diff --git a/src/lookup_table.c b/src/lookup_table.c index 54b5d756..61cc5a83 100644 --- a/src/lookup_table.c +++ b/src/lookup_table.c @@ -29,6 +29,10 @@ #include "io.h" #include +#ifdef WITH_FUSE +#include +#endif + struct lookup_table *new_lookup_table(size_t capacity) { struct lookup_table *table; @@ -66,7 +70,6 @@ struct lookup_table_entry *new_lookup_table_entry() lte->part_number = 1; lte->refcnt = 1; - INIT_LIST_HEAD(<e->lte_group_list); return lte; } @@ -99,6 +102,7 @@ void free_lookup_table_entry(struct lookup_table_entry *lte) default: break; } + FREE(lte->extracted_file); FREE(lte); } } @@ -141,7 +145,14 @@ void lookup_table_insert(struct lookup_table *table, table->num_entries++; } - +static void finalize_lte(struct lookup_table_entry *lte) +{ + #ifdef WITH_FUSE + if (lte->resource_location == RESOURCE_IN_STAGING_FILE) + unlink(lte->staging_file_name); + #endif + free_lookup_table_entry(lte); +} /* Decrements the reference count for the lookup table entry @lte. If its * reference count reaches 0, it is unlinked from the lookup table. If, @@ -158,7 +169,7 @@ lte_decrement_refcnt(struct lookup_table_entry *lte, struct lookup_table *table) if (lte->num_opened_fds == 0) #endif { - free_lookup_table_entry(lte); + finalize_lte(lte); lte = NULL; } } @@ -166,6 +177,23 @@ lte_decrement_refcnt(struct lookup_table_entry *lte, struct lookup_table *table) return lte; } +#ifdef WITH_FUSE +struct lookup_table_entry * +lte_decrement_num_opened_fds(struct lookup_table_entry *lte, + struct lookup_table *table) +{ + 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; +} +#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. @@ -330,10 +358,22 @@ int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out) } +int lte_zero_real_refcnt(struct lookup_table_entry *lte, void *ignore) +{ + lte->real_refcnt = 0; + return 0; +} + +int lte_zero_out_refcnt(struct lookup_table_entry *lte, void *ignore) +{ + lte->out_refcnt = 0; + return 0; +} -int zero_out_refcnts(struct lookup_table_entry *entry, void *ignore) +int lte_free_extracted_file(struct lookup_table_entry *lte, void *ignone) { - entry->out_refcnt = 0; + FREE(lte->extracted_file); + lte->extracted_file = NULL; return 0; } @@ -428,11 +468,11 @@ int lookup_resource(WIMStruct *w, const char *path, int lookup_flags, struct dentry **dentry_ret, struct lookup_table_entry **lte_ret, - unsigned *stream_idx_ret) + u16 *stream_idx_ret) { struct dentry *dentry; struct lookup_table_entry *lte; - unsigned stream_idx; + u16 stream_idx; const char *stream_name = NULL; struct inode *inode; char *p = NULL; @@ -459,21 +499,21 @@ int lookup_resource(WIMStruct *w, const char *path, && 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 < inode->num_ads; i++) { - if (ads_entry_has_name(inode->ads_entries[i], - stream_name, - stream_name_len)) - { - stream_idx = i + 1; - lte = inode->ads_entries[i]->lte; - goto out; - } + struct ads_entry *ads_entry; + u16 ads_idx; + ads_entry = inode_get_ads_entry(inode, stream_name, + &ads_idx); + if (ads_entry) { + stream_idx = ads_idx + 1; + lte = ads_entry->lte; + goto out; + } else { + return -ENOENT; } - return -ENOENT; + } else { + lte = inode->lte; + stream_idx = 0; } out: if (dentry_ret) @@ -485,18 +525,13 @@ out: return 0; } -static int inode_resolve_ltes(struct inode *inode, struct lookup_table *table) +static void 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 */ @@ -504,15 +539,8 @@ static int inode_resolve_ltes(struct inode *inode, struct lookup_table *table) 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 @@ -526,25 +554,21 @@ static int inode_resolve_ltes(struct inode *inode, struct lookup_table *table) */ int dentry_resolve_ltes(struct dentry *dentry, void *table) { - if (dentry->inode->resolved) - return 0; - else - return inode_resolve_ltes(dentry->inode, table); + if (!dentry->inode->resolved) + inode_resolve_ltes(dentry->inode, table); + return 0; } - - - -/* Return the lookup table entry for the unnamed data stream of a inode, or +/* Return the lookup table entry for the unnamed data stream of an 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 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 - * inode. So we need to check the alternate data streams too. + * 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 inode may appear to have than one unnamed stream, but if + * 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 * 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