X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fresource.c;h=4f093622f9e64d356484015f8b45db1cc33635b9;hb=774e09230145ee2d8ba58868573213da84a348eb;hp=8f85cba40b90f42c45c3bc288662fcbb4df2b124;hpb=b51021c82376ce8d2aecb206c8cbfc4ffa6d4f3a;p=wimlib diff --git a/src/resource.c b/src/resource.c index 8f85cba4..4f093622 100644 --- a/src/resource.c +++ b/src/resource.c @@ -346,8 +346,6 @@ err: int read_uncompressed_resource(FILE *fp, u64 offset, u64 len, u8 contents_ret[]) { - DEBUG("fp = %p, offset = %lu, len = %lu, contents_ret = %p", - fp, offset, len, contents_ret); if (fseeko(fp, offset, SEEK_SET) != 0) { ERROR("Failed to seek to byte %"PRIu64" of input file " "to read uncompressed resource (len = %"PRIu64")", @@ -400,23 +398,26 @@ u8 *put_resource_entry(u8 *p, const struct resource_entry *entry) } /* - * Reads some data from a WIM resource. + * Reads some data from the resource corresponding to a WIM lookup table entry. * - * If %raw is true, compressed data is read literally rather than being - * decompressed first. + * @lte: The WIM lookup table entry for the resource. + * @buf: Buffer into which to write the data. + * @size: Number of bytes to read. + * @offset: Offset at which to start reading the resource. + * @raw: If %true, compressed data is read literally rather than being + * decompressed first. * * Returns zero on success, nonzero on failure. */ -static int __read_wim_resource(const struct lookup_table_entry *lte, - u8 buf[], size_t size, u64 offset, bool raw) +int read_wim_resource(const struct lookup_table_entry *lte, u8 buf[], + size_t size, u64 offset, bool raw) { /* We shouldn't be allowing read over-runs in any part of the library. * */ - wimlib_assert(offset + size <= wim_resource_size(lte)); - - DEBUG("lte = %p, buf = %p, size = %zu, offset = %lu, raw = %d", - lte, buf, size, offset, raw); - print_lookup_table_entry(lte); + if (raw) + wimlib_assert(offset + size <= lte->resource_entry.size); + else + wimlib_assert(offset + size <= lte->resource_entry.original_size); int ctype; int ret; @@ -445,7 +446,7 @@ static int __read_wim_resource(const struct lookup_table_entry *lte, if (raw || ctype == WIM_COMPRESSION_TYPE_NONE) return read_uncompressed_resource(lte->wim->fp, - lte->resource_entry.offset, + lte->resource_entry.offset + offset, size, buf); else return read_compressed_resource(lte->wim->fp, @@ -493,22 +494,6 @@ static int __read_wim_resource(const struct lookup_table_entry *lte, } } -/* - * Reads some data from the resource corresponding to a WIM lookup table entry. - * - * @lte: The WIM lookup table entry for the resource. - * @buf: Buffer into which to write the data. - * @size: Number of bytes to read. - * @offset: Offset at which to start reading the resource. - * - * Returns 0 on success; nonzero on failure. - */ -int read_wim_resource(const struct lookup_table_entry *lte, u8 buf[], - size_t size, u64 offset) -{ - return __read_wim_resource(lte, buf, size, offset, false); -} - /* * Reads all the data from the resource corresponding to a WIM lookup table * entry. @@ -521,10 +506,12 @@ int read_wim_resource(const struct lookup_table_entry *lte, u8 buf[], */ int read_full_wim_resource(const struct lookup_table_entry *lte, u8 buf[]) { - return __read_wim_resource(lte, buf, lte->resource_entry.original_size, - 0, false); + return read_wim_resource(lte, buf, wim_resource_size(lte), 0, false); } +/* Chunk table that's located at the beginning of each compressed resource in + * the WIM. (This is not the on-disk format; the on-disk format just has an + * array of offsets.) */ struct chunk_table { off_t file_offset; u64 num_chunks; @@ -536,6 +523,10 @@ struct chunk_table { u64 offsets[0]; }; +/* + * Allocates and initializes a chunk table, and reserves space for it in the + * output file. + */ static int begin_wim_resource_chunk_tab(const struct lookup_table_entry *lte, FILE *out_fp, @@ -548,6 +539,8 @@ begin_wim_resource_chunk_tab(const struct lookup_table_entry *lte, num_chunks * sizeof(u64)); int ret = 0; + wimlib_assert(size != 0); + if (!chunk_tab) { ERROR("Failed to allocate chunk table for %"PRIu64" byte " "resource", size); @@ -556,17 +549,15 @@ begin_wim_resource_chunk_tab(const struct lookup_table_entry *lte, } chunk_tab->file_offset = file_offset; chunk_tab->num_chunks = num_chunks; - chunk_tab->cur_offset_p = chunk_tab->offsets; - chunk_tab->original_resource_size = lte->resource_entry.original_size; - chunk_tab->bytes_per_chunk_entry = - (lte->resource_entry.original_size >= (1ULL << 32)) - ? 8 : 4; + chunk_tab->original_resource_size = size; + chunk_tab->bytes_per_chunk_entry = (size >= (1ULL << 32)) ? 8 : 4; chunk_tab->table_disk_size = chunk_tab->bytes_per_chunk_entry * (num_chunks - 1); + chunk_tab->cur_offset = 0; + chunk_tab->cur_offset_p = chunk_tab->offsets; if (fwrite(chunk_tab, 1, chunk_tab->table_disk_size, out_fp) != - chunk_tab->table_disk_size) - { + chunk_tab->table_disk_size) { ERROR_WITH_ERRNO("Failed to write chunk table in compressed " "file resource"); ret = WIMLIB_ERR_WRITE; @@ -578,21 +569,58 @@ out: return ret; } -static int compress_chunk(const u8 chunk[], unsigned chunk_sz, +/* + * Compresses a chunk of a WIM resource. + * + * @chunk: Uncompressed data of the chunk. + * @chunk_size: Size of the uncompressed chunk in bytes. + * @compressed_chunk: Pointer to output buffer of size at least + * (@chunk_size - 1) bytes. + * @compressed_chunk_len_ret: Pointer to an unsigned int into which the size + * of the compressed chunk will be + * returned. + * @ctype: Type of compression to use. Must be WIM_COMPRESSION_TYPE_LZX + * or WIM_COMPRESSION_TYPE_XPRESS. + * + * Returns zero if compressed succeeded, and nonzero if the chunk could not be + * compressed to any smaller than @chunk_size. This function cannot fail for + * any other reasons. + */ +static int compress_chunk(const u8 chunk[], unsigned chunk_size, u8 compressed_chunk[], unsigned *compressed_chunk_len_ret, int ctype) { unsigned compressed_chunk_sz; int (*compress)(const void *, unsigned, void *, unsigned *); - if (ctype == WIM_COMPRESSION_TYPE_LZX) + switch (ctype) { + case WIM_COMPRESSION_TYPE_LZX: compress = lzx_compress; - else + break; + case WIM_COMPRESSION_TYPE_XPRESS: compress = xpress_compress; - return (*compress)(chunk, chunk_sz, compressed_chunk, + break; + default: + wimlib_assert(0); + break; + } + return (*compress)(chunk, chunk_size, compressed_chunk, compressed_chunk_len_ret); } +/* + * Writes a chunk of a WIM resource to an output file. + * + * @chunk: Uncompressed data of the chunk. + * @chunk_size: Size of the chunk (<= WIM_CHUNK_SIZE) + * @out_fp: FILE * to write tho chunk to. + * @out_ctype: Compression type to use when writing the chunk (ignored if no + * chunk table provided) + * @chunk_tab: Pointer to chunk table being created. It is updated with the + * offset of the chunk we write. + * + * Returns 0 on success; nonzero on failure. + */ static int write_wim_resource_chunk(const u8 chunk[], unsigned chunk_size, FILE *out_fp, int out_ctype, struct chunk_table *chunk_tab) @@ -600,7 +628,9 @@ static int write_wim_resource_chunk(const u8 chunk[], unsigned chunk_size, const u8 *out_chunk; unsigned out_chunk_size; - if (out_ctype == WIM_COMPRESSION_TYPE_NONE) { + wimlib_assert(chunk_size <= WIM_CHUNK_SIZE); + + if (!chunk_tab) { out_chunk = chunk; out_chunk_size = chunk_size; } else { @@ -608,17 +638,13 @@ static int write_wim_resource_chunk(const u8 chunk[], unsigned chunk_size, int ret; unsigned compressed_chunk_len; - wimlib_assert(chunk_tab != NULL); - ret = compress_chunk(chunk, chunk_size, compressed_chunk, &out_chunk_size, out_ctype); - if (ret > 0) - return ret; - else if (ret < 0) { + if (ret == 0) { + out_chunk = compressed_chunk; + } else { out_chunk = chunk; out_chunk_size = chunk_size; - } else { - out_chunk = compressed_chunk; } *chunk_tab->cur_offset_p++ = chunk_tab->cur_offset; chunk_tab->cur_offset += out_chunk_size; @@ -631,36 +657,44 @@ static int write_wim_resource_chunk(const u8 chunk[], unsigned chunk_size, return 0; } +/* + * Finishes a WIM chunk tale and writes it to the output file at the correct + * offset. + * + * The final size of the full compressed resource is returned in the + * @compressed_size_p. + */ static int finish_wim_resource_chunk_tab(struct chunk_table *chunk_tab, FILE *out_fp, u64 *compressed_size_p) { + size_t bytes_written; if (fseeko(out_fp, chunk_tab->file_offset, SEEK_SET) != 0) { - ERROR_WITH_ERRNO("Failed to seet to byte "PRIu64" of output " + ERROR_WITH_ERRNO("Failed to seek to byte "PRIu64" of output " "WIM file", chunk_tab->file_offset); return WIMLIB_ERR_WRITE; } if (chunk_tab->bytes_per_chunk_entry == 8) { - array_to_le64(chunk_tab->offsets, chunk_tab->num_chunks - 1); + array_to_le64(chunk_tab->offsets, chunk_tab->num_chunks); } else { - for (u64 i = 0; i < chunk_tab->num_chunks - 1; i++) + for (u64 i = 0; i < chunk_tab->num_chunks; i++) ((u32*)chunk_tab->offsets)[i] = to_le32(chunk_tab->offsets[i]); } - if (fwrite(chunk_tab->offsets, 1, chunk_tab->table_disk_size, out_fp) != - chunk_tab->table_disk_size) - { + bytes_written = fwrite((u8*)chunk_tab->offsets + + chunk_tab->bytes_per_chunk_entry, + 1, chunk_tab->table_disk_size, out_fp); + if (bytes_written != chunk_tab->table_disk_size) { ERROR_WITH_ERRNO("Failed to write chunk table in compressed " "file resource"); return WIMLIB_ERR_WRITE; } - if (fseeko(out_fp, chunk_tab->file_offset, SEEK_SET) != 0) { - ERROR_WITH_ERRNO("Failed to seet to byte "PRIu64" of output " - "WIM file", chunk_tab->file_offset); + if (fseeko(out_fp, 0, SEEK_END) != 0) { + ERROR_WITH_ERRNO("Failed to seek to end of output WIM file"); return WIMLIB_ERR_WRITE; } - *compressed_size_p = chunk_tab->cur_offset; + *compressed_size_p = chunk_tab->cur_offset + chunk_tab->table_disk_size; return 0; } @@ -668,6 +702,11 @@ finish_wim_resource_chunk_tab(struct chunk_table *chunk_tab, * Writes a WIM resource to a FILE * opened for writing. The resource may be * written uncompressed or compressed depending on the @out_ctype parameter. * + * If by chance the resource compresses to more than the original size (this may + * happen with random data or files than are pre-compressed), the resource is + * instead written uncompressed (and this is reflected in the @out_res_entry by + * removing the WIM_RESHDR_FLAG_COMPRESSED flag). + * * @lte: The lookup table entry for the WIM resource. * @out_fp: The FILE * to write the resource to. * @out_ctype: The compression type of the resource to write. Note: if this is @@ -680,96 +719,213 @@ finish_wim_resource_chunk_tab(struct chunk_table *chunk_tab, * * Returns 0 on success; nonzero on failure. */ -static int __write_wim_resource(const struct lookup_table_entry *lte, - FILE *out_fp, int out_ctype, - struct resource_entry *out_res_entry) +static int write_wim_resource(struct lookup_table_entry *lte, + FILE *out_fp, int out_ctype, + struct resource_entry *out_res_entry) { - u64 size = wim_resource_size(lte); - u64 bytes_remaining = size; - char buf[min(WIM_CHUNK_SIZE, bytes_remaining)]; + u64 bytes_remaining; + u64 original_size; + u64 old_compressed_size; + u64 new_compressed_size; u64 offset = 0; - u64 compressed_size = bytes_remaining; int ret = 0; struct chunk_table *chunk_tab = NULL; bool raw; off_t file_offset; - if (out_res_entry) { - file_offset = ftello(out_fp); - if (file_offset == -1) { - ERROR_WITH_ERRNO("Failed to get offset in output " - "stream"); - return WIMLIB_ERR_WRITE; - } + /* Original size of the resource */ + original_size = wim_resource_size(lte); + + /* Compressed size of the resource (as it exists now) */ + old_compressed_size = wim_resource_compressed_size(lte); + + /* Current offset in output file */ + file_offset = ftello(out_fp); + if (file_offset == -1) { + ERROR_WITH_ERRNO("Failed to get offset in output " + "stream"); + return WIMLIB_ERR_WRITE; } - raw = (wim_resource_compression_type(lte) == out_ctype); + /* Are the compression types the same? If so, do a raw copy (copy + * without decompressing and recompressing the data). */ + raw = (wim_resource_compression_type(lte) == out_ctype + && out_ctype != WIM_COMPRESSION_TYPE_NONE); if (raw) - out_ctype = WIM_COMPRESSION_TYPE_NONE; + bytes_remaining = old_compressed_size; + else + bytes_remaining = original_size; + + /* Empty resource; nothing needs to be done, so just return success. */ + if (bytes_remaining == 0) + return 0; - if (out_ctype != WIM_COMPRESSION_TYPE_NONE) { + /* Buffer for reading chunks for the resource */ + char buf[min(WIM_CHUNK_SIZE, bytes_remaining)]; + + /* If we are writing a compressed resource and not doing a raw copy, we + * need to initialize the chunk table */ + if (out_ctype != WIM_COMPRESSION_TYPE_NONE && !raw) { ret = begin_wim_resource_chunk_tab(lte, out_fp, file_offset, &chunk_tab); if (ret != 0) goto out; } - while (bytes_remaining) { + /* If the WIM resource is in an external file, open a FILE * to it so we + * don't have to open a temporary one in read_wim_resource() for each + * chunk. */ + if (lte->resource_location == RESOURCE_IN_FILE_ON_DISK + && !lte->file_on_disk_fp) + { + wimlib_assert(lte->file_on_disk); + lte->file_on_disk_fp = fopen(lte->file_on_disk, "rb"); + if (!lte->file_on_disk_fp) { + ERROR_WITH_ERRNO("Failed to open the file `%s' for " + "reading", lte->file_on_disk); + ret = WIMLIB_ERR_OPEN; + goto out; + } + } + + /* If we aren't doing a raw copy, we will compute the SHA1 message + * digest of the resource as we read it, and verify it's the same as the + * hash given in the lookup table entry once we've finished reading the + * resource. */ + SHA_CTX ctx; + if (!raw) + sha1_init(&ctx); + + /* While there are still bytes remaining in the WIM resource, read a + * chunk of the resource, update SHA1, then write that chunk using the + * desired compression type. */ + do { u64 to_read = min(bytes_remaining, WIM_CHUNK_SIZE); - ret = __read_wim_resource(lte, buf, to_read, offset, raw); + ret = read_wim_resource(lte, buf, to_read, offset, raw); if (ret != 0) - goto out; + goto out_fclose; + if (!raw) + sha1_update(&ctx, buf, to_read); ret = write_wim_resource_chunk(buf, to_read, out_fp, out_ctype, chunk_tab); if (ret != 0) - goto out; + goto out_fclose; bytes_remaining -= to_read; offset += to_read; - } - if (out_ctype != WIM_COMPRESSION_TYPE_NONE) { + } while (bytes_remaining); + + /* If writing a compressed resource and not doing a raw copy, write the + * chunk table, and finish_wim_resource_chunk_tab() will provide the + * compressed size of the resource we wrote. Otherwise, the compressed + * size of the written resource is the same as the compressed size of + * the existing resource. */ + if (out_ctype != WIM_COMPRESSION_TYPE_NONE && !raw) { ret = finish_wim_resource_chunk_tab(chunk_tab, out_fp, - &compressed_size); + &new_compressed_size); if (ret != 0) - goto out; + goto out_fclose; + } else { + new_compressed_size = old_compressed_size; + } + + /* Verify SHA1 message digest of the resource, unless we are doing a raw + * write (in which case we never even saw the uncompressed data). Or, + * if the hash we had before is all 0's, just re-set it to be the new + * hash. */ + if (!raw) { + u8 md[SHA1_HASH_SIZE]; + sha1_final(md, &ctx); + if (is_zero_hash(lte->hash)) { + copy_hash(lte->hash, md); + } else if (!hashes_equal(md, lte->hash)) { + ERROR("WIM resource has incorrect hash!"); + if (lte->resource_location == RESOURCE_IN_FILE_ON_DISK) { + ERROR("We were reading it from `%s'; maybe it changed " + "while we were reading it.", + lte->file_on_disk); + } + ret = WIMLIB_ERR_INVALID_RESOURCE_HASH; + goto out_fclose; + } + } + + if (new_compressed_size > original_size) { + /* Oops! We compressed the resource to larger than the original + * size. Write the resource uncompressed instead. */ + if (fseeko(out_fp, file_offset, SEEK_SET) != 0) { + ERROR_WITH_ERRNO("Failed to seek to byte "PRIu64" " + "of output WIM file", file_offset); + ret = WIMLIB_ERR_WRITE; + goto out_fclose; + } + ret = write_wim_resource(lte, out_fp, WIM_COMPRESSION_TYPE_NONE, + out_res_entry); + if (ret != 0) + goto out_fclose; + if (fflush(out_fp) != 0) { + ERROR_WITH_ERRNO("Failed to flush output WIM file"); + ret = WIMLIB_ERR_WRITE; + goto out_fclose; + } + if (ftruncate(fileno(out_fp), file_offset + out_res_entry->size) != 0) { + ERROR_WITH_ERRNO("Failed to truncate output WIM file"); + ret = WIMLIB_ERR_WRITE; + } + goto out_fclose; } + wimlib_assert(new_compressed_size <= original_size); if (out_res_entry) { - out_res_entry->size = compressed_size; - out_res_entry->original_size = size; - out_res_entry->offset = file_offset; - if (out_ctype == WIM_COMPRESSION_TYPE_NONE) - out_res_entry->flags = 0; - else - out_res_entry->flags = WIM_RESHDR_FLAG_COMPRESSED; + out_res_entry->size = new_compressed_size; + out_res_entry->original_size = original_size; + out_res_entry->offset = file_offset; + out_res_entry->flags = lte->resource_entry.flags + & ~WIM_RESHDR_FLAG_COMPRESSED; + if (out_ctype != WIM_COMPRESSION_TYPE_NONE) + out_res_entry->flags |= WIM_RESHDR_FLAG_COMPRESSED; + } +out_fclose: + if (lte->resource_location == RESOURCE_IN_FILE_ON_DISK + && lte->file_on_disk_fp) { + fclose(lte->file_on_disk_fp); + lte->file_on_disk_fp = NULL; } out: FREE(chunk_tab); return ret; } -static int write_wim_resource(struct lookup_table_entry *lte, - FILE *out_fp, int out_ctype) -{ - return __write_wim_resource(lte, out_fp, out_ctype, - <e->output_resource_entry); -} - +/* Like write_wim_resource(), but the resource is specified by a buffer of + * uncompressed data rather a lookup table entry; also writes the SHA1 hash of + * the buffer to @hash. */ static int write_wim_resource_from_buffer(const u8 *buf, u64 buf_size, FILE *out_fp, int out_ctype, - struct resource_entry *out_res_entry) + struct resource_entry *out_res_entry, + u8 hash[SHA1_HASH_SIZE]) { + /* Set up a temporary lookup table entry that we provide to + * write_wim_resource(). */ struct lookup_table_entry lte; - lte.resource_entry.flags = 0; + int ret; + lte.resource_entry.flags = 0; lte.resource_entry.original_size = buf_size; - lte.resource_entry.size = buf_size; - lte.resource_entry.offset = 0; - lte.resource_location = RESOURCE_IN_ATTACHED_BUFFER; - lte.attached_buffer = (u8*)buf; - return __write_wim_resource(<e, out_fp, out_ctype, out_res_entry); + lte.resource_entry.size = buf_size; + lte.resource_entry.offset = 0; + lte.resource_location = RESOURCE_IN_ATTACHED_BUFFER; + lte.attached_buffer = (u8*)buf; + + zero_hash(lte.hash); + ret = write_wim_resource(<e, out_fp, out_ctype, out_res_entry); + if (ret != 0) + return ret; + copy_hash(hash, lte.hash); + return 0; } /* - * Extracts the first @size bytes of the resource specified by @lte to the open - * file @fd. Returns nonzero on error. + * Extracts the first @size bytes of the WIM resource specified by @lte to the + * open file descriptor @fd. + * + * Returns 0 on success; nonzero on failure. */ int extract_wim_resource_to_fd(const struct lookup_table_entry *lte, int fd, u64 size) @@ -778,12 +934,17 @@ int extract_wim_resource_to_fd(const struct lookup_table_entry *lte, int fd, char buf[min(WIM_CHUNK_SIZE, bytes_remaining)]; u64 offset = 0; int ret = 0; + u8 hash[SHA1_HASH_SIZE]; + + SHA_CTX ctx; + sha1_init(&ctx); while (bytes_remaining) { u64 to_read = min(bytes_remaining, WIM_CHUNK_SIZE); - ret = read_wim_resource(lte, buf, to_read, offset); + ret = read_wim_resource(lte, buf, to_read, offset, false); if (ret != 0) break; + sha1_update(&ctx, buf, to_read); if (full_write(fd, buf, to_read) < 0) { ERROR_WITH_ERRNO("Error extracting WIM resource"); return WIMLIB_ERR_WRITE; @@ -791,19 +952,31 @@ int extract_wim_resource_to_fd(const struct lookup_table_entry *lte, int fd, bytes_remaining -= to_read; offset += to_read; } + sha1_final(hash, &ctx); + if (!hashes_equal(hash, lte->hash)) { + ERROR("Invalid checksum on a WIM resource " + "(detected when extracting to external file)"); + ERROR("The following WIM resource is invalid:"); + print_lookup_table_entry(lte); + return WIMLIB_ERR_INVALID_RESOURCE_HASH; + } return 0; } +/* + * Extracts the WIM resource specified by @lte to the open file descriptor @fd. + * + * Returns 0 on success; nonzero on failure. + */ int extract_full_wim_resource_to_fd(const struct lookup_table_entry *lte, int fd) { - return extract_wim_resource_to_fd(lte, fd, - lte->resource_entry.original_size); + return extract_wim_resource_to_fd(lte, fd, wim_resource_size(lte)); } /* * Copies the file resource specified by the lookup table entry @lte from the - * input WIM, pointed to by the fp field of the WIMStruct, to the output WIM, - * pointed to by the out_fp field of the WIMStruct. + * input WIM to the output WIM that has its FILE * given by + * ((WIMStruct*)wim)->out_fp. * * The output_resource_entry, out_refcnt, and part_number fields of @lte are * updated. @@ -820,7 +993,9 @@ int copy_resource(struct lookup_table_entry *lte, void *wim) !w->write_metadata) return 0; - ret = write_wim_resource(lte, w->out_fp, wimlib_get_compression_type(w)); + ret = write_wim_resource(lte, w->out_fp, + wim_resource_compression_type(lte), + <e->output_resource_entry); if (ret != 0) return ret; lte->out_refcnt = lte->refcnt; @@ -833,9 +1008,7 @@ int copy_resource(struct lookup_table_entry *lte, void *wim) * alternate data streams, to the output file. * * @dentry: The dentry for the file. - * @wim_p: A pointer to the WIMStruct. The fields of interest to this - * function are the input and output file streams and the lookup - * table. + * @wim_p: A pointer to the WIMStruct containing @dentry. * * @return zero on success, nonzero on failure. */ @@ -846,10 +1019,16 @@ int write_dentry_resources(struct dentry *dentry, void *wim_p) struct lookup_table_entry *lte; int ctype = wimlib_get_compression_type(w); + if (w->write_flags & WIMLIB_WRITE_FLAG_VERBOSE) { + wimlib_assert(dentry->full_path_utf8); + printf("Writing streams for `%s'\n", dentry->full_path_utf8); + } + for (unsigned i = 0; i <= dentry->num_ads; i++) { lte = dentry_stream_lte(dentry, i, w->lookup_table); if (lte && ++lte->out_refcnt == 1) { - ret = write_wim_resource(lte, w->out_fp, ctype); + ret = write_wim_resource(lte, w->out_fp, ctype, + <e->output_resource_entry); if (ret != 0) break; } @@ -868,10 +1047,10 @@ int write_dentry_resources(struct dentry *dentry, void *wim_p) * * @fp: The FILE* for the input WIM file. * @wim_ctype: The compression type of the WIM file. - * @imd: Pointer to the image metadata structure. Its - * `lookup_table_entry' member specifies the lookup table entry for - * the metadata resource. The rest of the image metadata entry - * will be filled in by this function. + * @imd: Pointer to the image metadata structure. Its `metadata_lte' + * member specifies the lookup table entry for the metadata + * resource. The rest of the image metadata entry will be filled + * in by this function. * * @return: Zero on success, nonzero on failure. */ @@ -991,30 +1170,20 @@ out_free_buf: return ret; } -/* Write the metadata resource for the current image. */ +/* Write the metadata resource for the current WIM image. */ int write_metadata_resource(WIMStruct *w) { - FILE *out; u8 *buf; u8 *p; int ret; u64 subdir_offset; struct dentry *root; struct lookup_table_entry *lte; - off_t metadata_offset; u64 metadata_original_size; - u64 metadata_compressed_size; - int metadata_ctype; - u8 hash[SHA1_HASH_SIZE]; DEBUG("Writing metadata resource for image %d", w->current_image); - out = w->out_fp; root = wim_root_dentry(w); - metadata_ctype = wimlib_get_compression_type(w); - metadata_offset = ftello(out); - if (metadata_offset == -1) - return WIMLIB_ERR_WRITE; struct wim_security_data *sd = wim_security_data(w); if (sd) @@ -1034,26 +1203,20 @@ int write_metadata_resource(WIMStruct *w) DEBUG("Writing dentry tree."); p = write_dentry_tree(root, p); - - /* Like file resources, the lookup table entry for a metadata resource - * uses for the hash code a SHA1 message digest of its uncompressed - * contents. */ - sha1_buffer(buf, metadata_original_size, hash); - + wimlib_assert(p - buf == metadata_original_size); lte = wim_metadata_lookup_table_entry(w); ret = write_wim_resource_from_buffer(buf, metadata_original_size, - out, metadata_ctype, - <e->output_resource_entry); - FREE(buf); - if (ret != 0) - return ret; + w->out_fp, + wimlib_get_compression_type(w), + <e->output_resource_entry, + lte->hash); - lte->out_refcnt++; - lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_METADATA; lookup_table_unlink(w->lookup_table, lte); - copy_hash(lte->hash, hash); lookup_table_insert(w->lookup_table, lte); - return 0; + lte->out_refcnt++; + lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_METADATA; + FREE(buf); + return ret; }