metadata_lte = imd->metadata_lte;
metadata_len = wim_resource_size(metadata_lte);
- DEBUG("Reading metadata resource: length = %"PRIu64", "
- "offset = %"PRIu64"", metadata_len,
+ DEBUG("Reading metadata resource: original_size = %"PRIu64", "
+ "size = %"PRIu64", offset = %"PRIu64"",
+ metadata_lte->resource_entry.original_size,
+ metadata_lte->resource_entry.size,
metadata_lte->resource_entry.offset);
/* There is no way the metadata resource could possibly be less than (8
}
/* Read the metadata resource into memory. (It may be compressed.) */
- ret = read_full_resource_into_buf(metadata_lte, buf, false);
+ ret = read_full_resource_into_buf(metadata_lte, buf);
if (ret)
goto out_free_buf;
* 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 void *buf, u64 buf_size,
- FILE *out_fp, int out_ctype,
+write_wim_resource_from_buffer(const void *buf, size_t buf_size,
+ filedes_t out_fd, int out_ctype,
struct resource_entry *out_res_entry,
u8 hash[SHA1_HASH_SIZE])
{
lte.resource_entry.original_size = buf_size;
lte.resource_entry.flags = 0;
lte.unhashed = 1;
- ret = write_wim_resource(<e, out_fp, out_ctype, out_res_entry, 0);
+ ret = write_wim_resource(<e, out_fd, out_ctype, out_res_entry, 0);
if (ret == 0)
copy_hash(hash, lte.hash);
return ret;
u64 metadata_original_size;
struct wim_security_data *sd;
- wimlib_assert(w->out_fp != NULL);
+ wimlib_assert(w->out_fd != INVALID_FILEDES);
wimlib_assert(w->current_image != WIMLIB_NO_IMAGE);
DEBUG("Writing metadata resource for image %d (offset = %"PRIu64")",
- w->current_image, ftello(w->out_fp));
+ w->current_image, filedes_offset(w->out_fd));
root = wim_root_dentry(w);
* compression type. The lookup table entry for the metadata resource
* is updated. */
ret = write_wim_resource_from_buffer(buf, metadata_original_size,
- w->out_fp,
+ w->out_fd,
wimlib_get_compression_type(w),
<e->output_resource_entry,
lte->hash);
- if (ret)
- goto out_free_buf;
-
/* Note that although the SHA1 message digest of the metadata resource
* is very likely to have changed, the corresponding lookup table entry
* is not actually located in the hash table, so it need not be
* re-inserted in the hash table. */
- lte->out_refcnt = 1;
- lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_METADATA;
-out_free_buf:
+
/* All the data has been written to the new WIM; no need for the buffer
* anymore */
FREE(buf);