if (size != sizeof(struct wimlib_unix_data))
return BAD_UNIX_DATA;
- ret = read_full_resource_into_buf(lte, unix_data, true);
+ ret = read_full_resource_into_buf(lte, unix_data);
if (ret)
return ret;
/* Reads the header for a WIM file. */
int
-read_header(FILE *fp, struct wim_header *hdr, int open_flags)
+read_header(filedes_t in_fd, struct wim_header *hdr, int open_flags)
{
size_t bytes_read;
u8 buf[WIM_HEADER_DISK_SIZE];
- size_t hdr_rem_size;
const u8 *p;
u32 hdr_size;
DEBUG("Reading WIM header.");
- bytes_read = fread(buf, 1, WIM_MAGIC_LEN, fp);
+ bytes_read = full_read(in_fd, buf, WIM_HEADER_DISK_SIZE);
- if (bytes_read != WIM_MAGIC_LEN)
- goto err;
+ if (bytes_read != WIM_HEADER_DISK_SIZE) {
+ ERROR_WITH_ERRNO("Error reading WIM header");
+ return WIMLIB_ERR_READ;
+ }
/* Byte 8 */
- if (memcmp(buf, wim_magic_chars, WIM_MAGIC_LEN) != 0) {
+ p = buf;
+
+ if (memcmp(p, wim_magic_chars, WIM_MAGIC_LEN)) {
ERROR("Invalid magic characters in WIM header");
return WIMLIB_ERR_NOT_A_WIM_FILE;
}
- bytes_read = fread(&hdr_size, 1, sizeof(u32), fp);
- if (bytes_read != sizeof(u32))
- goto err;
-
- hdr_size = le32_to_cpu(hdr_size);
+ p += 8;
+ p = get_u32(p, &hdr_size);
/* Byte 12 */
return WIMLIB_ERR_INVALID_HEADER_SIZE;
}
- /* Read the rest of the header into a buffer. */
-
- hdr_rem_size = WIM_HEADER_DISK_SIZE - WIM_MAGIC_LEN - sizeof(u32);
-
- bytes_read = fread(buf + WIM_MAGIC_LEN + sizeof(u32), 1,
- hdr_rem_size, fp);
- if (bytes_read != hdr_rem_size)
- goto err;
-
p = get_u32(buf + WIM_MAGIC_LEN + sizeof(u32), &wim_version);
if (wim_version != WIM_VERSION) {
/* Byte 208 */
return 0;
-
-err:
- if (feof(fp))
- ERROR("Unexpected EOF while reading WIM header");
- else
- ERROR_WITH_ERRNO("Error reading WIM header");
- return WIMLIB_ERR_READ;
}
/*
* Writes the header for a WIM file.
*
* @hdr: A pointer to a struct wim_header structure that describes the header.
- * @out: The FILE* for the output file, positioned at the appropriate
- * place (the beginning of the file).
+ * @out_fd: The file descriptor to the WIM file, opened for writing.
* @return: Zero on success, nonzero on failure.
*/
int
-write_header(const struct wim_header *hdr, FILE *out_fp)
+write_header(const struct wim_header *hdr, int out_fd)
{
u8 buf[WIM_HEADER_DISK_SIZE];
u8 *p;
p = put_resource_entry(p, &hdr->boot_metadata_res_entry);
p = put_u32(p, hdr->boot_idx);
p = put_resource_entry(p, &hdr->integrity);
- memset(p, 0, WIM_UNUSED_LEN);
- if (fwrite(buf, 1, sizeof(buf), out_fp) != sizeof(buf)) {
+ p = put_zeroes(p, WIM_UNUSED_LEN);
+ assert(p - buf == sizeof(buf));
+
+ if (full_pwrite(out_fd, buf, sizeof(buf), 0) != sizeof(buf)) {
ERROR_WITH_ERRNO("Failed to write WIM header");
return WIMLIB_ERR_WRITE;
}
};
static int
-calculate_chunk_sha1(FILE *fp, size_t this_chunk_size,
+calculate_chunk_sha1(filedes_t in_fd, size_t this_chunk_size,
off_t offset, u8 sha1_md[])
{
- int ret;
u8 buf[BUFFER_SIZE];
SHA_CTX ctx;
size_t bytes_remaining;
size_t bytes_to_read;
size_t bytes_read;
- ret = fseeko(fp, offset, SEEK_SET);
- if (ret != 0) {
- ERROR_WITH_ERRNO("Can't seek to offset "
- "%"PRIu64" in WIM", offset);
- return WIMLIB_ERR_READ;
- }
bytes_remaining = this_chunk_size;
sha1_init(&ctx);
do {
bytes_to_read = min(bytes_remaining, sizeof(buf));
- bytes_read = fread(buf, 1, bytes_to_read, fp);
+ bytes_read = full_pread(in_fd, buf, bytes_to_read, offset);
if (bytes_read != bytes_to_read) {
- if (feof(fp)) {
- ERROR("Unexpected EOF while calculating "
- "integrity checksums");
- } else {
- ERROR_WITH_ERRNO("File stream error while "
- "calculating integrity "
- "checksums");
- }
+ ERROR_WITH_ERRNO("Read error while calculating "
+ "integrity checksums");
return WIMLIB_ERR_READ;
}
sha1_update(&ctx, buf, bytes_read);
bytes_remaining -= bytes_read;
+ offset += bytes_read;
} while (bytes_remaining);
sha1_final(sha1_md, &ctx);
return 0;
* The resource entry that specifies the location of the integrity table.
* The integrity table must exist (i.e. res_entry->offset must not be 0).
*
- * @fp:
- * FILE * to the WIM file, opened for reading.
+ * @in_fd:
+ * File descriptor to the WIM file, opened for reading.
*
* @num_checked_bytes:
* Number of bytes of data that should be checked by the integrity table.
*/
static int
read_integrity_table(const struct resource_entry *res_entry,
- FILE *fp,
+ filedes_t in_fd,
u64 num_checked_bytes,
struct integrity_table **table_ret)
{
- struct integrity_table *table = NULL;
- int ret = 0;
+ struct integrity_table *table;
+ int ret;
u64 expected_size;
u64 expected_num_entries;
}
/* Read the integrity table into memory. */
- if ((table = MALLOC(res_entry->size)) == NULL) {
- ERROR("Can't allocate %"PRIu64" bytes for integrity table",
- (u64)res_entry->size);
+ table = MALLOC((size_t)res_entry->size);
+ if (table == NULL) {
+ ERROR("Can't allocate %zu bytes for integrity table",
+ (size_t)res_entry->size);
return WIMLIB_ERR_NOMEM;
}
- ret = read_uncompressed_resource(fp, res_entry->offset,
- res_entry->size, (void*)table);
-
- if (ret != 0) {
- ERROR("Failed to read integrity table (size = %u, "
+ if (full_pread(in_fd, table, res_entry->size,
+ res_entry->offset) != res_entry->size)
+ {
+ ERROR("Failed to read integrity table (size = %zu, "
" offset = %"PRIu64")",
- (unsigned)res_entry->size, res_entry->offset);
- goto out;
+ (size_t)res_entry->size, res_entry->offset);
+ ret = WIMLIB_ERR_READ;
+ goto out_free_table;
}
table->size = le32_to_cpu(table->size);
"%u bytes but resource entry says %u bytes",
table->size, (unsigned)res_entry->size);
ret = WIMLIB_ERR_INVALID_INTEGRITY_TABLE;
- goto out;
+ goto out_free_table;
}
DEBUG("table->size = %u, table->num_entries = %u, "
"bytes to hold %u entries",
table->size, expected_size, table->num_entries);
ret = WIMLIB_ERR_INVALID_INTEGRITY_TABLE;
- goto out;
+ goto out_free_table;
}
if (table->chunk_size == 0) {
ERROR("Cannot use integrity chunk size of 0");
ret = WIMLIB_ERR_INVALID_INTEGRITY_TABLE;
- goto out;
+ goto out_free_table;
}
expected_num_entries = DIV_ROUND_UP(num_checked_bytes, table->chunk_size);
"there were only %u entries",
table->chunk_size, table->num_entries);
ret = WIMLIB_ERR_INVALID_INTEGRITY_TABLE;
+ goto out_free_table;
}
+ *table_ret = table;
+ ret = 0;
+ goto out;
+out_free_table:
+ FREE(table);
out:
- if (ret == 0)
- *table_ret = table;
- else
- FREE(table);
return ret;
}
* Calculates an integrity table for the data in a file beginning at offset 208
* (WIM_HEADER_DISK_SIZE).
*
- * @fp:
- * FILE * for the file to be checked, opened for reading. Does not need to
- * be at any specific location in the file.
+ * @in_fd:
+ * File descriptor for the file to be checked, opened for reading. Does
+ * not need to be at any specific location in the file.
*
* @new_check_end:
* Offset of byte after the last byte to be checked.
* Returns 0 on success; nonzero on failure.
*/
static int
-calculate_integrity_table(FILE *fp,
+calculate_integrity_table(filedes_t in_fd,
off_t new_check_end,
const struct integrity_table *old_table,
off_t old_check_end,
wimlib_progress_func_t progress_func,
struct integrity_table **integrity_table_ret)
{
- int ret = 0;
+ int ret;
size_t chunk_size = INTEGRITY_CHUNK_SIZE;
/* If an old table is provided, set the chunk size to be compatible with
copy_hash(new_table->sha1sums[i], old_table->sha1sums[i]);
} else {
/* Calculate the SHA1 message digest of this chunk */
- ret = calculate_chunk_sha1(fp, this_chunk_size,
+ ret = calculate_chunk_sha1(in_fd, this_chunk_size,
offset, new_table->sha1sums[i]);
- if (ret != 0)
- break;
+ if (ret) {
+ FREE(new_table);
+ return ret;
+ }
}
offset += this_chunk_size;
if (progress_func) {
&progress);
}
}
- if (ret == 0)
- *integrity_table_ret = new_table;
- else
- FREE(new_table);
- return ret;
+ *integrity_table_ret = new_table;
+ return 0;
}
/*
* cannot be read, a warning is printed and the integrity information is
* re-calculated.
*
- * @fp:
- * FILE * to the WIM file, opened read-write, positioned at the location at
- * which the integrity table is to be written.
+ * @fd:
+ * File descriptor to the WIM file, opened read-write, positioned at the
+ * location at which the integrity table is to be written.
*
* @integrity_res_entry:
* Resource entry which will be set to point to the integrity table on
* to be checked.
*/
int
-write_integrity_table(FILE *fp,
+write_integrity_table(filedes_t fd,
struct resource_entry *integrity_res_entry,
off_t new_lookup_table_end,
off_t old_lookup_table_end,
wimlib_assert(old_lookup_table_end <= new_lookup_table_end);
- cur_offset = ftello(fp);
+ cur_offset = filedes_offset(fd);
if (cur_offset == -1)
return WIMLIB_ERR_WRITE;
if (integrity_res_entry->offset == 0 || old_lookup_table_end == 0) {
old_table = NULL;
} else {
- ret = read_integrity_table(integrity_res_entry, fp,
+ ret = read_integrity_table(integrity_res_entry, fd,
old_lookup_table_end - WIM_HEADER_DISK_SIZE,
&old_table);
if (ret == WIMLIB_ERR_INVALID_INTEGRITY_TABLE) {
}
}
- ret = calculate_integrity_table(fp, new_lookup_table_end,
+ ret = calculate_integrity_table(fd, new_lookup_table_end,
old_table, old_lookup_table_end,
progress_func, &new_table);
- if (ret != 0)
+ if (ret)
goto out_free_old_table;
new_table_size = new_table->size;
new_table->num_entries = cpu_to_le32(new_table->num_entries);
new_table->chunk_size = cpu_to_le32(new_table->chunk_size);
- if (fseeko(fp, cur_offset, SEEK_SET) != 0) {
- ERROR_WITH_ERRNO("Failed to seek to byte %"PRIu64" of WIM to "
- "write integrity table", cur_offset);
- ret = WIMLIB_ERR_WRITE;
- goto out_free_new_table;
- }
-
- if (fwrite(new_table, 1, new_table_size, fp) != new_table_size) {
+ if (full_write(fd, new_table, new_table_size) != new_table_size) {
ERROR_WITH_ERRNO("Failed to write WIM integrity table");
ret = WIMLIB_ERR_WRITE;
} else {
integrity_res_entry->flags = 0;
ret = 0;
}
-out_free_new_table:
FREE(new_table);
out_free_old_table:
FREE(old_table);
*
* Checks a WIM for consistency with the integrity table.
*
- * @fp:
- * FILE * to the WIM file, opened for reading.
+ * @in_fd:
+ * File descriptor to the WIM file, opened for reading.
*
* @table:
* The integrity table for the WIM, read into memory.
* -1 (WIM_INTEGRITY_NOT_OK) if the WIM failed the integrity check.
*/
static int
-verify_integrity(FILE *fp, const tchar *filename,
+verify_integrity(filedes_t in_fd, const tchar *filename,
const struct integrity_table *table,
u64 bytes_to_check,
wimlib_progress_func_t progress_func)
else
this_chunk_size = table->chunk_size;
- ret = calculate_chunk_sha1(fp, this_chunk_size, offset, sha1_md);
- if (ret != 0)
+ ret = calculate_chunk_sha1(in_fd, this_chunk_size, offset, sha1_md);
+ if (ret)
return ret;
if (!hashes_equal(sha1_md, table->sha1sums[i]))
bytes_to_check = end_lookup_table_offset - WIM_HEADER_DISK_SIZE;
- ret = read_integrity_table(&w->hdr.integrity, w->fp,
+ ret = read_integrity_table(&w->hdr.integrity, w->in_fd,
bytes_to_check, &table);
- if (ret != 0)
+ if (ret)
return ret;
- ret = verify_integrity(w->fp, w->filename, table,
+ ret = verify_integrity(w->in_fd, w->filename, table,
bytes_to_check, progress_func);
FREE(table);
return ret;
/* Write the non-metadata resources from each SWM part */
for (i = 0; i < num_swms; i++) {
- swms[i]->fp = tfopen(swms[i]->filename, T("rb"));
- if (!swms[i]->fp) {
- ERROR_WITH_ERRNO("Failed to reopen `%"TS"'",
- swms[i]->filename);
- return WIMLIB_ERR_OPEN;
- }
- swms[i]->out_fp = joined_wim->out_fp;
+ ret = reopen_wim(swms[i]);
+ if (ret)
+ return ret;
+ swms[i]->out_fd = joined_wim->out_fd;
swms[i]->hdr.part_number = 1;
ret = for_lookup_table_entry_pos_sorted(swms[i]->lookup_table,
copy_resource,
swms[i]);
- swms[i]->out_fp = NULL;
-
- if (i != 0) {
- fclose(swms[i]->fp);
- swms[i]->fp = NULL;
- }
+ swms[i]->out_fd = INVALID_FILEDES;
+ if (i != 0)
+ close_wim(swms[i]);
if (ret)
return ret;
/* Don't open all the parts at the same time, in case there are
* a lot of them */
- fclose(swms[i]->fp);
- swms[i]->fp = NULL;
+ close_wim(swms[i]);
}
qsort(swms, num_swms, sizeof(swms[0]), cmp_swms_by_part_number);
read_lookup_table(WIMStruct *w)
{
u64 num_entries;
- u8 buf[WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE];
int ret;
struct wim_lookup_table *table;
struct wim_lookup_table_entry *cur_entry, *duplicate_entry;
+ void *table_buf;
+ size_t table_size;
+ const void *p;
+
+ DEBUG("Reading lookup table: offset %"PRIu64", size %"PRIu64"",
+ w->hdr.lookup_table_res_entry.offset,
+ w->hdr.lookup_table_res_entry.original_size);
if (resource_is_compressed(&w->hdr.lookup_table_res_entry)) {
ERROR("Didn't expect a compressed lookup table!");
return WIMLIB_ERR_COMPRESSED_LOOKUP_TABLE;
}
- DEBUG("Reading lookup table: offset %"PRIu64", size %"PRIu64"",
- w->hdr.lookup_table_res_entry.offset,
- w->hdr.lookup_table_res_entry.original_size);
+ table_size = w->hdr.lookup_table_res_entry.size;
+ if (table_size != w->hdr.lookup_table_res_entry.size) {
+ ERROR("Lookup table is invalid");
+ return WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
+ }
+
+ table_buf = MALLOC(table_size);
+ if (!table_buf)
+ return WIMLIB_ERR_NOMEM;
- if (fseeko(w->fp, w->hdr.lookup_table_res_entry.offset, SEEK_SET) != 0)
+ if (full_pread(w->in_fd, table_buf, table_size,
+ w->hdr.lookup_table_res_entry.offset) != table_size)
{
- ERROR_WITH_ERRNO("Failed to seek to byte %"PRIu64" to read "
- "lookup table",
- w->hdr.lookup_table_res_entry.offset);
- return WIMLIB_ERR_READ;
+ ret = WIMLIB_ERR_READ;
+ goto out_free_table_buf;
}
num_entries = w->hdr.lookup_table_res_entry.original_size /
WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE;
table = new_lookup_table(num_entries * 2 + 1);
- if (!table)
- return WIMLIB_ERR_NOMEM;
+ if (!table) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out_free_table_buf;
+ }
w->current_image = 0;
+ p = table_buf;
while (num_entries--) {
- const u8 *p;
-
- if (fread(buf, 1, sizeof(buf), w->fp) != sizeof(buf)) {
- if (feof(w->fp)) {
- ERROR("Unexpected EOF in WIM lookup table!");
- } else {
- ERROR_WITH_ERRNO("Error reading WIM lookup "
- "table");
- }
- ret = WIMLIB_ERR_READ;
- goto out_free_lookup_table;
- }
cur_entry = new_lookup_table_entry();
if (!cur_entry) {
ret = WIMLIB_ERR_NOMEM;
cur_entry->wim = w;
cur_entry->resource_location = RESOURCE_IN_WIM;
- p = get_resource_entry(buf, &cur_entry->resource_entry);
+ p = get_resource_entry(p, &cur_entry->resource_entry);
p = get_u16(p, &cur_entry->part_number);
p = get_u32(p, &cur_entry->refcnt);
p = get_bytes(p, SHA1_HASH_SIZE, cur_entry->hash);
DEBUG("Done reading lookup table.");
w->lookup_table = table;
ret = 0;
- goto out;
+ goto out_free_table_buf;
out_free_cur_entry:
FREE(cur_entry);
out_free_lookup_table:
free_lookup_table(table);
-out:
+out_free_table_buf:
+ FREE(table_buf);
w->current_image = 0;
return ret;
}
/*
* Writes a lookup table entry to the output file.
*/
+static void *
+write_lookup_table_entry(struct wim_lookup_table_entry *lte, void *buf_p)
+{
+ buf_p = put_resource_entry(buf_p, <e->output_resource_entry);
+ buf_p = put_u16(buf_p, lte->part_number);
+ buf_p = put_u32(buf_p, lte->out_refcnt);
+ buf_p = put_bytes(buf_p, SHA1_HASH_SIZE, lte->hash);
+ return buf_p;
+}
+
int
-write_lookup_table_entry(struct wim_lookup_table_entry *lte, void *_out)
+write_lookup_table_from_stream_list(struct list_head *stream_list,
+ filedes_t out_fd,
+ struct resource_entry *out_res_entry)
{
- FILE *out;
- u8 buf[WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE];
- u8 *p;
+ size_t num_entries;
+ struct list_head *pos;
+ size_t table_size;
+ void *table_buf;
+ void *buf_p;
+ struct wim_lookup_table_entry *lte;
+ off_t start_offset;
+ int ret;
- out = _out;
+ start_offset = filedes_offset(out_fd);
+ if (start_offset == -1)
+ return WIMLIB_ERR_WRITE;
- /* Don't write entries that have not had file resources or metadata
- * resources written for them. */
- if (lte->out_refcnt == 0)
- return 0;
+ num_entries = 0;
+ list_for_each(pos, stream_list)
+ num_entries++;
+ table_size = num_entries * WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE;
- 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);
+ table_buf = MALLOC(table_size);
+ if (!table_buf) {
+ ERROR("Failed to allocate lookup table buffer of %zu bytes", table_size);
+ return WIMLIB_ERR_NOMEM;
}
- p = put_resource_entry(buf, <e->output_resource_entry);
- p = put_u16(p, lte->part_number);
- p = put_u32(p, lte->out_refcnt);
- p = put_bytes(p, SHA1_HASH_SIZE, lte->hash);
- if (fwrite(buf, 1, sizeof(buf), out) != sizeof(buf)) {
- ERROR_WITH_ERRNO("Failed to write lookup table entry");
- return WIMLIB_ERR_WRITE;
+ buf_p = table_buf;
+ list_for_each_entry(lte, stream_list, lookup_table_list)
+ buf_p = write_lookup_table_entry(lte, buf_p);
+
+ wimlib_assert(buf_p - table_buf == table_size);
+
+ if (full_write(out_fd, table_buf, table_size) != table_size) {
+ ERROR_WITH_ERRNO("Failed to write lookup table");
+ ret = WIMLIB_ERR_WRITE;
+ goto out_free_table_buf;
}
+
+ out_res_entry->offset = start_offset;
+ out_res_entry->size = table_size;
+ out_res_entry->original_size = table_size;
+ out_res_entry->flags = WIM_RESHDR_FLAG_METADATA;
+ ret = 0;
+out_free_table_buf:
+ FREE(table_buf);
+ return ret;
+}
+
+static int
+append_lookup_table_entry(struct wim_lookup_table_entry *lte, void *_list)
+{
+ struct list_head *list = _list;
+
+ if (lte->out_refcnt != 0)
+ list_add_tail(<e->lookup_table_list, list);
return 0;
}
+
/* 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;
+ LIST_HEAD(stream_list);
+ int start_image;
+ int end_image;
- start_offset = ftello(out);
- if (start_offset == -1)
- return WIMLIB_ERR_WRITE;
-
- /* Write lookup table entries for metadata resources */
if (image == WIMLIB_ALL_IMAGES) {
start_image = 1;
end_image = w->hdr.image_count;
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;
+ append_lookup_table_entry(metadata_lte, &stream_list);
}
- /* 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;
-
- out_res_entry->offset = start_offset;
- 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;
+ for_lookup_table_entry(w->lookup_table,
+ append_lookup_table_entry,
+ &stream_list);
+ return write_lookup_table_from_stream_list(&stream_list,
+ w->out_fd,
+ out_res_entry);
}
int
union {
struct list_head unhashed_list;
struct list_head swm_stream_list;
+ struct list_head lookup_table_list;
struct list_head extraction_list;
struct list_head export_stream_list;
};
extern int
write_lookup_table(WIMStruct *w, int image, struct resource_entry *out_res_entry);
+extern int
+write_lookup_table_from_stream_list(struct list_head *stream_list,
+ filedes_t out_fd,
+ struct resource_entry *out_res_entry);
+
extern void
free_lookup_table(struct wim_lookup_table *table);
extern void
inode_unresolve_ltes(struct wim_inode *inode);
-extern int
-write_lookup_table_entry(struct wim_lookup_table_entry *lte, void *__out);
-
static inline struct wim_lookup_table_entry *
inode_stream_lte_resolved(const struct wim_inode *inode, unsigned stream_idx)
{
}
/* 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);
return open_flags & (O_RDWR | O_WRONLY);
}
-/* Like pread(), but keep trying until everything has been read or we know for
- * sure that there was an error. */
-static ssize_t
-full_pread(int fd, void *buf, size_t count, off_t offset)
-{
- ssize_t bytes_remaining = count;
- ssize_t bytes_read;
-
- while (bytes_remaining > 0) {
- bytes_read = pread(fd, buf, bytes_remaining, offset);
- if (bytes_read <= 0) {
- if (bytes_read < 0) {
- if (errno == EINTR)
- continue;
- } else {
- errno = EIO;
- }
- break;
- }
- bytes_remaining -= bytes_read;
- buf += bytes_read;
- offset += bytes_read;
- }
- return count - bytes_remaining;
-}
-
-/* Like pwrite(), but keep trying until everything has been written or we know
- * for sure that there was an error. */
-static ssize_t
-full_pwrite(int fd, const void *buf, size_t count, off_t offset)
-{
- ssize_t bytes_remaining = count;
- ssize_t bytes_written;
-
- while (bytes_remaining > 0) {
- bytes_written = pwrite(fd, buf, bytes_remaining, offset);
- if (bytes_written < 0) {
- if (errno == EINTR)
- continue;
- break;
- }
- bytes_remaining -= bytes_written;
- buf += bytes_written;
- offset += bytes_written;
- }
- return count - bytes_remaining;
-}
-
/*
* Allocate a file descriptor for a stream.
*
if (res_size > size)
return -ERANGE;
- ret = read_full_resource_into_buf(lte, value, true);
- if (ret != 0)
+ ret = read_full_resource_into_buf(lte, value);
+ if (ret)
return -EIO;
return res_size;
break;
case RESOURCE_IN_WIM:
if (read_partial_wim_resource_into_buf(fd->f_lte, size,
- offset, buf, true))
+ offset, buf))
ret = -errno;
else
ret = size;
}
if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
- ret = lock_wim(wim, wim->fp);
+ ret = lock_wim(wim, wim->in_fd);
if (ret)
goto out;
}
p = put_u16(p, wim_resource_size(lte)); /* ReparseDataLength */
p = put_u16(p, 0); /* Reserved */
- ret = read_full_resource_into_buf(lte, p, false);
+ ret = read_full_resource_into_buf(lte, p);
if (ret)
return ret;
}
/* Read the data from the WIM file */
- ret = read_full_resource_into_buf(lte, rpbuf + 8, true);
+ ret = read_full_resource_into_buf(lte, rpbuf + 8);
if (ret)
return ret;
# include <alloca.h>
#endif
-/* Write @n bytes from @buf to the file descriptor @fd, retrying on internupt
- * and on short writes.
- *
- * Returns short count and set errno on failure. */
-static ssize_t
-full_write(int fd, const void *buf, size_t n)
-{
- const void *p = buf;
- ssize_t ret;
- ssize_t total = 0;
-
- while (total != n) {
- ret = write(fd, p, n);
- if (ret < 0) {
- if (errno == EINTR)
- continue;
- else
- break;
- }
- total += ret;
- p += ret;
- }
- return total;
-}
-
-/* Read @n bytes from the file descriptor @fd to the buffer @buf, retrying on
- * internupt and on short reads.
- *
- * Returns short count and set errno on failure. */
-static size_t
-full_read(int fd, void *buf, size_t n)
-{
- size_t bytes_remaining = n;
- while (bytes_remaining) {
- ssize_t bytes_read = read(fd, buf, bytes_remaining);
- if (bytes_read < 0) {
- if (errno == EINTR)
- continue;
- break;
- }
- bytes_remaining -= bytes_read;
- buf += bytes_read;
- }
- return n - bytes_remaining;
-}
-
/*
* Reads all or part of a compressed WIM resource.
*
* Returns zero on success, nonzero on failure.
*/
static int
-read_compressed_resource(FILE *fp,
+read_compressed_resource(filedes_t in_fd,
u64 resource_compressed_size,
u64 resource_uncompressed_size,
u64 resource_offset,
/* Skip over unneeded chunk table entries. */
u64 file_offset_of_needed_chunk_entries = resource_offset +
start_table_idx * chunk_entry_size;
- if (fseeko(fp, file_offset_of_needed_chunk_entries, SEEK_SET))
- goto read_error;
/* Number of bytes we need to read from the chunk table. */
size_t size = num_needed_chunk_entries * chunk_entry_size;
* avoid allocating another array. */
void *chunk_tab_buf = (void*)&chunk_offsets[num_needed_chunks] - size;
- if (fread(chunk_tab_buf, 1, size, fp) != size)
+ if (full_pread(in_fd, chunk_tab_buf, size,
+ file_offset_of_needed_chunk_entries) != size)
goto read_error;
/* Now fill in chunk_offsets from the entries we have read in
/* Done with the chunk table now. We must now seek to the first chunk
* that is needed for the read. */
- u64 file_offset_of_first_needed_chunk = resource_offset +
- chunk_table_size + chunk_offsets[0];
- if (fseeko(fp, file_offset_of_first_needed_chunk, SEEK_SET))
- goto read_error;
+ u64 cur_read_offset = resource_offset + chunk_table_size + chunk_offsets[0];
/* Pointer to current position in the output buffer for uncompressed
* data. Alternatively, if using a callback function, we repeatedly
* is equal to the uncompressed chunk size. */
if (compressed_chunk_size == uncompressed_chunk_size) {
/* Uncompressed chunk */
- if (start_offset != 0)
- if (fseeko(fp, start_offset, SEEK_CUR))
- goto read_error;
- if (fread(cb ? out_p + start_offset : out_p,
- 1, partial_chunk_size, fp) != partial_chunk_size)
+ if (full_pread(in_fd,
+ cb ? out_p + start_offset : out_p,
+ partial_chunk_size,
+ cur_read_offset + start_offset) != partial_chunk_size)
+ {
goto read_error;
+ }
} else {
/* Compressed chunk */
/* Read the compressed data into compressed_buf. */
- if (fread(compressed_buf, 1, compressed_chunk_size,
- fp) != compressed_chunk_size)
+ if (full_pread(in_fd,
+ compressed_buf,
+ compressed_chunk_size,
+ cur_read_offset) != compressed_chunk_size)
+ {
goto read_error;
+ }
/* For partial chunks and when writing directly to a
* buffer, we must buffer the uncompressed data because
* written. */
out_p += partial_chunk_size;
}
+ cur_read_offset += compressed_chunk_size;
}
ret = 0;
return ret;
read_error:
- if (feof(fp))
- ERROR("Unexpected EOF in compressed file resource");
- else
- ERROR_WITH_ERRNO("Error reading compressed file resource");
+ ERROR_WITH_ERRNO("Error reading compressed file resource");
ret = WIMLIB_ERR_READ;
goto out;
}
return p;
}
-static FILE *
-wim_get_fp(WIMStruct *w)
-{
- FILE *fp;
-#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
- pthread_mutex_lock(&w->fp_tab_mutex);
-
- wimlib_assert(w->filename != NULL);
-
- for (size_t i = 0; i < w->num_allocated_fps; i++) {
- if (w->fp_tab[i]) {
- fp = w->fp_tab[i];
- w->fp_tab[i] = NULL;
- goto out_unlock;
- }
- }
- DEBUG("Opening extra file descriptor to `%"TS"'", w->filename);
- fp = tfopen(w->filename, T("rb"));
- if (!fp)
- ERROR_WITH_ERRNO("Failed to open `%"TS"'", w->filename);
-out_unlock:
- pthread_mutex_unlock(&w->fp_tab_mutex);
-#else /* WITH_FUSE || ENABLE_MULTITHREADED_COMPRESSION */
- fp = w->fp;
-#endif /* !WITH_FUSE && !ENABLE_MULTITHREADED_COMPRESSION */
- return fp;
-}
-
-static int
-wim_release_fp(WIMStruct *w, FILE *fp)
-{
- int ret = 0;
-#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
- FILE **fp_tab;
-
- pthread_mutex_lock(&w->fp_tab_mutex);
-
- for (size_t i = 0; i < w->num_allocated_fps; i++) {
- if (w->fp_tab[i] == NULL) {
- w->fp_tab[i] = fp;
- goto out_unlock;
- }
- }
-
- fp_tab = REALLOC(w->fp_tab, sizeof(FILE*) * (w->num_allocated_fps + 4));
- if (!fp_tab) {
- ret = WIMLIB_ERR_NOMEM;
- fclose(fp);
- goto out_unlock;
- }
- w->fp_tab = fp_tab;
- memset(&w->fp_tab[w->num_allocated_fps], 0, 4 * sizeof(FILE*));
- w->fp_tab[w->num_allocated_fps] = fp;
- w->num_allocated_fps += 4;
-out_unlock:
- pthread_mutex_unlock(&w->fp_tab_mutex);
-#endif /* WITH_FUSE || ENABLE_MULTITHREADED_COMPRESSION */
- return ret;
-}
-
static int
read_partial_wim_resource(const struct wim_lookup_table_entry *lte,
u64 size,
int flags,
u64 offset)
{
- FILE *wim_fp;
WIMStruct *wim;
+ filedes_t in_fd;
int ret;
wimlib_assert(lte->resource_location == RESOURCE_IN_WIM);
wim = lte->wim;
- if (flags & WIMLIB_RESOURCE_FLAG_THREADSAFE_READ) {
- wim_fp = wim_get_fp(wim);
- if (!wim_fp) {
- ret = WIMLIB_ERR_READ;
- goto out;
- }
- } else {
- wim_fp = lte->wim->fp;
- }
+ in_fd = wim->in_fd;
if (lte->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED &&
!(flags & WIMLIB_RESOURCE_FLAG_RAW))
{
- ret = read_compressed_resource(wim_fp,
+ ret = read_compressed_resource(in_fd,
lte->resource_entry.size,
lte->resource_entry.original_size,
lte->resource_entry.offset,
ctx_or_buf);
} else {
offset += lte->resource_entry.offset;
-
- if (fseeko(wim_fp, offset, SEEK_SET)) {
- ERROR_WITH_ERRNO("Failed to seek to offset %"PRIu64
- " in WIM", offset);
- ret = WIMLIB_ERR_READ;
- goto out_release_fp;
- }
if (cb) {
/* Send data to callback function */
u8 buf[min(WIM_CHUNK_SIZE, size)];
while (size) {
size_t bytes_to_read = min(WIM_CHUNK_SIZE, size);
- size_t bytes_read = fread(buf, 1, bytes_to_read, wim_fp);
-
+ size_t bytes_read = full_pread(in_fd, buf,
+ bytes_to_read, offset);
if (bytes_read != bytes_to_read)
goto read_error;
ret = cb(buf, bytes_read, ctx_or_buf);
if (ret)
- goto out_release_fp;
+ goto out;
size -= bytes_read;
+ offset += bytes_read;
}
} else {
/* Send data directly to a buffer */
- if (fread(ctx_or_buf, 1, size, wim_fp) != size)
+ if (full_pread(in_fd, ctx_or_buf, size, offset) != size)
goto read_error;
}
ret = 0;
}
- goto out_release_fp;
+ goto out;
read_error:
- if (ferror(wim_fp))
- ERROR_WITH_ERRNO("Error reading data from WIM");
- else
- ERROR("Unexpected EOF in WIM!");
+ ERROR_WITH_ERRNO("Error reading data from WIM");
ret = WIMLIB_ERR_READ;
-out_release_fp:
- if (flags & WIMLIB_RESOURCE_FLAG_THREADSAFE_READ) {
- int ret2 = wim_release_fp(wim, wim_fp);
- if (ret == 0)
- ret = ret2;
- }
out:
if (ret) {
if (errno == 0)
int
read_partial_wim_resource_into_buf(const struct wim_lookup_table_entry *lte,
- size_t size, u64 offset, void *buf,
- bool threadsafe)
+ size_t size, u64 offset, void *buf)
{
- return read_partial_wim_resource(lte, size, NULL, buf,
- threadsafe ? WIMLIB_RESOURCE_FLAG_THREADSAFE_READ : 0,
- offset);
+ return read_partial_wim_resource(lte, size, NULL, buf, 0, offset);
}
static int
int
read_full_resource_into_buf(const struct wim_lookup_table_entry *lte,
- void *buf, bool thread_safe)
+ void *buf)
{
- return read_resource_prefix(lte,
- wim_resource_size(lte),
- NULL, buf,
- thread_safe ? WIMLIB_RESOURCE_FLAG_THREADSAFE_READ : 0);
+ return read_resource_prefix(lte, wim_resource_size(lte), NULL, buf, 0);
}
struct extract_ctx {
sha1_final(hash, &ctx.sha_ctx);
if (!hashes_equal(hash, lte->hash)) {
#ifdef ENABLE_ERROR_MESSAGES
- ERROR_WITH_ERRNO("Invalid SHA1 message digest "
- "on the following WIM resource:");
+ ERROR("Invalid SHA1 message digest "
+ "on the following WIM resource:");
print_lookup_table_entry(lte, stderr);
if (lte->resource_location == RESOURCE_IN_WIM)
ERROR("The WIM file appears to be corrupt!");
WIMStruct *w = wim;
int ret;
- ret = write_wim_resource(lte, w->out_fp,
+ ret = write_wim_resource(lte, w->out_fd,
wim_resource_compression_type(lte),
<e->output_resource_entry, 0);
if (ret == 0) {
finish_swm(WIMStruct *w, struct list_head *lte_list,
int write_flags, wimlib_progress_func_t progress_func)
{
- off_t lookup_table_offset = ftello(w->out_fp);
int ret;
- struct wim_lookup_table_entry *lte;
- list_for_each_entry(lte, lte_list, swm_stream_list) {
- ret = write_lookup_table_entry(lte, w->out_fp);
- if (ret)
- return ret;
- }
-
- off_t xml_data_offset = ftello(w->out_fp);
-
- if (lookup_table_offset == -1 || xml_data_offset == -1)
- return WIMLIB_ERR_WRITE;
- w->hdr.lookup_table_res_entry.offset = lookup_table_offset;
- w->hdr.lookup_table_res_entry.size =
- xml_data_offset - lookup_table_offset;
- w->hdr.lookup_table_res_entry.original_size =
- xml_data_offset - lookup_table_offset;
- w->hdr.lookup_table_res_entry.flags = WIM_RESHDR_FLAG_METADATA;
+ ret = write_lookup_table_from_stream_list(lte_list, w->out_fd,
+ &w->hdr.lookup_table_res_entry);
+ if (ret)
+ return ret;
return finish_write(w, WIMLIB_ALL_IMAGES,
write_flags | WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE,
progress_func);
#include "config.h"
+
#undef _GNU_SOURCE
/* Make sure the POSIX-compatible strerror_r() is declared, rather than the GNU
* version, which has a different return type. */
-#define _POSIX_C_SOURCE 200112
#include <string.h>
+
#define _GNU_SOURCE
+#include <unistd.h>
#include "wimlib_internal.h"
#include "endianness.h"
#include <stdlib.h>
#include <stdarg.h>
-#include <unistd.h> /* for getpid() */
-
#ifdef __WIN32__
#include "win32.h"
#endif
= T("Could not read the target of a symbolic link"),
[WIMLIB_ERR_RENAME]
= T("Could not rename a file"),
- [WIMLIB_ERR_REOPEN]
- = T("Could not re-open the WIM after overwriting it"),
[WIMLIB_ERR_REPARSE_POINT_FIXUP_FAILED]
= T("Unable to complete reparse point fixup"),
[WIMLIB_ERR_RESOURCE_ORDER]
}
}
}
+
+/* Write @n bytes from @buf to the file descriptor @fd, retrying on internupt
+ * and on short writes.
+ *
+ * Returns short count and set errno on failure. */
+size_t
+full_write(int fd, const void *buf, size_t n)
+{
+ const void *p = buf;
+ ssize_t ret;
+ ssize_t total = 0;
+
+ while (total != n) {
+ ret = write(fd, p, n);
+ if (ret <= 0) {
+ if (errno == EINTR)
+ continue;
+ if (ret == 0)
+ errno = EIO;
+ break;
+ }
+ total += ret;
+ p += ret;
+ }
+ return total;
+}
+
+/* Read @n bytes from the file descriptor @fd to the buffer @buf, retrying on
+ * interrupt and on short reads.
+ *
+ * Returns short count and set errno on failure. */
+size_t
+full_read(int fd, void *buf, size_t n)
+{
+ size_t bytes_remaining = n;
+ while (bytes_remaining) {
+ ssize_t bytes_read = read(fd, buf, bytes_remaining);
+ if (bytes_read <= 0) {
+ if (errno == EINTR)
+ continue;
+ if (bytes_read == 0)
+ errno = EIO;
+ break;
+ }
+ bytes_remaining -= bytes_read;
+ buf += bytes_read;
+ }
+ return n - bytes_remaining;
+}
+
+/* Read @n bytes from the file descriptor @fd at the offset @offset to the
+ * buffer @buf, retrying on interrupt and on short reads.
+ *
+ * Returns short count and set errno on failure. */
+size_t
+full_pread(int fd, void *buf, size_t nbyte, off_t offset)
+{
+ size_t bytes_remaining = nbyte;
+ ssize_t bytes_read;
+
+ while (bytes_remaining) {
+ bytes_read = pread(fd, buf, bytes_remaining, offset);
+ if (bytes_read <= 0) {
+ if (errno == EINTR)
+ continue;
+ if (bytes_read == 0)
+ errno = EIO;
+ break;
+ }
+ bytes_remaining -= bytes_read;
+ buf += bytes_read;
+ offset += bytes_read;
+ }
+ return nbyte - bytes_remaining;
+}
+
+/* Like pwrite(), but keep trying until everything has been written or we know
+ * for sure that there was an error. */
+size_t
+full_pwrite(int fd, const void *buf, size_t count, off_t offset)
+{
+ ssize_t bytes_remaining = count;
+ ssize_t bytes_written;
+
+ while (bytes_remaining > 0) {
+ bytes_written = pwrite(fd, buf, bytes_remaining, offset);
+ if (bytes_written <= 0) {
+ if (errno == EINTR)
+ continue;
+ if (bytes_written == 0)
+ errno = EIO;
+ break;
+ }
+ bytes_remaining -= bytes_written;
+ buf += bytes_written;
+ offset += bytes_written;
+ }
+ return count - bytes_remaining;
+}
+
+
+off_t
+filedes_offset(filedes_t fd)
+{
+ return lseek(fd, 0, SEEK_CUR);
+}
#define ZERO_ARRAY(array) memset(array, 0, sizeof(array))
/* Used for buffering FILE IO in a few places */
-#define BUFFER_SIZE 4096
+#define BUFFER_SIZE 32768
static inline void FORMAT(printf, 1, 2)
dummy_tprintf(const tchar *format, ...)
return n * 0x9e37fffffffc0001ULL;
}
+typedef int filedes_t;
+
+extern size_t
+full_read(filedes_t fd, void *buf, size_t n);
+
+extern size_t
+full_write(filedes_t fd, const void *buf, size_t n);
+
+extern size_t
+full_pread(filedes_t fd, void *buf, size_t nbyte, off_t offset);
+
+extern size_t
+full_pwrite(int fd, const void *buf, size_t count, off_t offset);
+
+extern off_t
+filedes_offset(filedes_t fd);
+
+#define INVALID_FILEDES (-1)
+
#endif /* _WIMLIB_UTIL_H */
new_wim_struct()
{
WIMStruct *w = CALLOC(1, sizeof(WIMStruct));
-#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
- if (pthread_mutex_init(&w->fp_tab_mutex, NULL) != 0) {
- ERROR_WITH_ERRNO("Failed to initialize mutex");
- FREE(w);
- w = NULL;
- }
-#endif
+ w->in_fd = INVALID_FILEDES;
+ w->out_fd = INVALID_FILEDES;
+ w->current_image = WIMLIB_NO_IMAGE;
return w;
-
}
/*
return w->hdr.boot_idx;
}
+static int
+do_open_wim(const tchar *filename, filedes_t *fd_ret)
+{
+ int fd;
+
+ fd = open(filename, O_RDONLY);
+ if (fd == -1) {
+ ERROR_WITH_ERRNO("Can't open \"%"TS"\" read-only", filename);
+ return WIMLIB_ERR_OPEN;
+ }
+ *fd_ret = fd;
+ return 0;
+}
+
+int
+reopen_wim(WIMStruct *w)
+{
+ wimlib_assert(w->in_fd == INVALID_FILEDES);
+ return do_open_wim(w->filename, &w->in_fd);
+}
+
+int
+close_wim(WIMStruct *w)
+{
+ close(w->in_fd);
+ w->in_fd = INVALID_FILEDES;
+ return 0;
+}
+
/*
* Begins the reading of a WIM file; opens the file and reads its header and
* lookup table, and optionally checks the integrity.
DEBUG("Reading the WIM file `%"TS"'", in_wim_path);
- w->fp = tfopen(in_wim_path, T("rb"));
- if (!w->fp) {
- ERROR_WITH_ERRNO("Failed to open `%"TS"' for reading",
- in_wim_path);
- return WIMLIB_ERR_OPEN;
- }
+ ret = do_open_wim(in_wim_path, &w->in_fd);
+ if (ret)
+ return ret;
/* The absolute path to the WIM is requested so that wimlib_overwrite()
* still works even if the process changes its working directory. This
return WIMLIB_ERR_OPEN;
}
- ret = read_header(w->fp, &w->hdr, open_flags);
+ ret = read_header(w->in_fd, &w->hdr, open_flags);
if (ret)
return ret;
if (ret)
return ret;
- ret = read_xml_data(w->fp, &w->hdr.xml_res_entry, &w->wim_info);
+ ret = read_xml_data(w->in_fd, &w->hdr.xml_res_entry, &w->wim_info);
if (ret)
return ret;
if (!w)
return;
- if (w->fp)
- fclose(w->fp);
- if (w->out_fp)
- fclose(w->out_fp);
-
-#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
- if (w->fp_tab) {
- for (size_t i = 0; i < w->num_allocated_fps; i++)
- if (w->fp_tab[i])
- fclose(w->fp_tab[i]);
- FREE(w->fp_tab);
- }
- pthread_mutex_destroy(&w->fp_tab_mutex);
-#endif
+ if (w->in_fd != INVALID_FILEDES)
+ close(w->in_fd);
+ if (w->out_fd != INVALID_FILEDES)
+ close(w->out_fd);
free_lookup_table(w->lookup_table);
* and while abnormal termination of the program will result in extra data
* appended to the original WIM, it should still be a valid WIM.
*
+ * If this function completes successfully, no functions should be called on @a
+ * wim other than wimlib_free(). You must use wimlib_open_wim() to read the WIM
+ * file anew.
+ *
* @param wim
* Pointer to the ::WIMStruct for the WIM file to write. There may have
* been in-memory changes made to it, which are then reflected in the
* @retval ::WIMLIB_ERR_RENAME
* The temporary file that the WIM was written to could not be renamed to
* the original filename of @a wim.
- * @retval ::WIMLIB_ERR_REOPEN
- * The WIM was overwritten successfully, but it could not be re-opened
- * read-only. Therefore, the resources in the WIM can no longer be
- * accessed, so this limits the functions that can be called on @a wim
- * before calling wimlib_free().
*/
extern int
wimlib_overwrite(WIMStruct *wim, int write_flags, unsigned num_threads,
/* The opaque structure exposed to the wimlib API. */
struct WIMStruct {
- /* A pointer to the file indicated by @filename, opened for reading. */
- FILE *fp;
-
-#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
- /* Extra file pointers to be used by concurrent readers */
- FILE **fp_tab;
- size_t num_allocated_fps;
- pthread_mutex_t fp_tab_mutex;
-#endif
+ /* File descriptor for the WIM file, opened for reading, or -1 if it has
+ * not been opened or there is no associated file backing it yet. */
+ filedes_t in_fd;
/* FILE pointer for the WIM file (if any) currently being written. */
- FILE *out_fp;
+ filedes_t out_fd;
/* The name of the WIM file (if any) that has been opened. */
tchar *filename;
/* header.c */
extern int
-read_header(FILE *fp, struct wim_header *hdr, int split_ok);
+read_header(filedes_t in_fd, struct wim_header *hdr, int split_ok);
extern int
-write_header(const struct wim_header *hdr, FILE *out);
+write_header(const struct wim_header *hdr, filedes_t out_fd);
extern int
init_header(struct wim_header *hdr, int ctype);
#define WIM_INTEGRITY_NONEXISTENT -2
extern int
-write_integrity_table(FILE *out, struct resource_entry *integrity_res_entry,
+write_integrity_table(filedes_t fd,
+ struct resource_entry *integrity_res_entry,
off_t new_lookup_table_end,
off_t old_lookup_table_end,
wimlib_progress_func_t progress_func);
/* resource.c */
#define WIMLIB_RESOURCE_FLAG_RAW 0x1
-#define WIMLIB_RESOURCE_FLAG_THREADSAFE_READ 0x2
#define WIMLIB_RESOURCE_FLAG_RECOMPRESS 0x4
extern int
extern void *
put_resource_entry(void *p, const struct resource_entry *entry);
-extern int
-read_uncompressed_resource(FILE *fp, u64 offset, u64 size, void *buf);
-
extern int
read_partial_wim_resource_into_buf(const struct wim_lookup_table_entry *lte,
- size_t size, u64 offset, void *buf,
- bool threadsafe);
+ size_t size, u64 offset, void *buf);
extern int
-read_full_resource_into_buf(const struct wim_lookup_table_entry *lte,
- void *buf, bool thread_safe);
+read_full_resource_into_buf(const struct wim_lookup_table_entry *lte, void *buf);
extern int
-write_wim_resource(struct wim_lookup_table_entry *lte, FILE *out_fp,
+write_wim_resource(struct wim_lookup_table_entry *lte, filedes_t out_fd,
int out_ctype, struct resource_entry *out_res_entry,
int flags);
extern int
wim_checksum_unhashed_streams(WIMStruct *w);
+extern int
+reopen_wim(WIMStruct *w);
+
+extern int
+close_wim(WIMStruct *w);
+
/* write.c */
/* Internal use only */
#if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
extern int
-lock_wim(WIMStruct *w, FILE *fp);
+lock_wim(WIMStruct *w, filedes_t fd);
#else
static inline int
-lock_wim(WIMStruct *w, FILE *fp)
+lock_wim(WIMStruct *w, filedes_t fd)
{
return 0;
}
#include <limits.h>
+#include <sys/uio.h> /* writev() */
+
/* 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.) */
*/
static int
begin_wim_resource_chunk_tab(const struct wim_lookup_table_entry *lte,
- FILE *out_fp,
+ int out_fd,
off_t file_offset,
struct chunk_table **chunk_tab_ret)
{
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) {
+ if (full_write(out_fd, chunk_tab,
+ chunk_tab->table_disk_size) != chunk_tab->table_disk_size)
+ {
ERROR_WITH_ERRNO("Failed to write chunk table in compressed "
"file resource");
FREE(chunk_tab);
*
* @chunk: Uncompressed data of the chunk.
* @chunk_size: Size of the chunk (<= WIM_CHUNK_SIZE)
- * @out_fp: FILE * to write the chunk to.
+ * @out_fd: FILE descriptor to write the chunk to.
* @compress: Compression function to use (NULL if writing uncompressed
* data).
* @chunk_tab: Pointer to chunk table being created. It is updated with the
static int
write_wim_resource_chunk(const void * restrict chunk,
unsigned chunk_size,
- FILE * restrict out_fp,
+ filedes_t out_fd,
compress_func_t compress,
struct chunk_table * restrict chunk_tab)
{
out_chunk = chunk;
out_chunk_size = chunk_size;
}
- if (fwrite(out_chunk, 1, out_chunk_size, out_fp) != out_chunk_size) {
+ if (full_write(out_fd, out_chunk, out_chunk_size) != out_chunk_size) {
ERROR_WITH_ERRNO("Failed to write WIM resource chunk");
return WIMLIB_ERR_WRITE;
}
* @compressed_size_p.
*/
static int
-finish_wim_resource_chunk_tab(struct chunk_table * restrict chunk_tab,
- FILE * restrict out_fp,
- u64 * restrict compressed_size_p)
+finish_wim_resource_chunk_tab(struct chunk_table *chunk_tab,
+ filedes_t out_fd, u64 *compressed_size_p)
{
size_t bytes_written;
- if (fseeko(out_fp, chunk_tab->file_offset, SEEK_SET) != 0) {
- 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_cpu_to_le64(chunk_tab->offsets, chunk_tab->num_chunks);
((u32*)chunk_tab->offsets)[i] =
cpu_to_le32(chunk_tab->offsets[i]);
}
- bytes_written = fwrite((u8*)chunk_tab->offsets +
- chunk_tab->bytes_per_chunk_entry,
- 1, chunk_tab->table_disk_size, out_fp);
+ bytes_written = full_pwrite(out_fd,
+ (u8*)chunk_tab->offsets + chunk_tab->bytes_per_chunk_entry,
+ chunk_tab->table_disk_size,
+ chunk_tab->file_offset);
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, 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
-fflush_and_ftruncate(FILE *out_fp, off_t offset)
+seek_and_truncate(filedes_t out_fd, off_t offset)
{
- if (fseeko(out_fp, offset, SEEK_SET) ||
- fflush(out_fp) ||
- ftruncate(fileno(out_fp), offset))
+ if (lseek(out_fd, offset, SEEK_SET) == -1 ||
+ ftruncate(out_fd, offset))
{
- ERROR_WITH_ERRNO("Failed to flush and/or truncate "
- "output WIM file");
+ ERROR_WITH_ERRNO("Failed to truncate output WIM file");
return WIMLIB_ERR_WRITE;
} else {
return 0;
struct write_resource_ctx {
compress_func_t compress;
struct chunk_table *chunk_tab;
- FILE *out_fp;
+ filedes_t out_fd;
SHA_CTX sha_ctx;
bool doing_sha;
};
if (ctx->doing_sha)
sha1_update(&ctx->sha_ctx, chunk, chunk_size);
return write_wim_resource_chunk(chunk, chunk_size,
- ctx->out_fp, ctx->compress,
+ ctx->out_fd, ctx->compress,
ctx->chunk_tab);
}
* @lte: Lookup table entry for the resource, which could be in another WIM,
* in an external file, or in another location.
*
- * @out_fp: FILE * opened to the output WIM.
+ * @out_fp: File descriptor opened to the output WIM.
*
* @out_ctype: One of the WIMLIB_COMPRESSION_TYPE_* constants to indicate
* which compression algorithm to use.
*/
int
write_wim_resource(struct wim_lookup_table_entry *lte,
- FILE *out_fp, int out_ctype,
+ filedes_t out_fd, int out_ctype,
struct resource_entry *out_res_entry,
int flags)
{
flags &= ~WIMLIB_RESOURCE_FLAG_RECOMPRESS;
/* Get current position in output WIM */
- offset = ftello(out_fp);
+ offset = filedes_offset(out_fd);
if (offset == -1) {
ERROR_WITH_ERRNO("Can't get position in output WIM");
return WIMLIB_ERR_WRITE;
write_ctx.chunk_tab = NULL;
} else {
write_ctx.compress = get_compress_func(out_ctype);
- ret = begin_wim_resource_chunk_tab(lte, out_fp,
+ ret = begin_wim_resource_chunk_tab(lte, out_fd,
offset,
&write_ctx.chunk_tab);
if (ret)
/* Write the entire resource by reading the entire resource and feeding
* the data through the write_resource_cb function. */
- write_ctx.out_fp = out_fp;
+ write_ctx.out_fd = out_fd;
try_write_again:
ret = read_resource_prefix(lte, read_size,
write_resource_cb, &write_ctx, flags);
/* Using a different compression type: Call
* finish_wim_resource_chunk_tab() and it will provide the new
* compressed size. */
- ret = finish_wim_resource_chunk_tab(write_ctx.chunk_tab, out_fp,
+ ret = finish_wim_resource_chunk_tab(write_ctx.chunk_tab, out_fd,
&new_size);
if (ret)
goto out_free_chunk_tab;
DEBUG("Compressed %"PRIu64" => %"PRIu64" bytes; "
"writing uncompressed instead",
wim_resource_size(lte), new_size);
- ret = fflush_and_ftruncate(out_fp, offset);
+ ret = seek_and_truncate(out_fd, offset);
if (ret)
goto out_free_chunk_tab;
write_ctx.compress = NULL;
struct message {
struct wim_lookup_table_entry *lte;
u8 *uncompressed_chunks[MAX_CHUNKS_PER_MSG];
- u8 *out_compressed_chunks[MAX_CHUNKS_PER_MSG];
u8 *compressed_chunks[MAX_CHUNKS_PER_MSG];
unsigned uncompressed_chunk_sizes[MAX_CHUNKS_PER_MSG];
- unsigned compressed_chunk_sizes[MAX_CHUNKS_PER_MSG];
+ struct iovec out_chunks[MAX_CHUNKS_PER_MSG];
+ size_t total_out_bytes;
unsigned num_chunks;
struct list_head list;
bool complete;
static void
compress_chunks(struct message *msg, compress_func_t compress)
{
+ msg->total_out_bytes = 0;
for (unsigned i = 0; i < msg->num_chunks; i++) {
unsigned len = compress(msg->uncompressed_chunks[i],
msg->uncompressed_chunk_sizes[i],
msg->compressed_chunks[i]);
+ void *out_chunk;
+ unsigned out_len;
if (len) {
/* To be written compressed */
- msg->out_compressed_chunks[i] = msg->compressed_chunks[i];
- msg->compressed_chunk_sizes[i] = len;
+ out_chunk = msg->compressed_chunks[i];
+ out_len = len;
} else {
/* To be written uncompressed */
- msg->out_compressed_chunks[i] = msg->uncompressed_chunks[i];
- msg->compressed_chunk_sizes[i] = msg->uncompressed_chunk_sizes[i];
-
+ out_chunk = msg->uncompressed_chunks[i];
+ out_len = msg->uncompressed_chunk_sizes[i];
}
+ msg->out_chunks[i].iov_base = out_chunk;
+ msg->out_chunks[i].iov_len = out_len;
+ msg->total_out_bytes += out_len;
}
}
}
struct serial_write_stream_ctx {
- FILE *out_fp;
+ filedes_t out_fd;
int out_ctype;
int write_resource_flags;
};
serial_write_stream(struct wim_lookup_table_entry *lte, void *_ctx)
{
struct serial_write_stream_ctx *ctx = _ctx;
- return write_wim_resource(lte, ctx->out_fp,
+ return write_wim_resource(lte, ctx->out_fd,
ctx->out_ctype, <e->output_resource_entry,
ctx->write_resource_flags);
}
static int
do_write_stream_list_serial(struct list_head *stream_list,
struct wim_lookup_table *lookup_table,
- FILE *out_fp,
+ filedes_t out_fd,
int out_ctype,
int write_resource_flags,
wimlib_progress_func_t progress_func,
union wimlib_progress_info *progress)
{
struct serial_write_stream_ctx ctx = {
- .out_fp = out_fp,
+ .out_fd = out_fd,
.out_ctype = out_ctype,
.write_resource_flags = write_resource_flags,
};
static int
write_stream_list_serial(struct list_head *stream_list,
struct wim_lookup_table *lookup_table,
- FILE *out_fp,
+ filedes_t out_fd,
int out_ctype,
int write_resource_flags,
wimlib_progress_func_t progress_func,
progress_func(WIMLIB_PROGRESS_MSG_WRITE_STREAMS, progress);
return do_write_stream_list_serial(stream_list,
lookup_table,
- out_fp,
+ out_fd,
out_ctype,
write_resource_flags,
progress_func,
#ifdef ENABLE_MULTITHREADED_COMPRESSION
static int
-write_wim_chunks(struct message *msg, FILE *out_fp,
+write_wim_chunks(struct message *msg, filedes_t out_fd,
struct chunk_table *chunk_tab)
{
- for (unsigned i = 0; i < msg->num_chunks; i++) {
- unsigned chunk_csize = msg->compressed_chunk_sizes[i];
+ ssize_t bytes_remaining = msg->total_out_bytes;
+ struct iovec *vecs = msg->out_chunks;
+ unsigned nvecs = msg->num_chunks;
+ int ret;
- if (fwrite(msg->out_compressed_chunks[i], 1, chunk_csize, out_fp)
- != chunk_csize)
- {
- ERROR_WITH_ERRNO("Failed to write WIM chunk");
- return WIMLIB_ERR_WRITE;
- }
+ wimlib_assert(nvecs != 0);
+ wimlib_assert(msg->total_out_bytes != 0);
+ for (unsigned i = 0; i < msg->num_chunks; i++) {
*chunk_tab->cur_offset_p++ = chunk_tab->cur_offset;
- chunk_tab->cur_offset += chunk_csize;
+ chunk_tab->cur_offset += vecs[i].iov_len;
+ }
+ for (;;) {
+ ssize_t bytes_written;
+
+ bytes_written = writev(out_fd, vecs, nvecs);
+ if (bytes_written <= 0) {
+ if (bytes_written < 0 && errno == EINTR)
+ continue;
+ else if (bytes_written == 0)
+ errno = EIO;
+ ERROR_WITH_ERRNO("Failed to write WIM chunks");
+ ret = WIMLIB_ERR_WRITE;
+ break;
+ }
+ bytes_remaining -= bytes_written;
+ if (bytes_remaining <= 0) {
+ ret = 0;
+ break;
+ }
+ while (bytes_written >= 0) {
+ wimlib_assert(nvecs != 0);
+ if (bytes_written >= vecs[0].iov_len) {
+ vecs++;
+ nvecs--;
+ bytes_written -= vecs[0].iov_len;
+ } else {
+ vecs[0].iov_base += bytes_written;
+ vecs[0].iov_len -= bytes_written;
+ bytes_written = 0;
+ }
+ }
}
- return 0;
+ return ret;
}
struct main_writer_thread_ctx {
struct list_head *stream_list;
struct wim_lookup_table *lookup_table;
- FILE *out_fp;
+ filedes_t out_fd;
int out_ctype;
int write_resource_flags;
struct shared_queue *res_to_compress_queue;
if (msg->begin_chunk == 0) {
/* This is the first set of chunks. Leave space
* for the chunk table in the output file. */
- off_t cur_offset = ftello(ctx->out_fp);
+ off_t cur_offset = filedes_offset(ctx->out_fd);
if (cur_offset == -1)
return WIMLIB_ERR_WRITE;
ret = begin_wim_resource_chunk_tab(cur_lte,
- ctx->out_fp,
+ ctx->out_fd,
cur_offset,
&ctx->cur_chunk_tab);
if (ret)
}
/* Write the compressed chunks from the message. */
- ret = write_wim_chunks(msg, ctx->out_fp, ctx->cur_chunk_tab);
+ ret = write_wim_chunks(msg, ctx->out_fd, ctx->cur_chunk_tab);
if (ret)
return ret;
off_t offset;
ret = finish_wim_resource_chunk_tab(ctx->cur_chunk_tab,
- ctx->out_fp,
+ ctx->out_fd,
&res_csize);
if (ret)
return ret;
DEBUG("Compressed %"PRIu64" => %"PRIu64" bytes; "
"writing uncompressed instead",
wim_resource_size(cur_lte), res_csize);
- ret = fflush_and_ftruncate(ctx->out_fp, offset);
+ ret = seek_and_truncate(ctx->out_fd, offset);
if (ret)
return ret;
ret = write_wim_resource(cur_lte,
- ctx->out_fp,
+ ctx->out_fd,
WIMLIB_COMPRESSION_TYPE_NONE,
&cur_lte->output_resource_entry,
ctx->write_resource_flags);
if (!list_empty(&ctx->serial_streams)) {
ret = do_write_stream_list_serial(&ctx->serial_streams,
ctx->lookup_table,
- ctx->out_fp,
+ ctx->out_fd,
ctx->out_ctype,
ctx->write_resource_flags,
ctx->progress_func,
wimlib_assert(list_empty(&ctx->outstanding_streams));
return do_write_stream_list_serial(&ctx->serial_streams,
ctx->lookup_table,
- ctx->out_fp,
+ ctx->out_fd,
ctx->out_ctype,
ctx->write_resource_flags,
ctx->progress_func,
static int
write_stream_list_parallel(struct list_head *stream_list,
struct wim_lookup_table *lookup_table,
- FILE *out_fp,
+ filedes_t out_fd,
int out_ctype,
int write_resource_flags,
wimlib_progress_func_t progress_func,
struct main_writer_thread_ctx ctx;
ctx.stream_list = stream_list;
ctx.lookup_table = lookup_table;
- ctx.out_fp = out_fp;
+ ctx.out_fd = out_fd;
ctx.out_ctype = out_ctype;
ctx.res_to_compress_queue = &res_to_compress_queue;
ctx.compressed_res_queue = &compressed_res_queue;
ctx.num_messages = queue_size;
- ctx.write_resource_flags = write_resource_flags | WIMLIB_RESOURCE_FLAG_THREADSAFE_READ;
+ ctx.write_resource_flags = write_resource_flags;
ctx.progress_func = progress_func;
ctx.progress = progress;
ret = main_writer_thread_init_ctx(&ctx);
out_serial_quiet:
return write_stream_list_serial(stream_list,
lookup_table,
- out_fp,
+ out_fd,
out_ctype,
write_resource_flags,
progress_func,
#endif
/*
- * Write a list of streams to a WIM (@out_fp) using the compression type
+ * Write a list of streams to a WIM (@out_fd) using the compression type
* @out_ctype and up to @num_threads compressor threads.
*/
static int
write_stream_list(struct list_head *stream_list,
struct wim_lookup_table *lookup_table,
- FILE *out_fp, int out_ctype, int write_flags,
+ filedes_t out_fd, int out_ctype, int write_flags,
unsigned num_threads, wimlib_progress_func_t progress_func)
{
struct wim_lookup_table_entry *lte;
if (total_compression_bytes >= 1000000 && num_threads != 1)
ret = write_stream_list_parallel(stream_list,
lookup_table,
- out_fp,
+ out_fd,
out_ctype,
write_resource_flags,
progress_func,
#endif
ret = write_stream_list_serial(stream_list,
lookup_table,
- out_fp,
+ out_fd,
out_ctype,
write_resource_flags,
progress_func,
return ret;
return write_stream_list(&stream_list,
wim->lookup_table,
- wim->out_fp,
+ wim->out_fd,
wimlib_get_compression_type(wim),
write_flags,
num_threads,
{
int ret;
struct wim_header hdr;
- FILE *out = w->out_fp;
/* @hdr will be the header for the new WIM. First copy all the data
* from the header in the WIMStruct; then set all the fields that may
goto out_close_wim;
}
- ret = write_xml_data(w->wim_info, image, out,
+ ret = write_xml_data(w->wim_info, image, w->out_fd,
(write_flags & WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE) ?
wim_info_get_total_bytes(w->wim_info) : 0,
&hdr.xml_res_entry);
struct wim_header checkpoint_hdr;
memcpy(&checkpoint_hdr, &hdr, sizeof(struct wim_header));
zero_resource_entry(&checkpoint_hdr.integrity);
- if (fseeko(out, 0, SEEK_SET)) {
- ERROR_WITH_ERRNO("Failed to seek to beginning "
- "of WIM being written");
- ret = WIMLIB_ERR_WRITE;
- goto out_close_wim;
- }
- ret = write_header(&checkpoint_hdr, out);
+ ret = write_header(&checkpoint_hdr, w->out_fd);
if (ret)
goto out_close_wim;
-
- if (fflush(out) != 0) {
- ERROR_WITH_ERRNO("Can't write data to WIM");
- ret = WIMLIB_ERR_WRITE;
- goto out_close_wim;
- }
-
- if (fseeko(out, 0, SEEK_END) != 0) {
- ERROR_WITH_ERRNO("Failed to seek to end "
- "of WIM being written");
- ret = WIMLIB_ERR_WRITE;
- goto out_close_wim;
- }
}
off_t old_lookup_table_end;
new_lookup_table_end = hdr.lookup_table_res_entry.offset +
hdr.lookup_table_res_entry.size;
- ret = write_integrity_table(out,
+ ret = write_integrity_table(w->out_fd,
&hdr.integrity,
new_lookup_table_end,
old_lookup_table_end,
zero_resource_entry(&hdr.integrity);
}
- if (fseeko(out, 0, SEEK_SET) != 0) {
- ERROR_WITH_ERRNO("Failed to seek to beginning of WIM "
- "being written");
- ret = WIMLIB_ERR_WRITE;
- goto out_close_wim;
- }
-
- ret = write_header(&hdr, out);
+ ret = write_header(&hdr, w->out_fd);
if (ret)
goto out_close_wim;
if (write_flags & WIMLIB_WRITE_FLAG_FSYNC) {
- if (fflush(out) != 0
- || fsync(fileno(out)) != 0)
- {
- ERROR_WITH_ERRNO("Error flushing data to WIM file");
+ if (fsync(w->out_fd)) {
+ ERROR_WITH_ERRNO("Error syncing data to WIM file");
ret = WIMLIB_ERR_WRITE;
}
}
out_close_wim:
- if (fclose(out) != 0) {
+ if (close(w->out_fd)) {
ERROR_WITH_ERRNO("Failed to close the output WIM file");
if (ret == 0)
ret = WIMLIB_ERR_WRITE;
}
- w->out_fp = NULL;
+ w->out_fd = INVALID_FILEDES;
return ret;
}
#if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
int
-lock_wim(WIMStruct *w, FILE *fp)
+lock_wim(WIMStruct *w, filedes_t fd)
{
int ret = 0;
- if (fp && !w->wim_locked) {
- ret = flock(fileno(fp), LOCK_EX | LOCK_NB);
+ if (fd != INVALID_FILEDES && !w->wim_locked) {
+ ret = flock(fd, LOCK_EX | LOCK_NB);
if (ret != 0) {
if (errno == EWOULDBLOCK) {
ERROR("`%"TS"' is already being modified or has been "
#endif
static int
-open_wim_writable(WIMStruct *w, const tchar *path,
- bool trunc, bool also_readable)
+open_wim_writable(WIMStruct *w, const tchar *path, int open_flags)
{
- const tchar *mode;
- if (trunc)
- if (also_readable)
- mode = T("w+b");
- else
- mode = T("wb");
- else
- mode = T("r+b");
-
- wimlib_assert(w->out_fp == NULL);
- w->out_fp = tfopen(path, mode);
- if (w->out_fp) {
- return 0;
- } else {
+ wimlib_assert(w->out_fd == INVALID_FILEDES);
+ w->out_fd = open(path, open_flags, 0644);
+ if (w->out_fd == INVALID_FILEDES) {
ERROR_WITH_ERRNO("Failed to open `%"TS"' for writing", path);
return WIMLIB_ERR_OPEN;
}
+ return 0;
}
void
close_wim_writable(WIMStruct *w)
{
- if (w->out_fp) {
- if (fclose(w->out_fp) != 0) {
+ if (w->out_fd != INVALID_FILEDES) {
+ if (close(w->out_fd))
WARNING_WITH_ERRNO("Failed to close output WIM");
- }
- w->out_fp = NULL;
+ w->out_fd = INVALID_FILEDES;
}
}
begin_write(WIMStruct *w, const tchar *path, int write_flags)
{
int ret;
- ret = open_wim_writable(w, path, true,
- (write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY) != 0);
+ int open_flags = O_TRUNC | O_CREAT;
+ if (write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY)
+ open_flags |= O_RDWR;
+ else
+ open_flags |= O_WRONLY;
+ ret = open_wim_writable(w, path, open_flags);
if (ret)
return ret;
/* Write dummy header. It will be overwritten later. */
- return write_header(&w->hdr, w->out_fp);
+ ret = write_header(&w->hdr, w->out_fd);
+ if (ret)
+ return ret;
+ if (lseek(w->out_fd, 0, SEEK_END) == -1) {
+ ERROR_WITH_ERRNO("Failed to seek to end of WIM");
+ return WIMLIB_ERR_WRITE;
+ }
+ return 0;
}
/* Writes a stand-alone WIM to a file. */
struct list_head stream_list;
off_t old_wim_end;
u64 old_lookup_table_end, old_xml_begin, old_xml_end;
+ int open_flags;
DEBUG("Overwriting `%"TS"' in-place", w->filename);
if (ret)
return ret;
- ret = open_wim_writable(w, w->filename, false,
- (write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY) != 0);
+ open_flags = 0;
+ if (write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY)
+ open_flags |= O_RDWR;
+ else
+ open_flags |= O_WRONLY;
+ ret = open_wim_writable(w, w->filename, open_flags);
if (ret)
return ret;
- ret = lock_wim(w, w->out_fp);
+ ret = lock_wim(w, w->out_fd);
if (ret) {
close_wim_writable(w);
return ret;
}
- if (fseeko(w->out_fp, old_wim_end, SEEK_SET) != 0) {
+ if (lseek(w->out_fd, old_wim_end, SEEK_SET) == -1) {
ERROR_WITH_ERRNO("Can't seek to end of WIM");
close_wim_writable(w);
w->wim_locked = 0;
old_wim_end);
ret = write_stream_list(&stream_list,
w->lookup_table,
- w->out_fp,
+ w->out_fd,
wimlib_get_compression_type(w),
write_flags,
num_threads,
progress.rename.to = w->filename;
progress_func(WIMLIB_PROGRESS_MSG_RENAME, &progress);
}
-
- /* Close the original WIM file that was opened for reading. */
- if (w->fp != NULL) {
- fclose(w->fp);
- w->fp = NULL;
- }
-
- /* Re-open the WIM read-only. */
- w->fp = tfopen(w->filename, T("rb"));
- if (w->fp == NULL) {
- ret = WIMLIB_ERR_REOPEN;
- WARNING_WITH_ERRNO("Failed to re-open `%"TS"' read-only",
- w->filename);
- FREE(w->filename);
- w->filename = NULL;
- }
goto out;
out_unlink:
/* Remove temporary file. */
* Reads the XML data from a WIM file.
*/
int
-read_xml_data(FILE *fp, const struct resource_entry *res_entry,
+read_xml_data(filedes_t in_fd,
+ const struct resource_entry *res_entry,
struct wim_info **info_ret)
{
utf16lechar *xml_data;
goto out;
}
- ret = read_uncompressed_resource(fp, res_entry->offset,
- res_entry->size, xml_data);
- if (ret)
+ if (full_pread(in_fd, xml_data,
+ res_entry->size, res_entry->offset) != res_entry->size)
+ {
+ ERROR_WITH_ERRNO("Error reading XML data");
+ ret = WIMLIB_ERR_READ;
goto out_free_xml_data;
+ }
/* Null-terminate just in case */
((u8*)xml_data)[res_entry->size] = 0;
* the offset of the XML data.
*/
int
-write_xml_data(const struct wim_info *wim_info, int image, FILE *out,
+write_xml_data(const struct wim_info *wim_info, int image, int out_fd,
u64 total_bytes, struct resource_entry *out_res_entry)
{
xmlCharEncodingHandler *encoding_handler;
(wim_info != NULL && image >= 1 &&
image <= wim_info->num_images));
- start_offset = ftello(out);
+ start_offset = filedes_offset(out_fd);
if (start_offset == -1)
return WIMLIB_ERR_WRITE;
/* 2 bytes endianness marker for UTF-16LE. This is _required_ for WIM
* XML data. */
- if ((putc(0xff, out)) == EOF || (putc(0xfe, out) == EOF)) {
+ static u8 bom[2] = {0xff, 0xfe};
+ if (full_write(out_fd, bom, 2) != 2) {
ERROR_WITH_ERRNO("Error writing XML data");
return WIMLIB_ERR_WRITE;
}
goto out;
}
- out_buffer = xmlOutputBufferCreateFile(out, encoding_handler);
+ out_buffer = xmlOutputBufferCreateFd(out_fd, encoding_handler);
if (!out_buffer) {
ERROR("Failed to allocate xmlOutputBuffer");
ret = WIMLIB_ERR_NOMEM;
xmlFreeTextWriter(writer);
writer = NULL;
- end_offset = ftello(out);
+ end_offset = filedes_offset(out_fd);
if (end_offset == -1) {
ret = WIMLIB_ERR_WRITE;
} else {
if (!buf)
return WIMLIB_ERR_NOMEM;
- ret = read_uncompressed_resource(w->fp, w->hdr.xml_res_entry.offset,
- size, buf);
- if (ret)
+ if (full_pread(w->in_fd,
+ buf,
+ w->hdr.xml_res_entry.size,
+ w->hdr.xml_res_entry.offset) != w->hdr.xml_res_entry.size)
+ {
+ ERROR_WITH_ERRNO("Error reading XML data");
+ ret = WIMLIB_ERR_READ;
goto out_free_buf;
+ }
if (fwrite(buf, 1, size, fp) != size) {
ERROR_WITH_ERRNO("Failed to extract XML data");
print_image_info(const struct wim_info *wim_info, int image);
extern int
-read_xml_data(FILE *fp, const struct resource_entry *res,
+read_xml_data(filedes_t in_fd, const struct resource_entry *res,
struct wim_info **info_ret);
extern int
-write_xml_data(const struct wim_info *wim_info, int image, FILE *out,
+write_xml_data(const struct wim_info *wim_info, int image, filedes_t out_fd,
u64 total_bytes, struct resource_entry *out_res_entry);
extern void
git://wimlib.net / wimlib / commitdiff