struct lookup_table_entry *new_lookup_table_entry()
{
struct lookup_table_entry *lte;
-
+
lte = CALLOC(1, sizeof(struct lookup_table_entry));
if (lte) {
lte->part_number = 1;
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->stream_name_utf16_num_chars * 2);
}
break;
+#endif
+ default:
+ break;
}
return new;
out_free:
* @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;
}
#ifdef WITH_FUSE
-void 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)
{
wimlib_assert(lte);
wimlib_assert(lte->num_opened_fds);
}
#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)
{
}
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);
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:");
}
-/*
+/*
* Writes a lookup table entry to the output file.
*/
int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out)
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);
}
/*
- * 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 *
}
#ifdef WITH_FUSE
-/*
+/*
* Finds the dentry, lookup table entry, and stream index for a WIM file stream,
* given a path name.
*
inode->resolved = false;
}
-/* Resolve a dentry's lookup table entries
+/* 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