X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flookup_table.c;h=b22def2953e58c6dd634de83605ea661007bfefc;hp=67ce92a3f37b79617ac2a9c370e5980c0fe18f9a;hb=4a3cea03c478c289d3b779fe8f8b2f3bb8fbd275;hpb=c92b18f7074e6d632c555bed5897c5723abde720 diff --git a/src/lookup_table.c b/src/lookup_table.c index 67ce92a3..b22def29 100644 --- a/src/lookup_table.c +++ b/src/lookup_table.c @@ -1,12 +1,12 @@ /* * lookup_table.c * - * Lookup table, implemented as a hash table, that maps dentries to file - * resources. + * Lookup table, implemented as a hash table, that maps SHA1 message digests to + * data streams. */ /* - * Copyright (C) 2012 Eric Biggers + * Copyright (C) 2012, 2013 Eric Biggers * * This file is part of wimlib, a library for working with WIM files. * @@ -33,12 +33,13 @@ #include #endif -struct lookup_table *new_lookup_table(size_t capacity) +struct wim_lookup_table * +new_lookup_table(size_t capacity) { - struct lookup_table *table; + struct wim_lookup_table *table; struct hlist_head *array; - table = MALLOC(sizeof(struct lookup_table)); + table = MALLOC(sizeof(struct wim_lookup_table)); if (table) { array = CALLOC(capacity, sizeof(array[0])); if (array) { @@ -55,26 +56,27 @@ struct lookup_table *new_lookup_table(size_t capacity) return table; } -struct lookup_table_entry *new_lookup_table_entry() +struct wim_lookup_table_entry * +new_lookup_table_entry() { - struct lookup_table_entry *lte; + struct wim_lookup_table_entry *lte; - lte = CALLOC(1, sizeof(struct lookup_table_entry)); + lte = CALLOC(1, sizeof(struct wim_lookup_table_entry)); 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)); + sizeof(struct wim_lookup_table_entry)); } return lte; } -struct lookup_table_entry * -clone_lookup_table_entry(const struct lookup_table_entry *old) +struct wim_lookup_table_entry * +clone_lookup_table_entry(const struct wim_lookup_table_entry *old) { - struct lookup_table_entry *new; + struct wim_lookup_table_entry *new; new = MALLOC(sizeof(*new)); if (!new) @@ -83,11 +85,14 @@ clone_lookup_table_entry(const struct lookup_table_entry *old) memcpy(new, old, sizeof(*old)); new->extracted_file = NULL; switch (new->resource_location) { +#ifdef __WIN32__ + case RESOURCE_WIN32: +#endif 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); + BUILD_BUG_ON((void*)&old->file_on_disk != + (void*)&old->staging_file_name); + new->staging_file_name = TSTRDUP(old->staging_file_name); if (!new->staging_file_name) goto out_free; break; @@ -106,18 +111,18 @@ clone_lookup_table_entry(const struct lookup_table_entry *old) if (!loc) goto out_free; memcpy(loc, old->ntfs_loc, sizeof(*loc)); - loc->path_utf8 = NULL; - loc->stream_name_utf16 = NULL; + loc->path = NULL; + loc->stream_name = NULL; new->ntfs_loc = loc; - loc->path_utf8 = STRDUP(old->ntfs_loc->path_utf8); - if (!loc->path_utf8) + loc->path = STRDUP(old->ntfs_loc->path); + if (!loc->path) goto out_free; - loc->stream_name_utf16 = MALLOC(loc->stream_name_utf16_num_chars * 2); - if (!loc->stream_name_utf16) + loc->stream_name = MALLOC((loc->stream_name_nchars + 1) * 2); + if (!loc->stream_name) goto out_free; - memcpy(loc->stream_name_utf16, - old->ntfs_loc->stream_name_utf16, - loc->stream_name_utf16_num_chars * 2); + memcpy(loc->stream_name, + old->ntfs_loc->stream_name, + (loc->stream_name_nchars + 1) * 2); } break; #endif @@ -130,24 +135,28 @@ out_free: return NULL; } -void free_lookup_table_entry(struct lookup_table_entry *lte) +void +free_lookup_table_entry(struct wim_lookup_table_entry *lte) { if (lte) { 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)); +#ifdef __WIN32__ + case RESOURCE_WIN32: +#endif + BUILD_BUG_ON((void*)<e->file_on_disk != + (void*)<e->staging_file_name); + BUILD_BUG_ON((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->path); + FREE(lte->ntfs_loc->stream_name); FREE(lte->ntfs_loc); } break; @@ -159,15 +168,16 @@ void free_lookup_table_entry(struct lookup_table_entry *lte) } } -static int do_free_lookup_table_entry(struct lookup_table_entry *entry, - void *ignore) +static int +do_free_lookup_table_entry(struct wim_lookup_table_entry *entry, void *ignore) { free_lookup_table_entry(entry); return 0; } -void free_lookup_table(struct lookup_table *table) +void +free_lookup_table(struct wim_lookup_table *table) { DEBUG2("Freeing lookup table"); if (table) { @@ -185,10 +195,11 @@ void free_lookup_table(struct lookup_table *table) * Inserts an entry into the lookup table. * * @table: A pointer to the lookup table. - * @entry: A pointer to the entry to insert. + * @lte: A pointer to the entry to insert. */ -void lookup_table_insert(struct lookup_table *table, - struct lookup_table_entry *lte) +void +lookup_table_insert(struct wim_lookup_table *table, + struct wim_lookup_table_entry *lte) { size_t i = lte->hash_short % table->capacity; hlist_add_head(<e->hash_list, &table->array[i]); @@ -197,13 +208,12 @@ void lookup_table_insert(struct lookup_table *table, table->num_entries++; } -static void finalize_lte(struct lookup_table_entry *lte) +static void +finalize_lte(struct wim_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 @@ -214,8 +224,9 @@ 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. */ -void lte_decrement_refcnt(struct lookup_table_entry *lte, - struct lookup_table *table) +void +lte_decrement_refcnt(struct wim_lookup_table_entry *lte, + struct wim_lookup_table *table) { wimlib_assert(lte != NULL); wimlib_assert(lte->refcnt != 0); @@ -229,25 +240,23 @@ void lte_decrement_refcnt(struct lookup_table_entry *lte, } #ifdef WITH_FUSE -void lte_decrement_num_opened_fds(struct lookup_table_entry *lte) +void +lte_decrement_num_opened_fds(struct wim_lookup_table_entry *lte) { - wimlib_assert(lte != NULL); - if (lte->num_opened_fds != 0) { + if (lte->num_opened_fds != 0) 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 for_lookup_table_entry(struct lookup_table *table, - int (*visitor)(struct lookup_table_entry *, void *), - void *arg) +/* Calls a function on all the entries in the WIM lookup table. Stop early and + * return nonzero if any call to the function returns nonzero. */ +int +for_lookup_table_entry(struct wim_lookup_table *table, + int (*visitor)(struct wim_lookup_table_entry *, void *), + void *arg) { - struct lookup_table_entry *lte; + struct wim_lookup_table_entry *lte; struct hlist_node *pos, *tmp; int ret; @@ -255,6 +264,7 @@ int for_lookup_table_entry(struct lookup_table *table, hlist_for_each_entry_safe(lte, pos, tmp, &table->array[i], hash_list) { + wimlib_assert2(!(lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA)); ret = visitor(lte, arg); if (ret != 0) return ret; @@ -266,14 +276,19 @@ int for_lookup_table_entry(struct lookup_table *table, /* * Reads the lookup table from a WIM file. + * + * Saves lookup table entries for non-metadata streams in a hash table, and + * saves the metadata entry for each image in a special per-image location (the + * image_metadata array). */ -int read_lookup_table(WIMStruct *w) +int +read_lookup_table(WIMStruct *w) { u64 num_entries; u8 buf[WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE]; int ret; - struct lookup_table *table; - struct lookup_table_entry *cur_entry = NULL, *duplicate_entry; + struct wim_lookup_table *table; + struct wim_lookup_table_entry *cur_entry, *duplicate_entry; if (resource_is_compressed(&w->hdr.lookup_table_res_entry)) { ERROR("Didn't expect a compressed lookup table!"); @@ -299,6 +314,7 @@ int read_lookup_table(WIMStruct *w) if (!table) return WIMLIB_ERR_NOMEM; + w->current_image = 0; while (num_entries--) { const u8 *p; @@ -310,16 +326,16 @@ int read_lookup_table(WIMStruct *w) "table"); } ret = WIMLIB_ERR_READ; - goto out; + goto out_free_lookup_table; } cur_entry = new_lookup_table_entry(); if (!cur_entry) { ret = WIMLIB_ERR_NOMEM; - goto out; + goto out_free_lookup_table; } + 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); @@ -340,54 +356,97 @@ 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 - && !((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:"); - print_lookup_table_entry(duplicate_entry); - ERROR("The second entry is:"); - print_lookup_table_entry(cur_entry); - ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY; - goto out_free_cur_entry; - } - if (!(cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED) && (cur_entry->resource_entry.size != cur_entry->resource_entry.original_size)) { + #ifdef ENABLE_ERROR_MESSAGES ERROR("Found uncompressed resource with original size " "not the same as compressed size"); ERROR("The lookup table entry for the resource is as follows:"); - print_lookup_table_entry(cur_entry); + print_lookup_table_entry(cur_entry, stderr); + #endif ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY; goto out_free_cur_entry; } - if ((cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_METADATA) - && cur_entry->refcnt != 1) - { - ERROR("Found metadata resource with refcnt != 1:"); - print_lookup_table_entry(cur_entry); - ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY; - goto out_free_cur_entry; + + if (cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_METADATA) { + /* Lookup table entry for a metadata resource */ + if (cur_entry->refcnt != 1) { + #ifdef ENABLE_ERROR_MESSAGES + ERROR("Found metadata resource with refcnt != 1:"); + print_lookup_table_entry(cur_entry, stderr); + #endif + ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY; + goto out_free_cur_entry; + } + + if (w->hdr.part_number != 1) { + ERROR("Found a metadata resource in a " + "non-first part of the split WIM!"); + ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY; + goto out_free_cur_entry; + } + if (w->current_image == w->hdr.image_count) { + ERROR("The WIM header says there are %u images " + "in the WIM, but we found more metadata " + "resources than this", w->hdr.image_count); + ret = WIMLIB_ERR_IMAGE_COUNT; + goto out_free_cur_entry; + } + + /* Notice very carefully: We are assigning the metadata + * resources in the exact order mirrored by their lookup + * table entries on disk, which is the behavior of + * Microsoft's software. In particular, this overrides + * the actual locations of the metadata resources + * themselves in the WIM file as well as any information + * written in the XML data. */ + DEBUG("Found metadata resource for image %u at " + "offset %"PRIu64".", + w->current_image + 1, + cur_entry->resource_entry.offset); + w->image_metadata[ + w->current_image++].metadata_lte = cur_entry; + } else { + /* Lookup table entry for a stream that is not a + * metadata resource */ + duplicate_entry = __lookup_resource(table, cur_entry->hash); + if (duplicate_entry) { + #ifdef ENABLE_ERROR_MESSAGES + ERROR("The WIM lookup table contains two entries with the " + "same SHA1 message digest!"); + ERROR("The first entry is:"); + print_lookup_table_entry(duplicate_entry, stderr); + ERROR("The second entry is:"); + print_lookup_table_entry(cur_entry, stderr); + #endif + ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY; + goto out_free_cur_entry; + } + lookup_table_insert(table, cur_entry); } - lookup_table_insert(table, cur_entry); + } + if (w->hdr.part_number == 1 && + w->current_image != w->hdr.image_count) + { + ERROR("The WIM header says there are %u images " + "in the WIM, but we only found %d metadata " + "resources!", w->hdr.image_count, w->current_image); + ret = WIMLIB_ERR_IMAGE_COUNT; + goto out_free_lookup_table; } DEBUG("Done reading lookup table."); w->lookup_table = table; - return 0; + ret = 0; + goto out; out_free_cur_entry: FREE(cur_entry); -out: +out_free_lookup_table: free_lookup_table(table); +out: + w->current_image = 0; return ret; } @@ -395,22 +454,25 @@ out: /* * Writes a lookup table entry to the output file. */ -int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out) +int +write_lookup_table_entry(struct wim_lookup_table_entry *lte, void *_out) { FILE *out; u8 buf[WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE]; u8 *p; - out = __out; + out = _out; /* Don't write entries that have not had file resources or metadata * resources written for them. */ if (lte->out_refcnt == 0) return 0; - if (lte->output_resource_entry.flags & WIM_RESHDR_FLAG_METADATA) - DEBUG("Writing metadata entry at %lu (orig size = %zu)", + if (lte->output_resource_entry.flags & WIM_RESHDR_FLAG_METADATA) { + DEBUG("Writing metadata entry at %"PRIu64" " + "(orig size = %"PRIu64")", ftello(out), lte->output_resource_entry.original_size); + } p = put_resource_entry(buf, <e->output_resource_entry); p = put_u16(p, lte->part_number); @@ -423,21 +485,44 @@ int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out) return 0; } -/* Writes the lookup table to the output file. */ -int write_lookup_table(struct lookup_table *table, FILE *out, - struct resource_entry *out_res_entry) +/* Writes the WIM lookup table to the output file. */ +int +write_lookup_table(WIMStruct *w, int image, struct resource_entry *out_res_entry) { + FILE *out = w->out_fp; off_t start_offset, end_offset; int ret; + int start_image, end_image; start_offset = ftello(out); if (start_offset == -1) return WIMLIB_ERR_WRITE; - ret = for_lookup_table_entry(table, write_lookup_table_entry, out); - if (ret != 0) + /* Write lookup table entries for metadata resources */ + if (image == WIMLIB_ALL_IMAGES) { + start_image = 1; + end_image = w->hdr.image_count; + } else { + start_image = image; + end_image = image; + } + for (int i = start_image; i <= end_image; i++) { + struct wim_lookup_table_entry *metadata_lte; + + metadata_lte = w->image_metadata[i - 1].metadata_lte; + metadata_lte->out_refcnt = 1; + metadata_lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_METADATA; + ret = write_lookup_table_entry(metadata_lte, out); + if (ret) + return ret; + } + + /* Write lookup table entries for other resources */ + ret = for_lookup_table_entry(w->lookup_table, write_lookup_table_entry, out); + if (ret) return ret; + /* Fill in the resource entry for the lookup table itself */ end_offset = ftello(out); if (end_offset == -1) return WIMLIB_ERR_WRITE; @@ -446,30 +531,26 @@ int write_lookup_table(struct lookup_table *table, FILE *out, out_res_entry->size = end_offset - start_offset; out_res_entry->original_size = end_offset - start_offset; out_res_entry->flags = WIM_RESHDR_FLAG_METADATA; - return 0; } -int lte_zero_real_refcnt(struct lookup_table_entry *lte, void *ignore) +int +lte_zero_real_refcnt(struct wim_lookup_table_entry *lte, void *ignore) { lte->real_refcnt = 0; return 0; } -int lte_zero_out_refcnt(struct lookup_table_entry *lte, void *ignore) +int +lte_zero_out_refcnt(struct wim_lookup_table_entry *lte, void *ignore) { lte->out_refcnt = 0; return 0; } -int lte_zero_extracted_file(struct lookup_table_entry *lte, void *ignore) -{ - lte->extracted_file = NULL; - return 0; -} - -int lte_free_extracted_file(struct lookup_table_entry *lte, void *ignore) +int +lte_free_extracted_file(struct wim_lookup_table_entry *lte, void *ignore) { if (lte->extracted_file != NULL) { FREE(lte->extracted_file); @@ -478,78 +559,89 @@ int lte_free_extracted_file(struct lookup_table_entry *lte, void *ignore) return 0; } -void print_lookup_table_entry(const struct lookup_table_entry *lte) +void +print_lookup_table_entry(const struct wim_lookup_table_entry *lte, FILE *out) { if (!lte) { - putchar('\n'); + tputc(T('\n'), out); return; } - printf("Offset = %"PRIu64" bytes\n", - lte->resource_entry.offset); - printf("Size = %"PRIu64" bytes\n", - (u64)lte->resource_entry.size); - 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); - printf("Hash = 0x"); - print_hash(lte->hash); - putchar('\n'); - printf("Flags = "); + tfprintf(out, T("Offset = %"PRIu64" bytes\n"), + lte->resource_entry.offset); + + tfprintf(out, T("Size = %"PRIu64" bytes\n"), + (u64)lte->resource_entry.size); + + tfprintf(out, T("Original size = %"PRIu64" bytes\n"), + lte->resource_entry.original_size); + + tfprintf(out, T("Part Number = %hu\n"), lte->part_number); + tfprintf(out, T("Reference Count = %u\n"), lte->refcnt); + + tfprintf(out, T("Hash = 0x")); + print_hash(lte->hash, out); + tputc(T('\n'), out); + + tfprintf(out, T("Flags = ")); u8 flags = lte->resource_entry.flags; if (flags & WIM_RESHDR_FLAG_COMPRESSED) - fputs("WIM_RESHDR_FLAG_COMPRESSED, ", stdout); + tfputs(T("WIM_RESHDR_FLAG_COMPRESSED, "), out); if (flags & WIM_RESHDR_FLAG_FREE) - fputs("WIM_RESHDR_FLAG_FREE, ", stdout); + tfputs(T("WIM_RESHDR_FLAG_FREE, "), out); if (flags & WIM_RESHDR_FLAG_METADATA) - fputs("WIM_RESHDR_FLAG_METADATA, ", stdout); + tfputs(T("WIM_RESHDR_FLAG_METADATA, "), out); if (flags & WIM_RESHDR_FLAG_SPANNED) - fputs("WIM_RESHDR_FLAG_SPANNED, ", stdout); - putchar('\n'); + tfputs(T("WIM_RESHDR_FLAG_SPANNED, "), out); + tputc(T('\n'), out); switch (lte->resource_location) { case RESOURCE_IN_WIM: if (lte->wim->filename) { - printf("WIM file = `%s'\n", - lte->wim->filename); + tfprintf(out, T("WIM file = `%"TS"'\n"), + lte->wim->filename); } break; +#ifdef __WIN32__ + case RESOURCE_WIN32: +#endif case RESOURCE_IN_FILE_ON_DISK: - printf("File on Disk = `%s'\n", lte->file_on_disk); + tfprintf(out, T("File on Disk = `%"TS"'\n"), + lte->file_on_disk); break; case RESOURCE_IN_STAGING_FILE: - printf("Staging File = `%s'\n", lte->staging_file_name); + tfprintf(out, T("Staging File = `%"TS"'\n"), + lte->staging_file_name); break; default: break; } - putchar('\n'); + tputc(T('\n'), out); } -static int do_print_lookup_table_entry(struct lookup_table_entry *lte, - void *ignore) +static int +do_print_lookup_table_entry(struct wim_lookup_table_entry *lte, void *fp) { - print_lookup_table_entry(lte); + print_lookup_table_entry(lte, (FILE*)fp); return 0; } /* * Prints the lookup table of a WIM file. */ -WIMLIBAPI void wimlib_print_lookup_table(WIMStruct *w) +WIMLIBAPI void +wimlib_print_lookup_table(WIMStruct *w) { for_lookup_table_entry(w->lookup_table, do_print_lookup_table_entry, - NULL); + stdout); } -/* - * Looks up an entry in the lookup table. - */ -struct lookup_table_entry * -__lookup_resource(const struct lookup_table *table, const u8 hash[]) +/* Given a SHA1 message digest, return the corresponding entry in the WIM's + * lookup table, or NULL if there is none. */ +struct wim_lookup_table_entry * +__lookup_resource(const struct wim_lookup_table *table, const u8 hash[]) { size_t i; - struct lookup_table_entry *lte; + struct wim_lookup_table_entry *lte; struct hlist_node *pos; wimlib_assert(table != NULL); @@ -569,43 +661,45 @@ __lookup_resource(const struct lookup_table *table, const u8 hash[]) * * This is only for pre-resolved inodes. */ -int lookup_resource(WIMStruct *w, const char *path, - int lookup_flags, - struct dentry **dentry_ret, - struct lookup_table_entry **lte_ret, - u16 *stream_idx_ret) +int +lookup_resource(WIMStruct *w, + const tchar *path, + int lookup_flags, + struct wim_dentry **dentry_ret, + struct wim_lookup_table_entry **lte_ret, + u16 *stream_idx_ret) { - struct dentry *dentry; - struct lookup_table_entry *lte; + struct wim_dentry *dentry; + struct wim_lookup_table_entry *lte; u16 stream_idx; - const char *stream_name = NULL; - struct inode *inode; - char *p = NULL; + const tchar *stream_name = NULL; + struct wim_inode *inode; + tchar *p = NULL; if (lookup_flags & LOOKUP_FLAG_ADS_OK) { stream_name = path_stream_name(path); if (stream_name) { - p = (char*)stream_name - 1; - *p = '\0'; + p = (tchar*)stream_name - 1; + *p = T('\0'); } } dentry = get_dentry(w, path); if (p) - *p = ':'; + *p = T(':'); if (!dentry) - return -ENOENT; + return -errno; inode = dentry->d_inode; - wimlib_assert(inode->resolved); + wimlib_assert(inode->i_resolved); if (!(lookup_flags & LOOKUP_FLAG_DIRECTORY_OK) && inode_is_directory(inode)) return -EISDIR; if (stream_name) { - struct ads_entry *ads_entry; + struct wim_ads_entry *ads_entry; u16 ads_idx; ads_entry = inode_get_ads_entry(inode, stream_name, &ads_idx); @@ -617,7 +711,7 @@ int lookup_resource(WIMStruct *w, const char *path, return -ENOENT; } } else { - lte = inode->lte; + lte = inode->i_lte; stream_idx = 0; } out: @@ -631,78 +725,67 @@ out: } #endif -void inode_resolve_ltes(struct inode *inode, struct lookup_table *table) +/* Resolve an inode'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 + * linked list of streams sharing the same lookup table entry is created. + * + * This function always succeeds; unresolved lookup table entries are given a + * NULL pointer. + */ +void +inode_resolve_ltes(struct wim_inode *inode, struct wim_lookup_table *table) { - if (!inode->resolved) { - struct lookup_table_entry *lte; + if (!inode->i_resolved) { + struct wim_lookup_table_entry *lte; /* Resolve the default file stream */ - lte = __lookup_resource(table, inode->hash); - inode->lte = lte; - inode->resolved = 1; + lte = __lookup_resource(table, inode->i_hash); + inode->i_lte = lte; + inode->i_resolved = 1; /* Resolve the alternate data streams */ - for (u16 i = 0; i < inode->num_ads; i++) { - struct ads_entry *cur_entry = &inode->ads_entries[i]; + for (u16 i = 0; i < inode->i_num_ads; i++) { + struct wim_ads_entry *cur_entry = &inode->i_ads_entries[i]; lte = __lookup_resource(table, cur_entry->hash); cur_entry->lte = lte; } } } -void inode_unresolve_ltes(struct inode *inode) +void +inode_unresolve_ltes(struct wim_inode *inode) { - if (inode->resolved) { - if (inode->lte) - copy_hash(inode->hash, inode->lte->hash); + if (inode->i_resolved) { + if (inode->i_lte) + copy_hash(inode->i_hash, inode->i_lte->hash); else - zero_out_hash(inode->hash); + zero_out_hash(inode->i_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); + for (u16 i = 0; i < inode->i_num_ads; i++) { + if (inode->i_ads_entries[i].lte) + copy_hash(inode->i_ads_entries[i].hash, + inode->i_ads_entries[i].lte->hash); else - zero_out_hash(inode->ads_entries[i].hash); + zero_out_hash(inode->i_ads_entries[i].hash); } - inode->resolved = 0; + inode->i_resolved = 0; } } -/* 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 - * linked list of streams sharing the same lookup table entry is created. - * - * This function always succeeds; unresolved lookup table entries are given a - * NULL pointer. - */ -int dentry_resolve_ltes(struct dentry *dentry, void *table) -{ - wimlib_assert(dentry->refcnt == 1); - inode_resolve_ltes(dentry->d_inode, table); - return 0; -} - -int dentry_unresolve_ltes(struct dentry *dentry, void *ignore) -{ - inode_unresolve_ltes(dentry->d_inode); - return 0; -} - /* * Returns the lookup table entry for stream @stream_idx of the inode, where * stream_idx = 0 means the default un-named file stream, and stream_idx >= 1 * corresponds to an alternate data stream. * - * This works for both resolved and un-resolved dentries. + * This works for both resolved and un-resolved inodes. */ -struct lookup_table_entry * -inode_stream_lte(const struct inode *inode, unsigned stream_idx, - const struct lookup_table *table) +struct wim_lookup_table_entry * +inode_stream_lte(const struct wim_inode *inode, unsigned stream_idx, + const struct wim_lookup_table *table) { - if (inode->resolved) + if (inode->i_resolved) return inode_stream_lte_resolved(inode, stream_idx); else return inode_stream_lte_unresolved(inode, stream_idx, table); @@ -725,24 +808,25 @@ inode_stream_lte(const struct inode *inode, unsigned stream_idx, * 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 * -inode_unnamed_lte(const struct inode *inode, - const struct lookup_table *table) +struct wim_lookup_table_entry * +inode_unnamed_lte(const struct wim_inode *inode, + const struct wim_lookup_table *table) { - if (inode->resolved) + if (inode->i_resolved) return inode_unnamed_lte_resolved(inode); else return inode_unnamed_lte_unresolved(inode, table); } -static int lte_add_stream_size(struct lookup_table_entry *lte, - void *total_bytes_p) +static int +lte_add_stream_size(struct wim_lookup_table_entry *lte, void *total_bytes_p) { *(u64*)total_bytes_p += lte->resource_entry.size; return 0; } -u64 lookup_table_total_stream_size(struct lookup_table *table) +u64 +lookup_table_total_stream_size(struct wim_lookup_table *table) { u64 total_size = 0; for_lookup_table_entry(table, lte_add_stream_size, &total_size);