X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwrite.c;h=6c97c79604823415a831f7a7fecc303195f1ec9d;hp=1a429039b38dd80fb3141705ef8d1a5aa8c7ac84;hb=71abd45bcc85ddb5cf60aba8bbeb53b40780f521;hpb=48fbbd68e82d879e2cb6f384c1440e81373338c7 diff --git a/src/write.c b/src/write.c index 1a429039..6c97c796 100644 --- a/src/write.c +++ b/src/write.c @@ -68,6 +68,42 @@ # include /* for `struct iovec' */ #endif +static int +alloc_lzx_context(int write_resource_flags, struct wimlib_lzx_context **ctx_pp) +{ + struct wimlib_lzx_params params; + params.size_of_this = sizeof(params); + if (write_resource_flags & WIMLIB_WRITE_RESOURCE_FLAG_COMPRESS_SLOW) + params.algorithm = WIMLIB_LZX_ALGORITHM_SLOW; + else + params.algorithm = WIMLIB_LZX_ALGORITHM_FAST; + params.use_defaults = 1; + return wimlib_lzx_alloc_context(¶ms, ctx_pp); +} + +static unsigned +compress_chunk(const void * uncompressed_data, + unsigned uncompressed_len, + void *compressed_data, + int out_ctype, + struct wimlib_lzx_context *comp_ctx) +{ + switch (out_ctype) { + case WIMLIB_COMPRESSION_TYPE_XPRESS: + return wimlib_xpress_compress(uncompressed_data, + uncompressed_len, + compressed_data); + case WIMLIB_COMPRESSION_TYPE_LZX: + return wimlib_lzx_compress2(uncompressed_data, + uncompressed_len, + compressed_data, + comp_ctx); + default: + wimlib_assert(0); + return 0; + } +} + /* 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.) */ @@ -158,41 +194,6 @@ chunk_tab_record_chunk(struct chunk_table *chunk_tab, unsigned out_chunk_size) } } -/* - * compress_func_t- Pointer to a function to compresses a chunk - * of a WIM resource. This may be either - * wimlib_xpress_compress() (xpress-compress.c) or - * wimlib_lzx_compress() (lzx-compress.c). - * - * @chunk: Uncompressed data of the chunk. - * @chunk_size: Size of the uncompressed chunk, in bytes. - * @out: Pointer to output buffer of size at least (@chunk_size - 1) bytes. - * - * Returns the size of the compressed data written to @out in bytes, or 0 if the - * data could not be compressed to (@chunk_size - 1) bytes or fewer. - * - * As a special requirement, the compression code is optimized for the WIM - * format and therefore requires (@chunk_size <= 32768). - * - * As another special requirement, the compression code will read up to 8 bytes - * off the end of the @chunk array for performance reasons. The values of these - * bytes will not affect the output of the compression, but the calling code - * must make sure that the buffer holding the uncompressed chunk is actually at - * least (@chunk_size + 8) bytes, or at least that these extra bytes are in - * mapped memory that will not cause a memory access violation if accessed. - */ -typedef unsigned (*compress_func_t)(const void *chunk, unsigned chunk_size, - void *out); - -static compress_func_t -get_compress_func(int out_ctype) -{ - if (out_ctype == WIMLIB_COMPRESSION_TYPE_LZX) - return wimlib_lzx_compress; - else - return wimlib_xpress_compress; -} - /* Finishes a WIM chunk table and writes it to the output file at the correct * offset. */ static int @@ -284,7 +285,8 @@ finalize_and_check_sha1(SHA_CTX *sha_ctx, struct wim_lookup_table_entry *lte) } struct write_resource_ctx { - compress_func_t compress; + int out_ctype; + struct wimlib_lzx_context *comp_ctx; struct chunk_table *chunk_tab; struct filedes *out_fd; SHA_CTX sha_ctx; @@ -305,15 +307,17 @@ write_resource_cb(const void *chunk, size_t chunk_size, void *_ctx) out_chunk = chunk; out_chunk_size = chunk_size; - if (ctx->compress) { + if (ctx->out_ctype != WIMLIB_COMPRESSION_TYPE_NONE) { void *compressed_chunk; unsigned compressed_size; /* Compress the chunk. */ compressed_chunk = alloca(chunk_size); - compressed_size = (*ctx->compress)(chunk, chunk_size, - compressed_chunk); + compressed_size = compress_chunk(chunk, chunk_size, + compressed_chunk, + ctx->out_ctype, + ctx->comp_ctx); /* Use compressed data if compression to less than input size * was successful. */ if (compressed_size) { @@ -371,12 +375,18 @@ error: * On success, this is filled in with the offset, flags, compressed size, * and uncompressed size of the resource in the output WIM. * - * @write_resource_flags: + * @resource_flags: * * WIMLIB_WRITE_RESOURCE_FLAG_RECOMPRESS to force data to be recompressed even * if it could otherwise be copied directly from the input; + * * WIMLIB_WRITE_RESOURCE_FLAG_COMPRESS_SLOW to compress the data as much + * as possible; * * WIMLIB_WRITE_RESOURCE_FLAG_PIPABLE if writing a resource for a pipable WIM * (and the output file descriptor may be a pipe). * + * @comp_ctx: + * Location of LZX compression context pointer, which will be allocated or + * updated if needed. (Initialize to NULL.) + * * Additional notes: The SHA1 message digest of the uncompressed data is * calculated (except when doing a raw copy --- see below). If the @unhashed * flag is set on the lookup table entry, this message digest is simply copied @@ -387,7 +397,8 @@ int write_wim_resource(struct wim_lookup_table_entry *lte, struct filedes *out_fd, int out_ctype, struct resource_entry *out_res_entry, - int resource_flags) + int resource_flags, + struct wimlib_lzx_context **comp_ctx) { struct write_resource_ctx write_ctx; off_t res_start_offset; @@ -430,15 +441,23 @@ write_wim_resource(struct wim_lookup_table_entry *lte, read_size = lte->resource_entry.original_size; } + /* If the output resource is to be compressed, initialize the chunk * table and set the function to use for chunk compression. Exceptions: * no compression function is needed if doing a raw copy; also, no chunk * table is needed if doing a *full* (not per-chunk) raw copy. */ - write_ctx.compress = NULL; + write_ctx.out_ctype = WIMLIB_COMPRESSION_TYPE_NONE; write_ctx.chunk_tab = NULL; if (out_ctype != WIMLIB_COMPRESSION_TYPE_NONE) { - if (!(resource_flags & WIMLIB_READ_RESOURCE_FLAG_RAW)) - write_ctx.compress = get_compress_func(out_ctype); + if (!(resource_flags & WIMLIB_READ_RESOURCE_FLAG_RAW)) { + write_ctx.out_ctype = out_ctype; + if (out_ctype == WIMLIB_COMPRESSION_TYPE_LZX) { + ret = alloc_lzx_context(resource_flags, comp_ctx); + if (ret) + goto out; + } + write_ctx.comp_ctx = *comp_ctx; + } if (!(resource_flags & WIMLIB_READ_RESOURCE_FLAG_RAW_FULL)) { ret = begin_wim_resource_chunk_tab(lte, out_fd, &write_ctx.chunk_tab, @@ -514,7 +533,7 @@ try_write_again: goto out_free_chunk_tab; out_ctype = WIMLIB_COMPRESSION_TYPE_NONE; FREE(write_ctx.chunk_tab); - write_ctx.compress = NULL; + write_ctx.out_ctype = WIMLIB_COMPRESSION_TYPE_NONE; write_ctx.chunk_tab = NULL; write_ctx.doing_sha = false; goto try_write_again; @@ -550,7 +569,8 @@ write_wim_resource_from_buffer(const void *buf, size_t buf_size, int reshdr_flags, struct filedes *out_fd, int out_ctype, struct resource_entry *out_res_entry, - u8 *hash_ret, int write_resource_flags) + u8 *hash_ret, int write_resource_flags, + struct wimlib_lzx_context **comp_ctx) { /* Set up a temporary lookup table entry to provide to * write_wim_resource(). */ @@ -570,7 +590,7 @@ write_wim_resource_from_buffer(const void *buf, size_t buf_size, } ret = write_wim_resource(<e, out_fd, out_ctype, out_res_entry, - write_resource_flags); + write_resource_flags, comp_ctx); if (ret) return ret; if (hash_ret) @@ -671,7 +691,8 @@ shared_queue_get(struct shared_queue *q) struct compressor_thread_params { struct shared_queue *res_to_compress_queue; struct shared_queue *compressed_res_queue; - compress_func_t compress; + int out_ctype; + struct wimlib_lzx_context *comp_ctx; }; #define MAX_CHUNKS_PER_MSG 2 @@ -689,12 +710,18 @@ struct message { }; static void -compress_chunks(struct message *msg, compress_func_t compress) +compress_chunks(struct message *msg, int out_ctype, + struct wimlib_lzx_context *comp_ctx) { 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]); + unsigned len; + + len = compress_chunk(msg->uncompressed_chunks[i], + msg->uncompressed_chunk_sizes[i], + msg->compressed_chunks[i], + out_ctype, + comp_ctx); + void *out_chunk; unsigned out_len; if (len) { @@ -722,12 +749,11 @@ compressor_thread_proc(void *arg) struct compressor_thread_params *params = arg; struct shared_queue *res_to_compress_queue = params->res_to_compress_queue; struct shared_queue *compressed_res_queue = params->compressed_res_queue; - compress_func_t compress = params->compress; struct message *msg; DEBUG("Compressor thread ready"); while ((msg = shared_queue_get(res_to_compress_queue)) != NULL) { - compress_chunks(msg, compress); + compress_chunks(msg, params->out_ctype, params->comp_ctx); shared_queue_put(compressed_res_queue, msg); } DEBUG("Compressor thread terminating"); @@ -791,6 +817,7 @@ do_write_streams_progress(struct write_streams_progress_data *progress_data, struct serial_write_stream_ctx { struct filedes *out_fd; int out_ctype; + struct wimlib_lzx_context **comp_ctx; int write_resource_flags; }; @@ -800,7 +827,8 @@ 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_fd, ctx->out_ctype, <e->output_resource_entry, - ctx->write_resource_flags); + ctx->write_resource_flags, + ctx->comp_ctx); } @@ -898,6 +926,7 @@ do_write_stream_list_serial(struct list_head *stream_list, struct wim_lookup_table *lookup_table, struct filedes *out_fd, int out_ctype, + struct wimlib_lzx_context **comp_ctx, int write_resource_flags, struct write_streams_progress_data *progress_data) { @@ -905,6 +934,7 @@ do_write_stream_list_serial(struct list_head *stream_list, .out_fd = out_fd, .out_ctype = out_ctype, .write_resource_flags = write_resource_flags, + .comp_ctx = comp_ctx, }; return do_write_stream_list(stream_list, lookup_table, @@ -920,6 +950,8 @@ write_flags_to_resource_flags(int write_flags) if (write_flags & WIMLIB_WRITE_FLAG_RECOMPRESS) resource_flags |= WIMLIB_WRITE_RESOURCE_FLAG_RECOMPRESS; + if (write_flags & WIMLIB_WRITE_FLAG_COMPRESS_SLOW) + resource_flags |= WIMLIB_WRITE_RESOURCE_FLAG_COMPRESS_SLOW; if (write_flags & WIMLIB_WRITE_FLAG_PIPABLE) resource_flags |= WIMLIB_WRITE_RESOURCE_FLAG_PIPABLE; return resource_flags; @@ -930,6 +962,7 @@ write_stream_list_serial(struct list_head *stream_list, struct wim_lookup_table *lookup_table, struct filedes *out_fd, int out_ctype, + struct wimlib_lzx_context **comp_ctx, int write_resource_flags, struct write_streams_progress_data *progress_data) { @@ -945,6 +978,7 @@ write_stream_list_serial(struct list_head *stream_list, lookup_table, out_fd, out_ctype, + comp_ctx, write_resource_flags, progress_data); } @@ -994,6 +1028,7 @@ struct main_writer_thread_ctx { struct filedes *out_fd; off_t res_start_offset; int out_ctype; + struct wimlib_lzx_context **comp_ctx; int write_resource_flags; struct shared_queue *res_to_compress_queue; struct shared_queue *compressed_res_queue; @@ -1215,7 +1250,8 @@ receive_compressed_chunks(struct main_writer_thread_ctx *ctx) ctx->out_fd, WIMLIB_COMPRESSION_TYPE_NONE, &cur_lte->output_resource_entry, - ctx->write_resource_flags); + ctx->write_resource_flags, + ctx->comp_ctx); if (ret) return ret; } else { @@ -1254,6 +1290,7 @@ receive_compressed_chunks(struct main_writer_thread_ctx *ctx) ctx->lookup_table, ctx->out_fd, ctx->out_ctype, + ctx->comp_ctx, ctx->write_resource_flags, ctx->progress_data); if (ret) @@ -1352,6 +1389,7 @@ main_writer_thread_finish(void *_ctx) ctx->lookup_table, ctx->out_fd, ctx->out_ctype, + ctx->comp_ctx, ctx->write_resource_flags, ctx->progress_data); } @@ -1447,6 +1485,7 @@ write_stream_list_parallel(struct list_head *stream_list, struct wim_lookup_table *lookup_table, struct filedes *out_fd, int out_ctype, + struct wimlib_lzx_context **comp_ctx, int write_resource_flags, struct write_streams_progress_data *progress_data, unsigned num_threads) @@ -1488,21 +1527,36 @@ write_stream_list_parallel(struct list_head *stream_list, if (ret) goto out_destroy_res_to_compress_queue; - struct compressor_thread_params params; - params.res_to_compress_queue = &res_to_compress_queue; - params.compressed_res_queue = &compressed_res_queue; - params.compress = get_compress_func(out_ctype); + struct compressor_thread_params *params; + + params = CALLOC(num_threads, sizeof(params[0])); + if (params == NULL) { + ret = WIMLIB_ERR_NOMEM; + goto out_destroy_compressed_res_queue; + } + + for (unsigned i = 0; i < num_threads; i++) { + params[i].res_to_compress_queue = &res_to_compress_queue; + params[i].compressed_res_queue = &compressed_res_queue; + params[i].out_ctype = out_ctype; + if (out_ctype == WIMLIB_COMPRESSION_TYPE_LZX) { + ret = alloc_lzx_context(write_resource_flags, + ¶ms[i].comp_ctx); + if (ret) + goto out_free_params; + } + } compressor_threads = MALLOC(num_threads * sizeof(pthread_t)); if (!compressor_threads) { ret = WIMLIB_ERR_NOMEM; - goto out_destroy_compressed_res_queue; + goto out_free_params; } for (unsigned i = 0; i < num_threads; i++) { DEBUG("pthread_create thread %u of %u", i + 1, num_threads); ret = pthread_create(&compressor_threads[i], NULL, - compressor_thread_proc, ¶ms); + compressor_thread_proc, ¶ms[i]); if (ret != 0) { ret = -1; ERROR_WITH_ERRNO("Failed to create compressor " @@ -1523,6 +1577,7 @@ write_stream_list_parallel(struct list_head *stream_list, ctx.lookup_table = lookup_table; ctx.out_fd = out_fd; ctx.out_ctype = out_ctype; + ctx.comp_ctx = comp_ctx; ctx.res_to_compress_queue = &res_to_compress_queue; ctx.compressed_res_queue = &compressed_res_queue; ctx.num_messages = queue_size; @@ -1558,6 +1613,10 @@ out_join: } } FREE(compressor_threads); +out_free_params: + for (unsigned i = 0; i < num_threads; i++) + wimlib_lzx_free_context(params[i].comp_ctx); + FREE(params); out_destroy_compressed_res_queue: shared_queue_destroy(&compressed_res_queue); out_destroy_res_to_compress_queue: @@ -1571,6 +1630,7 @@ out_serial_quiet: lookup_table, out_fd, out_ctype, + comp_ctx, write_resource_flags, progress_data); @@ -1584,7 +1644,9 @@ out_serial_quiet: static int write_stream_list(struct list_head *stream_list, struct wim_lookup_table *lookup_table, - struct filedes *out_fd, int out_ctype, int write_flags, + struct filedes *out_fd, int out_ctype, + struct wimlib_lzx_context **comp_ctx, + int write_flags, unsigned num_threads, wimlib_progress_func_t progress_func) { struct wim_lookup_table_entry *lte; @@ -1653,6 +1715,7 @@ write_stream_list(struct list_head *stream_list, lookup_table, out_fd, out_ctype, + comp_ctx, write_resource_flags, &progress_data, num_threads); @@ -1662,6 +1725,7 @@ write_stream_list(struct list_head *stream_list, lookup_table, out_fd, out_ctype, + comp_ctx, write_resource_flags, &progress_data); if (ret == 0) @@ -1984,6 +2048,7 @@ write_wim_streams(WIMStruct *wim, int image, int write_flags, wim->lookup_table, &wim->out_fd, wim->compression_type, + &wim->lzx_context, write_flags, num_threads, progress_func); @@ -2044,7 +2109,8 @@ write_wim_metadata_resources(WIMStruct *wim, int image, int write_flags, &wim->out_fd, wim->compression_type, &imd->metadata_lte->output_resource_entry, - write_resource_flags); + write_resource_flags, + &wim->lzx_context); } if (ret) return ret; @@ -2083,9 +2149,11 @@ close_wim_writable(WIMStruct *wim, int write_flags) } /* + * finish_write(): + * * Finish writing a WIM file: write the lookup table, xml data, and integrity - * table, then overwrite the WIM header. Always closes the WIM file descriptor - * (wim->out_fd). + * table, then overwrite the WIM header. By default, closes the WIM file + * descriptor (@wim->out_fd) if successful. * * write_flags is a bitwise OR of the following: * @@ -2095,7 +2163,7 @@ close_wim_writable(WIMStruct *wim, int write_flags) * (public) WIMLIB_WRITE_FLAG_FSYNC: * fsync() the output file before closing it. * - * (public) WIMLIB_WRITE_FLAG_PIPABLE: + * (public) WIMLIB_WRITE_FLAG_PIPABLE: * Writing a pipable WIM, possibly to a pipe; include pipable WIM * stream headers before the lookup table and XML data, and also * write the WIM header at the end instead of seeking to the @@ -2118,6 +2186,9 @@ close_wim_writable(WIMStruct *wim, int write_flags) * Instead of overwriting the WIM header at the beginning of the * file, simply append it to the end of the file. (Used when * writing to pipe.) + * (private) WIMLIB_WRITE_FLAG_FILE_DESCRIPTOR: + * Do not close the file descriptor @wim->out_fd on either success + * on failure. * (private) WIMLIB_WRITE_FLAG_USE_EXISTING_TOTALBYTES: * Use the existing stored in the in-memory XML * information, rather than setting it to the offset of the XML @@ -2158,7 +2229,7 @@ finish_write(WIMStruct *wim, int image, int write_flags, &wim->hdr.lookup_table_res_entry, stream_list_override); if (ret) - goto out_close_wim; + return ret; } /* Write XML data. */ @@ -2169,8 +2240,9 @@ finish_write(WIMStruct *wim, int image, int write_flags, &wim->hdr.xml_res_entry, write_resource_flags); if (ret) - goto out_close_wim; + return ret; + /* Write integrity table (optional). */ if (write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY) { if (write_flags & WIMLIB_WRITE_FLAG_CHECKPOINT_AFTER_XML) { struct wim_header checkpoint_hdr; @@ -2180,7 +2252,7 @@ finish_write(WIMStruct *wim, int image, int write_flags, ret = write_wim_header_at_offset(&checkpoint_hdr, &wim->out_fd, 0); if (ret) - goto out_close_wim; + return ret; } if (!(write_flags & WIMLIB_WRITE_FLAG_REUSE_INTEGRITY_TABLE)) @@ -2194,36 +2266,43 @@ finish_write(WIMStruct *wim, int image, int write_flags, old_lookup_table_end, progress_func); if (ret) - goto out_close_wim; + return ret; } else { + /* No integrity table. */ zero_resource_entry(&wim->hdr.integrity); } + /* Now that all information in the WIM header has been determined, the + * preliminary header written earlier can be overwritten, the header of + * the existing WIM file can be overwritten, or the final header can be + * written to the end of the pipable WIM. */ wim->hdr.flags &= ~WIM_HDR_FLAG_WRITE_IN_PROGRESS; hdr_offset = 0; if (write_flags & WIMLIB_WRITE_FLAG_HEADER_AT_END) hdr_offset = wim->out_fd.offset; ret = write_wim_header_at_offset(&wim->hdr, &wim->out_fd, hdr_offset); if (ret) - goto out_close_wim; + return ret; + /* Possibly sync file data to disk before closing. On POSIX systems, it + * is necessary to do this before using rename() to overwrite an + * existing file with a new file. Otherwise, data loss would occur if + * the system is abruptly terminated when the metadata for the rename + * operation has been written to disk, but the new file data has not. + */ if (write_flags & WIMLIB_WRITE_FLAG_FSYNC) { if (fsync(wim->out_fd.fd)) { ERROR_WITH_ERRNO("Error syncing data to WIM file"); - ret = WIMLIB_ERR_WRITE; - goto out_close_wim; + return WIMLIB_ERR_WRITE; } } - ret = 0; -out_close_wim: if (close_wim_writable(wim, write_flags)) { - if (ret == 0) { - ERROR_WITH_ERRNO("Failed to close the output WIM file"); - ret = WIMLIB_ERR_WRITE; - } + ERROR_WITH_ERRNO("Failed to close the output WIM file"); + return WIMLIB_ERR_WRITE; } - return ret; + + return 0; } #if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK) @@ -2607,7 +2686,7 @@ write_wim_part(WIMStruct *wim, stream_list_override); out_restore_hdr: memcpy(&wim->hdr, &hdr_save, sizeof(struct wim_header)); - close_wim_writable(wim, write_flags); + (void)close_wim_writable(wim, write_flags); return ret; } @@ -2761,7 +2840,7 @@ overwrite_wim_inplace(WIMStruct *wim, int write_flags, struct list_head stream_list; off_t old_wim_end; u64 old_lookup_table_end, old_xml_begin, old_xml_end; - + struct wim_header hdr_save; DEBUG("Overwriting `%"TS"' in-place", wim->filename); @@ -2832,31 +2911,31 @@ overwrite_wim_inplace(WIMStruct *wim, int write_flags, return ret; ret = lock_wim(wim, wim->out_fd.fd); - if (ret) { - close_wim_writable(wim, write_flags); - return ret; - } + if (ret) + goto out_close_wim; + + /* Save original header so it can be restored in case of error */ + memcpy(&hdr_save, &wim->hdr, sizeof(struct wim_header)); /* Set WIM_HDR_FLAG_WRITE_IN_PROGRESS flag in header. */ - ret = write_wim_header_flags(wim->hdr.flags | WIM_HDR_FLAG_WRITE_IN_PROGRESS, - &wim->out_fd); + wim->hdr.flags |= WIM_HDR_FLAG_WRITE_IN_PROGRESS; + ret = write_wim_header_flags(wim->hdr.flags, &wim->out_fd); if (ret) { ERROR_WITH_ERRNO("Error updating WIM header flags"); - close_wim_writable(wim, write_flags); - goto out_unlock_wim; + goto out_restore_memory_hdr; } if (filedes_seek(&wim->out_fd, old_wim_end) == -1) { ERROR_WITH_ERRNO("Can't seek to end of WIM"); - close_wim_writable(wim, write_flags); ret = WIMLIB_ERR_WRITE; - goto out_unlock_wim; + goto out_restore_physical_hdr; } ret = write_stream_list(&stream_list, wim->lookup_table, &wim->out_fd, wim->compression_type, + &wim->lzx_context, write_flags, num_threads, progress_func); @@ -2871,15 +2950,25 @@ overwrite_wim_inplace(WIMStruct *wim, int write_flags, write_flags |= WIMLIB_WRITE_FLAG_REUSE_INTEGRITY_TABLE; ret = finish_write(wim, WIMLIB_ALL_IMAGES, write_flags, progress_func, NULL); + if (ret) + goto out_truncate; + + goto out_unlock_wim; + out_truncate: - close_wim_writable(wim, write_flags); - if (ret && !(write_flags & WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE)) { + if (!(write_flags & WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE)) { WARNING("Truncating `%"TS"' to its original size (%"PRIu64" bytes)", wim->filename, old_wim_end); - /* Return value of truncate() is ignored because this is already - * an error path. */ - (void)ttruncate(wim->filename, old_wim_end); + /* Return value of ftruncate() is ignored because this is + * already an error path. */ + (void)ftruncate(wim->out_fd.fd, old_wim_end); } +out_restore_physical_hdr: + (void)write_wim_header_flags(hdr_save.flags, &wim->out_fd); +out_restore_memory_hdr: + memcpy(&wim->hdr, &hdr_save, sizeof(struct wim_header)); +out_close_wim: + (void)close_wim_writable(wim, write_flags); out_unlock_wim: wim->wim_locked = 0; return ret; @@ -2906,18 +2995,28 @@ overwrite_wim_via_tmpfile(WIMStruct *wim, int write_flags, ret = wimlib_write(wim, tmpfile, WIMLIB_ALL_IMAGES, write_flags | WIMLIB_WRITE_FLAG_FSYNC, num_threads, progress_func); - if (ret) - goto out_unlink; + if (ret) { + tunlink(tmpfile); + return ret; + } close_wim(wim); + /* Rename the new WIM file to the original WIM file. Note: on Windows + * this actually calls win32_rename_replacement(), not _wrename(), so + * that removing the existing destination file can be handled. */ DEBUG("Renaming `%"TS"' to `%"TS"'", tmpfile, wim->filename); - /* Rename the new file to the old file .*/ - if (trename(tmpfile, wim->filename) != 0) { + ret = trename(tmpfile, wim->filename); + if (ret) { ERROR_WITH_ERRNO("Failed to rename `%"TS"' to `%"TS"'", tmpfile, wim->filename); - ret = WIMLIB_ERR_RENAME; - goto out_unlink; + #ifdef __WIN32__ + if (ret < 0) + #endif + { + tunlink(tmpfile); + } + return WIMLIB_ERR_RENAME; } if (progress_func) { @@ -2927,11 +3026,6 @@ overwrite_wim_via_tmpfile(WIMStruct *wim, int write_flags, progress_func(WIMLIB_PROGRESS_MSG_RENAME, &progress); } return 0; - -out_unlink: - /* Remove temporary file. */ - tunlink(tmpfile); - return ret; } /* API function documented in wimlib.h */