#include "io.h"
#include <errno.h>
+#ifdef WITH_FUSE
+#include <unistd.h>
+#endif
+
struct lookup_table *new_lookup_table(size_t capacity)
{
struct lookup_table *table;
lte->part_number = 1;
lte->refcnt = 1;
- INIT_LIST_HEAD(<e->lte_group_list);
return lte;
}
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);
-#endif
switch (lte->resource_location) {
case RESOURCE_IN_STAGING_FILE:
case RESOURCE_IN_ATTACHED_BUFFER:
default:
break;
}
+ FREE(lte->extracted_file);
FREE(lte);
}
}
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);
+ wimlib_assert(lte->staging_list.next);
+ wimlib_assert(lte->staging_list.prev);
+ list_del(<e->staging_list);
+ }
+ #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,
* 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
- {
- free_lookup_table_entry(lte);
- lte = NULL;
- }
- }
+ wimlib_assert(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);
}
- return lte;
}
+#ifdef WITH_FUSE
+void lte_decrement_num_opened_fds(struct lookup_table_entry *lte,
+ struct lookup_table *table)
+{
+ wimlib_assert(lte);
+ wimlib_assert(lte->num_opened_fds);
+ if (--lte->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 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;
}
struct lookup_table_entry *lte;
struct hlist_node *pos;
+ wimlib_assert(table);
+
i = *(size_t*)hash % table->capacity;
hlist_for_each_entry(lte, pos, &table->array[i], hash_list)
if (hashes_equal(hash, lte->hash))
return NULL;
}
+#ifdef WITH_FUSE
/*
* Finds the dentry, lookup table entry, and stream index for a WIM file stream,
* given a path name.
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;
if (!dentry)
return -ENOENT;
- inode = dentry->inode;
+ inode = dentry->d_inode;
wimlib_assert(inode->resolved);
&& 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)
*stream_idx_ret = stream_idx;
return 0;
}
+#endif
-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 */
for (u16 i = 0; i < inode->num_ads; i++) {
- struct ads_entry *cur_entry = inode->ads_entries[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
*/
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->d_inode->resolved)
+ inode_resolve_ltes(dentry->d_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
- * 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
git://wimlib.net / wimlib / blobdiff