X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwrite.c;h=139ecdabc73dd74da20fc45cfaaa772dd8478e59;hp=5034c45405bc2023150a288825c04084bb975e82;hb=9fb3aaca115429b0af2a623bf20bfceef74f047f;hpb=7efd11453e3b7d3febc0634e368a27a5ae28822a diff --git a/src/write.c b/src/write.c index 5034c454..139ecdab 100644 --- a/src/write.c +++ b/src/write.c @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012 Eric Biggers + * Copyright (C) 2012, 2013 Eric Biggers * * This file is part of wimlib, a library for working with WIM files. * @@ -29,7 +29,11 @@ #if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK) /* On BSD, this should be included before "list.h" so that "list.h" can * overwrite the LIST_HEAD macro. */ -#include +# include +#endif + +#ifdef __WIN32__ +# include #endif #include "list.h" @@ -42,26 +46,33 @@ #include "xpress.h" #ifdef ENABLE_MULTITHREADED_COMPRESSION -#include +# include #endif #include #include #ifdef WITH_NTFS_3G -#include -#include -#include -#include +# include +# include +# include +# include #endif #ifdef HAVE_ALLOCA_H -#include +# include #else -#include +# include +#endif + +#include + +#if defined(__WIN32__) && !defined(INVALID_HANDLE_VALUE) +# define INVALID_HANDLE_VALUE ((HANDLE)(-1)) #endif -static int fflush_and_ftruncate(FILE *fp, off_t size) +static int +fflush_and_ftruncate(FILE *fp, off_t size) { int ret; @@ -98,7 +109,7 @@ struct chunk_table { * output file. */ static int -begin_wim_resource_chunk_tab(const struct lookup_table_entry *lte, +begin_wim_resource_chunk_tab(const struct wim_lookup_table_entry *lte, FILE *out_fp, off_t file_offset, struct chunk_table **chunk_tab_ret) @@ -155,7 +166,8 @@ out: */ typedef int (*compress_func_t)(const void *, unsigned, void *, unsigned *); -compress_func_t get_compress_func(int out_ctype) +compress_func_t +get_compress_func(int out_ctype) { if (out_ctype == WIMLIB_COMPRESSION_TYPE_LZX) return lzx_compress; @@ -176,9 +188,10 @@ compress_func_t get_compress_func(int out_ctype) * * Returns 0 on success; nonzero on failure. */ -static int write_wim_resource_chunk(const u8 chunk[], unsigned chunk_size, - FILE *out_fp, compress_func_t compress, - struct chunk_table *chunk_tab) +static int +write_wim_resource_chunk(const u8 chunk[], unsigned chunk_size, + FILE *out_fp, compress_func_t compress, + struct chunk_table *chunk_tab) { const u8 *out_chunk; unsigned out_chunk_size; @@ -250,63 +263,82 @@ finish_wim_resource_chunk_tab(struct chunk_table *chunk_tab, /* Prepare for multiple reads to a resource by caching a FILE * or NTFS * attribute pointer in the lookup table entry. */ -static int prepare_resource_for_read(struct lookup_table_entry *lte +static int +prepare_resource_for_read(struct wim_lookup_table_entry *lte - #ifdef WITH_NTFS_3G - , ntfs_inode **ni_ret - #endif - ) + #ifdef WITH_NTFS_3G + , ntfs_inode **ni_ret + #endif + ) { - 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"); + switch (lte->resource_location) { + case RESOURCE_IN_FILE_ON_DISK: if (!lte->file_on_disk_fp) { - ERROR_WITH_ERRNO("Failed to open the file `%s' for " - "reading", lte->file_on_disk); - return WIMLIB_ERR_OPEN; + 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'", lte->file_on_disk); + return WIMLIB_ERR_OPEN; + } } - } + break; #ifdef WITH_NTFS_3G - else if (lte->resource_location == RESOURCE_IN_NTFS_VOLUME - && !lte->attr) - { - struct ntfs_location *loc = lte->ntfs_loc; - ntfs_inode *ni; - wimlib_assert(loc); - ni = ntfs_pathname_to_inode(*loc->ntfs_vol_p, NULL, loc->path_utf8); - if (!ni) { - ERROR_WITH_ERRNO("Failed to open inode `%s' in NTFS " - "volume", loc->path_utf8); - return WIMLIB_ERR_NTFS_3G; - } - lte->attr = ntfs_attr_open(ni, - loc->is_reparse_point ? AT_REPARSE_POINT : AT_DATA, - (ntfschar*)loc->stream_name_utf16, - loc->stream_name_utf16_num_chars); + case RESOURCE_IN_NTFS_VOLUME: if (!lte->attr) { - ERROR_WITH_ERRNO("Failed to open attribute of `%s' in " - "NTFS volume", loc->path_utf8); - ntfs_inode_close(ni); - return WIMLIB_ERR_NTFS_3G; + struct ntfs_location *loc = lte->ntfs_loc; + ntfs_inode *ni; + wimlib_assert(loc); + ni = ntfs_pathname_to_inode(*loc->ntfs_vol_p, NULL, loc->path); + if (!ni) { + ERROR_WITH_ERRNO("Failed to open inode `%s' in NTFS " + "volume", loc->path); + return WIMLIB_ERR_NTFS_3G; + } + lte->attr = ntfs_attr_open(ni, + loc->is_reparse_point ? AT_REPARSE_POINT : AT_DATA, + loc->stream_name, + loc->stream_name_nchars); + if (!lte->attr) { + ERROR_WITH_ERRNO("Failed to open attribute of `%s' in " + "NTFS volume", loc->path); + ntfs_inode_close(ni); + return WIMLIB_ERR_NTFS_3G; + } + *ni_ret = ni; } - *ni_ret = ni; - } + break; #endif +#ifdef __WIN32__ + case RESOURCE_WIN32: + if (lte->win32_file_on_disk_fp == INVALID_HANDLE_VALUE) { + lte->win32_file_on_disk_fp = + win32_open_file_readonly(lte->win32_file_on_disk, true); + if (lte->win32_file_on_disk_fp == INVALID_HANDLE_VALUE) { + ERROR("Win32 API: Can't open %ls", lte->win32_file_on_disk); + win32_error_last(); + return WIMLIB_ERR_OPEN; + } + } + break; +#endif + default: + break; + } return 0; } /* Undo prepare_resource_for_read() by closing the cached FILE * or NTFS * attribute. */ -static void end_wim_resource_read(struct lookup_table_entry *lte - #ifdef WITH_NTFS_3G - , ntfs_inode *ni - #endif - ) +static void +end_wim_resource_read(struct wim_lookup_table_entry *lte + #ifdef WITH_NTFS_3G + , ntfs_inode *ni + #endif + ) { if (lte->resource_location == RESOURCE_IN_FILE_ON_DISK - && lte->file_on_disk_fp) { + && lte->file_on_disk_fp) + { fclose(lte->file_on_disk_fp); lte->file_on_disk_fp = NULL; } @@ -320,10 +352,18 @@ static void end_wim_resource_read(struct lookup_table_entry *lte ntfs_inode_close(ni); } #endif +#ifdef __WIN32__ + else if (lte->resource_location == RESOURCE_WIN32 + && lte->win32_file_on_disk_fp != INVALID_HANDLE_VALUE) + { + win32_close_file(lte->win32_file_on_disk_fp); + lte->win32_file_on_disk_fp = INVALID_HANDLE_VALUE; + } +#endif } static int -write_uncompressed_resource_and_truncate(struct lookup_table_entry *lte, +write_uncompressed_resource_and_truncate(struct wim_lookup_table_entry *lte, FILE *out_fp, off_t file_offset, struct resource_entry *out_res_entry) @@ -364,10 +404,11 @@ write_uncompressed_resource_and_truncate(struct lookup_table_entry *lte, * * Returns 0 on success; nonzero on failure. */ -int write_wim_resource(struct lookup_table_entry *lte, - FILE *out_fp, int out_ctype, - struct resource_entry *out_res_entry, - int flags) +int +write_wim_resource(struct wim_lookup_table_entry *lte, + FILE *out_fp, int out_ctype, + struct resource_entry *out_res_entry, + int flags) { u64 bytes_remaining; u64 original_size; @@ -561,7 +602,8 @@ struct shared_queue { pthread_cond_t space_avail_cond; }; -static int shared_queue_init(struct shared_queue *q, unsigned size) +static int +shared_queue_init(struct shared_queue *q, unsigned size) { wimlib_assert(size != 0); q->array = CALLOC(sizeof(q->array[0]), size); @@ -577,7 +619,8 @@ static int shared_queue_init(struct shared_queue *q, unsigned size) return 0; } -static void shared_queue_destroy(struct shared_queue *q) +static void +shared_queue_destroy(struct shared_queue *q) { FREE(q->array); pthread_mutex_destroy(&q->lock); @@ -585,7 +628,8 @@ static void shared_queue_destroy(struct shared_queue *q) pthread_cond_destroy(&q->space_avail_cond); } -static void shared_queue_put(struct shared_queue *q, void *obj) +static void +shared_queue_put(struct shared_queue *q, void *obj) { pthread_mutex_lock(&q->lock); while (q->filled_slots == q->size) @@ -599,7 +643,8 @@ static void shared_queue_put(struct shared_queue *q, void *obj) pthread_mutex_unlock(&q->lock); } -static void *shared_queue_get(struct shared_queue *q) +static void * +shared_queue_get(struct shared_queue *q) { void *obj; @@ -626,7 +671,7 @@ struct compressor_thread_params { #define MAX_CHUNKS_PER_MSG 2 struct message { - struct lookup_table_entry *lte; + 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]; @@ -638,7 +683,8 @@ struct message { u64 begin_chunk; }; -static void compress_chunks(struct message *msg, compress_func_t compress) +static void +compress_chunks(struct message *msg, compress_func_t compress) { for (unsigned i = 0; i < msg->num_chunks; i++) { DEBUG2("compress chunk %u of %u", i, msg->num_chunks); @@ -660,7 +706,8 @@ static void compress_chunks(struct message *msg, compress_func_t compress) * res_to_compress_queue, compress them, and put them in the * compressed_res_queue. A NULL pointer indicates that the thread should stop. * */ -static void *compressor_thread_proc(void *arg) +static void * +compressor_thread_proc(void *arg) { struct compressor_thread_params *params = arg; struct shared_queue *res_to_compress_queue = params->res_to_compress_queue; @@ -676,17 +723,18 @@ static void *compressor_thread_proc(void *arg) DEBUG("Compressor thread terminating"); return NULL; } -#endif +#endif /* ENABLE_MULTITHREADED_COMPRESSION */ -static int do_write_stream_list(struct list_head *my_resources, - FILE *out_fp, - int out_ctype, - wimlib_progress_func_t progress_func, - union wimlib_progress_info *progress, - int write_resource_flags) +static int +do_write_stream_list(struct list_head *my_resources, + FILE *out_fp, + int out_ctype, + wimlib_progress_func_t progress_func, + union wimlib_progress_info *progress, + int write_resource_flags) { int ret; - struct lookup_table_entry *lte, *tmp; + struct wim_lookup_table_entry *lte, *tmp; list_for_each_entry_safe(lte, tmp, my_resources, staging_list) { ret = write_wim_resource(lte, @@ -708,12 +756,13 @@ static int do_write_stream_list(struct list_head *my_resources, return 0; } -static int write_stream_list_serial(struct list_head *stream_list, - FILE *out_fp, - int out_ctype, - int write_flags, - wimlib_progress_func_t progress_func, - union wimlib_progress_info *progress) +static int +write_stream_list_serial(struct list_head *stream_list, + FILE *out_fp, + int out_ctype, + int write_flags, + wimlib_progress_func_t progress_func, + union wimlib_progress_info *progress) { int write_resource_flags; @@ -730,8 +779,9 @@ static int write_stream_list_serial(struct list_head *stream_list, } #ifdef ENABLE_MULTITHREADED_COMPRESSION -static int write_wim_chunks(struct message *msg, FILE *out_fp, - struct chunk_table *chunk_tab) +static int +write_wim_chunks(struct message *msg, FILE *out_fp, + struct chunk_table *chunk_tab) { for (unsigned i = 0; i < msg->num_chunks; i++) { unsigned chunk_csize = msg->compressed_chunk_sizes[i]; @@ -764,20 +814,21 @@ static int write_wim_chunks(struct message *msg, FILE *out_fp, * res_to_compress_queue, and it is passed back through the * compressed_res_queue. */ -static int main_writer_thread_proc(struct list_head *stream_list, - FILE *out_fp, - int out_ctype, - struct shared_queue *res_to_compress_queue, - struct shared_queue *compressed_res_queue, - size_t num_messages, - int write_flags, - wimlib_progress_func_t progress_func, - union wimlib_progress_info *progress) +static int +main_writer_thread_proc(struct list_head *stream_list, + FILE *out_fp, + int out_ctype, + struct shared_queue *res_to_compress_queue, + struct shared_queue *compressed_res_queue, + size_t num_messages, + int write_flags, + wimlib_progress_func_t progress_func, + union wimlib_progress_info *progress) { int ret; struct chunk_table *cur_chunk_tab = NULL; struct message *msgs = CALLOC(num_messages, sizeof(struct message)); - struct lookup_table_entry *next_lte = NULL; + struct wim_lookup_table_entry *next_lte = NULL; // Initially, all the messages are available to use. LIST_HEAD(available_msgs); @@ -818,7 +869,7 @@ static int main_writer_thread_proc(struct list_head *stream_list, // list and written directly by the main thread. LIST_HEAD(my_resources); - struct lookup_table_entry *cur_lte = NULL; + struct wim_lookup_table_entry *cur_lte = NULL; struct message *msg; #ifdef WITH_NTFS_3G @@ -835,10 +886,11 @@ static int main_writer_thread_proc(struct list_head *stream_list, for (size_t j = 0; j < MAX_CHUNKS_PER_MSG; j++) { msgs[i].compressed_chunks[j] = MALLOC(WIM_CHUNK_SIZE); - // The extra 8 bytes is because longest_match() in lz.c - // may read a little bit off the end of the uncompressed - // data. It doesn't need to be initialized--- we really - // just need to avoid accessing an unmapped page. + // The extra 8 bytes is because longest_match() in + // lz77.c may read a little bit off the end of the + // uncompressed data. It doesn't need to be + // initialized--- we really just need to avoid accessing + // an unmapped page. msgs[i].uncompressed_chunks[j] = MALLOC(WIM_CHUNK_SIZE + 8); if (msgs[i].compressed_chunks[j] == NULL || msgs[i].uncompressed_chunks[j] == NULL) @@ -908,7 +960,7 @@ static int main_writer_thread_proc(struct list_head *stream_list, break; } next_lte = container_of(next_resource, - struct lookup_table_entry, + struct wim_lookup_table_entry, staging_list); next_resource = next_resource->next; if ((!(write_flags & WIMLIB_WRITE_FLAG_RECOMPRESS) @@ -1113,7 +1165,7 @@ static int main_writer_thread_proc(struct list_head *stream_list, cur_lte = NULL; else cur_lte = container_of(cur_lte->staging_list.next, - struct lookup_table_entry, + struct wim_lookup_table_entry, staging_list); // Since we just finished writing a stream, @@ -1183,14 +1235,24 @@ out: return ret; } +static long +get_default_num_threads() +{ +#ifdef __WIN32__ + return win32_get_number_of_processors(); +#else + return sysconf(_SC_NPROCESSORS_ONLN); +#endif +} -static int write_stream_list_parallel(struct list_head *stream_list, - FILE *out_fp, - int out_ctype, - int write_flags, - unsigned num_threads, - wimlib_progress_func_t progress_func, - union wimlib_progress_info *progress) +static int +write_stream_list_parallel(struct list_head *stream_list, + FILE *out_fp, + int out_ctype, + int write_flags, + unsigned num_threads, + wimlib_progress_func_t progress_func, + union wimlib_progress_info *progress) { int ret; struct shared_queue res_to_compress_queue; @@ -1198,8 +1260,8 @@ static int write_stream_list_parallel(struct list_head *stream_list, pthread_t *compressor_threads = NULL; if (num_threads == 0) { - long nthreads = sysconf(_SC_NPROCESSORS_ONLN); - if (nthreads < 1) { + long nthreads = get_default_num_threads(); + if (nthreads < 1 || nthreads > UINT_MAX) { WARNING("Could not determine number of processors! Assuming 1"); goto out_serial; } else { @@ -1265,8 +1327,8 @@ out_join: for (unsigned i = 0; i < num_threads; i++) { if (pthread_join(compressor_threads[i], NULL)) { - WARNING("Failed to join compressor thread %u: %s", - i, strerror(errno)); + WARNING_WITH_ERRNO("Failed to join compressor " + "thread %u", i); } } FREE(compressor_threads); @@ -1292,12 +1354,13 @@ out_serial: * Write a list of streams to a WIM (@out_fp) using the compression type * @out_ctype and up to @num_threads compressor threads. */ -static int write_stream_list(struct list_head *stream_list, FILE *out_fp, - int out_ctype, int write_flags, - unsigned num_threads, - wimlib_progress_func_t progress_func) +static int +write_stream_list(struct list_head *stream_list, FILE *out_fp, + int out_ctype, int write_flags, + unsigned num_threads, + wimlib_progress_func_t progress_func) { - struct lookup_table_entry *lte; + struct wim_lookup_table_entry *lte; size_t num_streams = 0; u64 total_bytes = 0; u64 total_compression_bytes = 0; @@ -1341,19 +1404,23 @@ static int write_stream_list(struct list_head *stream_list, FILE *out_fp, struct lte_overwrite_prepare_args { WIMStruct *wim; - struct list_head *stream_list; off_t end_offset; + struct list_head *stream_list; }; -static int lte_overwrite_prepare(struct lookup_table_entry *lte, void *arg) +static int +lte_overwrite_prepare(struct wim_lookup_table_entry *lte, void *arg) { struct lte_overwrite_prepare_args *args = arg; - if (lte->resource_entry.offset + - lte->resource_entry.size > args->end_offset) + if (lte->resource_location == RESOURCE_IN_WIM && + lte->wim == args->wim && + lte->resource_entry.offset + lte->resource_entry.size > args->end_offset) { + #ifdef ENABLE_ERROR_MESSAGES ERROR("The following resource is after the XML data:"); - print_lookup_table_entry(lte); + print_lookup_table_entry(lte, stderr); + #endif return WIMLIB_ERR_RESOURCE_ORDER; } @@ -1368,50 +1435,54 @@ static int lte_overwrite_prepare(struct lookup_table_entry *lte, void *arg) return 0; } -static int wim_find_new_streams(WIMStruct *wim, off_t end_offset, - struct list_head *stream_list) +static int +wim_find_new_streams(WIMStruct *wim, off_t end_offset, + struct list_head *stream_list) { struct lte_overwrite_prepare_args args = { - .wim = wim, + .wim = wim, + .end_offset = end_offset, .stream_list = stream_list, - .end_offset = end_offset, }; return for_lookup_table_entry(wim->lookup_table, lte_overwrite_prepare, &args); } -static int inode_find_streams_to_write(struct inode *inode, - struct lookup_table *table, - struct list_head *stream_list) +static int +inode_find_streams_to_write(struct wim_inode *inode, + struct wim_lookup_table *table, + struct list_head *stream_list) { - struct lookup_table_entry *lte; - for (unsigned i = 0; i <= inode->num_ads; i++) { + struct wim_lookup_table_entry *lte; + for (unsigned i = 0; i <= inode->i_num_ads; i++) { lte = inode_stream_lte(inode, i, table); if (lte) { if (lte->out_refcnt == 0) list_add_tail(<e->staging_list, stream_list); - lte->out_refcnt += inode->link_count; + lte->out_refcnt += inode->i_nlink; } } return 0; } -static int image_find_streams_to_write(WIMStruct *w) +static int +image_find_streams_to_write(WIMStruct *w) { - struct inode *inode; + struct wim_inode *inode; struct hlist_node *cur; struct hlist_head *inode_list; inode_list = &wim_get_current_image_metadata(w)->inode_list; - hlist_for_each_entry(inode, cur, inode_list, hlist) { + hlist_for_each_entry(inode, cur, inode_list, i_hlist) { inode_find_streams_to_write(inode, w->lookup_table, (struct list_head*)w->private); } return 0; } -static int write_wim_streams(WIMStruct *w, int image, int write_flags, +static int +write_wim_streams(WIMStruct *w, int image, int write_flags, unsigned num_threads, wimlib_progress_func_t progress_func) { @@ -1454,8 +1525,9 @@ static int write_wim_streams(WIMStruct *w, int image, int write_flags, * fsync() the output file before closing it. * */ -int finish_write(WIMStruct *w, int image, int write_flags, - wimlib_progress_func_t progress_func) +int +finish_write(WIMStruct *w, int image, int write_flags, + wimlib_progress_func_t progress_func) { int ret; struct wim_header hdr; @@ -1588,7 +1660,8 @@ out: } #if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK) -int lock_wim(WIMStruct *w, FILE *fp) +int +lock_wim(WIMStruct *w, FILE *fp) { int ret = 0; if (fp && !w->wim_locked) { @@ -1600,8 +1673,8 @@ int lock_wim(WIMStruct *w, FILE *fp) " by another process!", w->filename); ret = WIMLIB_ERR_ALREADY_LOCKED; } else { - WARNING("Failed to lock `%s': %s", - w->filename, strerror(errno)); + WARNING_WITH_ERRNO("Failed to lock `%s'", + w->filename); ret = 0; } } else { @@ -1612,8 +1685,9 @@ int lock_wim(WIMStruct *w, FILE *fp) } #endif -static int open_wim_writable(WIMStruct *w, const char *path, - bool trunc, bool readable) +static int +open_wim_writable(WIMStruct *w, const mbchar *path, + bool trunc, bool readable) { const char *mode; if (trunc) @@ -1635,19 +1709,20 @@ static int open_wim_writable(WIMStruct *w, const char *path, } -void close_wim_writable(WIMStruct *w) +void +close_wim_writable(WIMStruct *w) { if (w->out_fp) { if (fclose(w->out_fp) != 0) { - WARNING("Failed to close output WIM: %s", - strerror(errno)); + WARNING_WITH_ERRNO("Failed to close output WIM"); } w->out_fp = NULL; } } /* Open file stream and write dummy header for WIM. */ -int begin_write(WIMStruct *w, const char *path, int write_flags) +int +begin_write(WIMStruct *w, const mbchar *path, int write_flags) { int ret; ret = open_wim_writable(w, path, true, @@ -1659,9 +1734,10 @@ int begin_write(WIMStruct *w, const char *path, int write_flags) } /* Writes a stand-alone WIM to a file. */ -WIMLIBAPI int wimlib_write(WIMStruct *w, const char *path, - int image, int write_flags, unsigned num_threads, - wimlib_progress_func_t progress_func) +WIMLIBAPI int +wimlib_write(WIMStruct *w, const mbchar *path, + int image, int write_flags, unsigned num_threads, + wimlib_progress_func_t progress_func) { int ret; @@ -1701,10 +1777,12 @@ WIMLIBAPI int wimlib_write(WIMStruct *w, const char *path, ret = finish_write(w, image, write_flags, progress_func); out: close_wim_writable(w); + DEBUG("wimlib_write(path=%s) = %d", path, ret); return ret; } -static bool any_images_modified(WIMStruct *w) +static bool +any_images_modified(WIMStruct *w) { for (int i = 0; i < w->hdr.image_count; i++) if (w->image_metadata[i].modified) @@ -1769,9 +1847,10 @@ static bool any_images_modified(WIMStruct *w) * table, xml data, and integrity table were. (These usually only take up a * small amount of space compared to the streams, however.) */ -static int overwrite_wim_inplace(WIMStruct *w, int write_flags, - unsigned num_threads, - wimlib_progress_func_t progress_func) +static int +overwrite_wim_inplace(WIMStruct *w, int write_flags, + unsigned num_threads, + wimlib_progress_func_t progress_func) { int ret; struct list_head stream_list; @@ -1866,15 +1945,18 @@ out_ftruncate: if (ret != 0 && !(write_flags & WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE)) { WARNING("Truncating `%s' to its original size (%"PRIu64" bytes)", w->filename, old_wim_end); - truncate(w->filename, old_wim_end); + /* Return value of truncate() is ignored because this is already + * an error path. */ + (void)truncate(w->filename, old_wim_end); } w->wim_locked = 0; return ret; } -static int overwrite_wim_via_tmpfile(WIMStruct *w, int write_flags, - unsigned num_threads, - wimlib_progress_func_t progress_func) +static int +overwrite_wim_via_tmpfile(WIMStruct *w, int write_flags, + unsigned num_threads, + wimlib_progress_func_t progress_func) { size_t wim_name_len; int ret; @@ -1884,7 +1966,7 @@ static int overwrite_wim_via_tmpfile(WIMStruct *w, int write_flags, /* Write the WIM to a temporary file in the same directory as the * original WIM. */ wim_name_len = strlen(w->filename); - char tmpfile[wim_name_len + 10]; + mbchar tmpfile[wim_name_len + 10]; memcpy(tmpfile, w->filename, wim_name_len); randomize_char_array_with_alnum(tmpfile + wim_name_len, 9); tmpfile[wim_name_len + 9] = '\0'; @@ -1924,8 +2006,8 @@ static int overwrite_wim_via_tmpfile(WIMStruct *w, int write_flags, w->fp = fopen(w->filename, "rb"); if (w->fp == NULL) { ret = WIMLIB_ERR_REOPEN; - WARNING("Failed to re-open `%s' read-only: %s", - w->filename, strerror(errno)); + WARNING_WITH_ERRNO("Failed to re-open `%s' read-only", + w->filename); FREE(w->filename); w->filename = NULL; } @@ -1933,16 +2015,17 @@ static int overwrite_wim_via_tmpfile(WIMStruct *w, int write_flags, err: /* Remove temporary file. */ if (unlink(tmpfile) != 0) - WARNING("Failed to remove `%s': %s", tmpfile, strerror(errno)); + WARNING_WITH_ERRNO("Failed to remove `%s'", tmpfile); return ret; } /* * Writes a WIM file to the original file that it was read from, overwriting it. */ -WIMLIBAPI int wimlib_overwrite(WIMStruct *w, int write_flags, - unsigned num_threads, - wimlib_progress_func_t progress_func) +WIMLIBAPI int +wimlib_overwrite(WIMStruct *w, int write_flags, + unsigned num_threads, + wimlib_progress_func_t progress_func) { write_flags &= WIMLIB_WRITE_MASK_PUBLIC;