return p;
}
+/*
+ * Reads some data from a WIM resource.
+ *
+ * If %raw is 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)
{
- wimlib_assert(offset + size <= wim_resource_size(lte));
+ /* We shouldn't be allowing read over-runs in any part of the library.
+ * */
+ if (raw)
+ wimlib_assert(offset + size <= lte->resource_entry.size);
+ else
+ wimlib_assert(offset + size <= lte->resource_entry.original_size);
+
int ctype;
int ret;
FILE *fp;
switch (lte->resource_location) {
case RESOURCE_IN_WIM:
+ /* The resource is in a WIM file, and its WIMStruct is given by
+ * the lte->wim member. The resource may be either compressed
+ * or uncompressed. */
wimlib_assert(lte->wim);
wimlib_assert(lte->wim->fp);
ctype = wim_resource_compression_type(lte);
+
+ /* XXX This check should be moved elsewhere */
if (ctype == WIM_COMPRESSION_TYPE_NONE &&
lte->resource_entry.original_size !=
lte->resource_entry.size) {
lte->resource_entry.original_size);
return WIMLIB_ERR_INVALID_RESOURCE_SIZE;
}
+
if (raw || ctype == WIM_COMPRESSION_TYPE_NONE)
return read_uncompressed_resource(lte->wim->fp,
- offset, size, buf);
+ lte->resource_entry.offset + offset,
+ size, buf);
else
return read_compressed_resource(lte->wim->fp,
lte->resource_entry.size,
ctype, size, offset, buf);
break;
case RESOURCE_IN_STAGING_FILE:
+ /* The WIM FUSE implementation needs to handle multiple open
+ * file descriptors per lookup table entry so it does not
+ * currently work with this function. */
wimlib_assert(lte->staging_file_name);
wimlib_assert(0);
break;
case RESOURCE_IN_FILE_ON_DISK:
+ /* The resource is in some file on the external filesystem and
+ * needs to be read uncompressed */
wimlib_assert(lte->file_on_disk);
+ /* Use existing file pointer if available; otherwise open one
+ * temporarily */
if (lte->file_on_disk_fp) {
fp = lte->file_on_disk_fp;
} else {
"`%s'", lte->file_on_disk);
}
}
- ret = read_uncompressed_resource(lte->file_on_disk_fp,
- offset, size, buf);
+ ret = read_uncompressed_resource(fp, offset, size, buf);
if (fp != lte->file_on_disk_fp)
fclose(fp);
return ret;
break;
case RESOURCE_IN_ATTACHED_BUFFER:
+ /* The resource is directly attached uncompressed in an
+ * in-memory buffer. */
wimlib_assert(lte->attached_buffer);
memcpy(buf, lte->attached_buffer + offset, size);
return 0;
}
}
+/*
+ * 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.
+ *
+ * @lte: The WIM lookup table entry for the resource.
+ * @buf: Buffer into which to write the data. It must be at least
+ * wim_resource_size(lte) bytes long.
+ *
+ * Returns 0 on success; nonzero on failure.
+ */
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);
}
struct chunk_table {
static int
begin_wim_resource_chunk_tab(const struct lookup_table_entry *lte,
FILE *out_fp,
+ off_t file_offset,
struct chunk_table **chunk_tab_ret)
{
u64 size = wim_resource_size(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);
ret = WIMLIB_ERR_NOMEM;
goto out;
}
- chunk_tab->file_offset = ftello(out_fp);
- if (chunk_tab->file_offset == -1) {
- ERROR_WITH_ERRNO("Failed to get file offset in output WIM");
- ret = WIMLIB_ERR_WRITE;
- goto out;
- }
+ 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;
return ret;
}
-static int compress_chunk(const u8 chunk[], unsigned chunk_sz,
+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);
}
unsigned out_chunk_size;
if (out_ctype == WIM_COMPRESSION_TYPE_NONE) {
+ wimlib_assert(chunk_tab == NULL);
out_chunk = chunk;
out_chunk_size = chunk_size;
} else {
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;
}
static int
-finish_wim_resource_chunk_tab(const struct chunk_table *chunk_tab,
- FILE *out_fp)
+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 + chunk_tab->table_disk_size;
return 0;
}
-static int write_wim_resource(const struct lookup_table_entry *lte,
- FILE *out_fp, int out_ctype)
+/*
+ * Writes a WIM resource to a FILE * opened for writing. The resource may be
+ * written uncompressed or compressed depending on the @out_ctype parameter.
+ *
+ * @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
+ * the same as the compression type of the WIM resource we
+ * need to read, we simply copy the data (i.e. we do not
+ * uncompress it, then compress it again).
+ * @out_res_entry: If non-NULL, a resource entry that is filled in with the
+ * offset, original size, compressed size, and compression flag
+ * of the output resource.
+ *
+ * Returns 0 on success; nonzero on failure.
+ */
+static int write_wim_resource(struct lookup_table_entry *lte,
+ FILE *out_fp, int out_ctype,
+ struct resource_entry *out_res_entry)
{
- u64 bytes_remaining = wim_resource_size(lte);
- 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;
int ret = 0;
- bool raw = wim_resource_compression_type(lte) == out_ctype;
struct chunk_table *chunk_tab = NULL;
+ bool raw;
+ off_t file_offset;
+
+ original_size = wim_resource_size(lte);
+ old_compressed_size = wim_resource_compressed_size(lte);
+ 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);
if (raw)
- out_ctype = WIM_COMPRESSION_TYPE_NONE;
+ bytes_remaining = old_compressed_size;
+ else
+ bytes_remaining = original_size;
+
+ if (bytes_remaining == 0)
+ return 0;
+
+ char buf[min(WIM_CHUNK_SIZE, bytes_remaining)];
- if (out_ctype != WIM_COMPRESSION_TYPE_NONE) {
- ret = begin_wim_resource_chunk_tab(lte, out_fp,
+ if (out_ctype != WIM_COMPRESSION_TYPE_NONE && !raw) {
+ ret = begin_wim_resource_chunk_tab(lte, out_fp, file_offset,
&chunk_tab);
if (ret != 0)
- return 0;
+ goto out;
+ }
+ 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;
+ }
}
- while (bytes_remaining) {
+ do {
u64 to_read = min(bytes_remaining, WIM_CHUNK_SIZE);
ret = __read_wim_resource(lte, buf, to_read, offset, raw);
if (ret != 0)
- break;
+ goto out_fclose;
ret = write_wim_resource_chunk(buf, to_read, out_fp,
out_ctype, chunk_tab);
if (ret != 0)
- break;
+ goto out_fclose;
bytes_remaining -= to_read;
offset += to_read;
+ } while (bytes_remaining);
+ if (out_ctype != WIM_COMPRESSION_TYPE_NONE && !raw) {
+ ret = finish_wim_resource_chunk_tab(chunk_tab, out_fp,
+ &new_compressed_size);
+ if (ret != 0)
+ goto out_fclose;
+ } else {
+ new_compressed_size = old_compressed_size;
}
- if (out_ctype != WIM_COMPRESSION_TYPE_NONE)
- ret = finish_wim_resource_chunk_tab(chunk_tab, out_fp);
+
+ 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 = new_compressed_size;
+ out_res_entry->original_size = original_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_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_from_buffer(const u8 *buf, u64 buf_size,
- FILE *out_fp, int out_ctype)
+ FILE *out_fp, int out_ctype,
+ struct resource_entry *out_res_entry)
{
struct lookup_table_entry lte;
lte.resource_entry.flags = 0;
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);
+ return write_wim_resource(<e, out_fp, out_ctype, out_res_entry);
}
/*
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));
}
/*
{
WIMStruct *w = wim;
int ret;
- off_t new_offset;
if ((lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA) &&
!w->write_metadata)
return 0;
- new_offset = ftello(w->out_fp);
- if (new_offset == -1) {
- ERROR_WITH_ERRNO("Could not get offset in output WIM");
- return WIMLIB_ERR_WRITE;
- }
-
-
- ret = write_wim_resource(lte, w->out_fp,
- wimlib_get_compression_type((WIMStruct*)w));
+ ret = write_wim_resource(lte, w->out_fp, wimlib_get_compression_type(w),
+ <e->output_resource_entry);
if (ret != 0)
return ret;
-
- memcpy(<e->output_resource_entry, <e->resource_entry,
- sizeof(struct resource_entry));
-
- lte->output_resource_entry.offset = new_offset;
lte->out_refcnt = lte->refcnt;
lte->part_number = w->hdr.part_number;
return 0;
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;
}
sha1_buffer(buf, metadata_original_size, hash);
+ lte = wim_metadata_lookup_table_entry(w);
+
ret = write_wim_resource_from_buffer(buf, metadata_original_size,
- out, metadata_ctype);
+ out, metadata_ctype,
+ <e->output_resource_entry);
FREE(buf);
if (ret != 0)
return ret;
- DEBUG("Updating metadata lookup table entry (size %zu)",
- metadata_original_size);
-
- /* Update the lookup table entry, including the hash and output resource
- * entry fields, for this image's metadata resource. */
- lte = wim_metadata_lookup_table_entry(w);
lte->out_refcnt++;
- if (!hashes_equal(hash, lte->hash)) {
- lookup_table_unlink(w->lookup_table, lte);
- copy_hash(lte->hash, hash);
- lookup_table_insert(w->lookup_table, lte);
- }
- lte->output_resource_entry.original_size = metadata_original_size;
- lte->output_resource_entry.offset = metadata_offset;
- lte->output_resource_entry.size = metadata_compressed_size;
- lte->output_resource_entry.flags = WIM_RESHDR_FLAG_METADATA;
- if (metadata_ctype != WIM_COMPRESSION_TYPE_NONE)
- lte->output_resource_entry.flags |= WIM_RESHDR_FLAG_COMPRESSED;
+ 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;
}
git://wimlib.net / wimlib / blobdiff