* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
-/* On BSD, this should be included before "list.h" so that "list.h" can
+/* On BSD, this should be included before "wimlib/list.h" so that "wimlib/list.h" can
* overwrite the LIST_HEAD macro. */
# include <sys/file.h>
#endif
+#include "wimlib/endianness.h"
+#include "wimlib/error.h"
+#include "wimlib/file_io.h"
+#include "wimlib/header.h"
+#include "wimlib/integrity.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/resource.h"
+#include "wimlib/write.h"
+#include "wimlib/xml.h"
+
#ifdef __WIN32__
-# include "win32.h"
+# include "wimlib/win32.h" /* win32_get_number_of_processors() */
#endif
-#include "list.h"
-#include "wimlib_internal.h"
-#include "buffer_io.h"
-#include "dentry.h"
-#include "lookup_table.h"
-#include "xml.h"
-
#ifdef ENABLE_MULTITHREADED_COMPRESSION
# include <pthread.h>
#endif
* array of offsets.) */
struct chunk_table {
off_t file_offset;
- u64 num_chunks;
u64 original_resource_size;
- u64 bytes_per_chunk_entry;
+ u64 num_chunks;
u64 table_disk_size;
- u64 cur_offset;
- u64 *cur_offset_p;
- u64 offsets[0];
+ unsigned bytes_per_chunk_entry;
+ void *cur_offset_p;
+ union {
+ u32 cur_offset_u32;
+ u64 cur_offset_u64;
+ };
+ /* Beginning of chunk offsets, in either 32-bit or 64-bit little endian
+ * integers, including the first offset of 0, which will not be written.
+ * */
+ u8 offsets[] _aligned_attribute(8);
};
/*
struct chunk_table **chunk_tab_ret)
{
u64 size = wim_resource_size(lte);
- u64 num_chunks = (size + WIM_CHUNK_SIZE - 1) / WIM_CHUNK_SIZE;
+ u64 num_chunks = wim_resource_chunks(lte);
+ unsigned bytes_per_chunk_entry = (size > (1ULL << 32)) ? 8 : 4;
size_t alloc_size = sizeof(struct chunk_table) + num_chunks * sizeof(u64);
struct chunk_table *chunk_tab = CALLOC(1, alloc_size);
- DEBUG("Begin chunk table for stream with size %"PRIu64, size);
+ DEBUG("Beginning chunk table for stream with size %"PRIu64, size);
if (!chunk_tab) {
ERROR("Failed to allocate chunk table for %"PRIu64" byte "
chunk_tab->file_offset = file_offset;
chunk_tab->num_chunks = num_chunks;
chunk_tab->original_resource_size = size;
- chunk_tab->bytes_per_chunk_entry = (size >= (1ULL << 32)) ? 8 : 4;
+ chunk_tab->bytes_per_chunk_entry = bytes_per_chunk_entry;
chunk_tab->table_disk_size = chunk_tab->bytes_per_chunk_entry *
(num_chunks - 1);
- chunk_tab->cur_offset = 0;
chunk_tab->cur_offset_p = chunk_tab->offsets;
- if (full_write(out_fd, chunk_tab,
+ /* We don't know the correct offsets yet; this just writes zeroes to
+ * reserve space for the table, so we can go back to it later after
+ * we've written the compressed chunks following it. */
+ if (full_write(out_fd, chunk_tab->offsets,
chunk_tab->table_disk_size) != chunk_tab->table_disk_size)
{
ERROR_WITH_ERRNO("Failed to write chunk table in compressed "
return 0;
}
+/* Add the offset for the next chunk to the chunk table being constructed for a
+ * compressed stream. */
+static void
+chunk_tab_record_chunk(struct chunk_table *chunk_tab, unsigned out_chunk_size)
+{
+ if (chunk_tab->bytes_per_chunk_entry == 4) {
+ *(le32*)chunk_tab->cur_offset_p = cpu_to_le32(chunk_tab->cur_offset_u32);
+ chunk_tab->cur_offset_p = (le32*)chunk_tab->cur_offset_p + 1;
+ chunk_tab->cur_offset_u32 += out_chunk_size;
+ } else {
+ *(le64*)chunk_tab->cur_offset_p = cpu_to_le64(chunk_tab->cur_offset_u64);
+ chunk_tab->cur_offset_p = (le64*)chunk_tab->cur_offset_p + 1;
+ chunk_tab->cur_offset_u64 += out_chunk_size;
+ }
+}
+
/*
* compress_func_t- Pointer to a function to compresses a chunk
* of a WIM resource. This may be either
out_chunk = chunk;
out_chunk_size = chunk_size;
}
- *chunk_tab->cur_offset_p++ = chunk_tab->cur_offset;
- chunk_tab->cur_offset += out_chunk_size;
+ chunk_tab_record_chunk(chunk_tab, out_chunk_size);
} else {
/* Write uncompressed */
out_chunk = chunk;
{
size_t bytes_written;
- if (chunk_tab->bytes_per_chunk_entry == 8) {
- array_cpu_to_le64(chunk_tab->offsets, chunk_tab->num_chunks);
- } else {
- for (u64 i = 0; i < chunk_tab->num_chunks; i++)
- ((u32*)chunk_tab->offsets)[i] =
- cpu_to_le32(chunk_tab->offsets[i]);
- }
bytes_written = full_pwrite(out_fd,
- (u8*)chunk_tab->offsets + chunk_tab->bytes_per_chunk_entry,
+ 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) {
"file resource");
return WIMLIB_ERR_WRITE;
}
- *compressed_size_p = chunk_tab->cur_offset + chunk_tab->table_disk_size;
+ if (chunk_tab->bytes_per_chunk_entry == 4)
+ *compressed_size_p = chunk_tab->cur_offset_u32 + chunk_tab->table_disk_size;
+ else
+ *compressed_size_p = chunk_tab->cur_offset_u64 + chunk_tab->table_disk_size;
return 0;
}
if (!(flags & WIMLIB_RESOURCE_FLAG_RECOMPRESS) &&
lte->resource_location == RESOURCE_IN_WIM &&
out_ctype != WIMLIB_COMPRESSION_TYPE_NONE &&
- wimlib_get_compression_type(lte->wim) == out_ctype)
+ lte->wim->compression_type == out_ctype)
{
flags |= WIMLIB_RESOURCE_FLAG_RAW;
write_ctx.doing_sha = false;
write_wim_chunks(struct message *msg, int out_fd,
struct chunk_table *chunk_tab)
{
- for (unsigned i = 0; i < msg->num_chunks; i++) {
- *chunk_tab->cur_offset_p++ = chunk_tab->cur_offset;
- chunk_tab->cur_offset += msg->out_chunks[i].iov_len;
- }
+ for (unsigned i = 0; i < msg->num_chunks; i++)
+ chunk_tab_record_chunk(chunk_tab, msg->out_chunks[i].iov_len);
if (full_writev(out_fd, msg->out_chunks,
msg->num_chunks) != msg->total_out_bytes)
{
ctx->out_ctype == WIMLIB_COMPRESSION_TYPE_NONE ||
(lte->resource_location == RESOURCE_IN_WIM &&
!(ctx->write_resource_flags & WIMLIB_RESOURCE_FLAG_RECOMPRESS) &&
- wimlib_get_compression_type(lte->wim) == ctx->out_ctype))
+ lte->wim->compression_type == ctx->out_ctype))
{
/* Stream is too small or isn't being compressed. Process it by
* the main thread when we have a chance. We can't necessarily
}
static long
-get_default_num_threads()
+get_default_num_threads(void)
{
#ifdef __WIN32__
return win32_get_number_of_processors();
progress.write_streams._private = 0;
#ifdef ENABLE_MULTITHREADED_COMPRESSION
- if (total_compression_bytes >= 1000000 && num_threads != 1)
+ if (total_compression_bytes >= 2000000 && num_threads != 1)
ret = write_stream_list_parallel(stream_list,
lookup_table,
out_fd,
if (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, stderr);
- #endif
+ if (wimlib_print_errors) {
+ ERROR("The following resource is after the XML data:");
+ print_lookup_table_entry(lte, stderr);
+ }
return WIMLIB_ERR_RESOURCE_ORDER;
}
copy_resource_entry(<e->output_resource_entry,
}
static int
-image_find_streams_to_write(WIMStruct *w)
+image_find_streams_to_write(WIMStruct *wim)
{
struct find_streams_ctx *ctx;
struct wim_image_metadata *imd;
struct wim_inode *inode;
struct wim_lookup_table_entry *lte;
- ctx = w->private;
- imd = wim_get_current_image_metadata(w);
+ ctx = wim->private;
+ imd = wim_get_current_image_metadata(wim);
image_for_each_unhashed_stream(lte, imd)
lte->out_refcnt = 0;
/* Go through this image's inodes to find any streams that have not been
* found yet. */
image_for_each_inode(inode, imd) {
- inode_find_streams_to_write(inode, w->lookup_table,
+ inode_find_streams_to_write(inode, wim->lookup_table,
&ctx->stream_list,
&ctx->stream_size_tab);
}
return write_stream_list(&stream_list,
wim->lookup_table,
wim->out_fd,
- wimlib_get_compression_type(wim),
+ wim->compression_type,
write_flags,
num_threads,
progress_func);
*
*/
int
-finish_write(WIMStruct *w, int image, int write_flags,
+finish_write(WIMStruct *wim, int image, int write_flags,
wimlib_progress_func_t progress_func)
{
int ret;
* from the header in the WIMStruct; then set all the fields that may
* have changed, including the resource entries, boot index, and image
* count. */
- memcpy(&hdr, &w->hdr, sizeof(struct wim_header));
+ memcpy(&hdr, &wim->hdr, sizeof(struct wim_header));
/* Set image count and boot index correctly for single image writes */
if (image != WIMLIB_ALL_IMAGES) {
zero_resource_entry(&hdr.boot_metadata_res_entry);
} else {
copy_resource_entry(&hdr.boot_metadata_res_entry,
- &w->image_metadata[ hdr.boot_idx- 1
+ &wim->image_metadata[ hdr.boot_idx- 1
]->metadata_lte->output_resource_entry);
}
if (!(write_flags & WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE)) {
- ret = write_lookup_table(w, image, &hdr.lookup_table_res_entry);
+ ret = write_lookup_table(wim, image, &hdr.lookup_table_res_entry);
if (ret)
goto out_close_wim;
}
- ret = write_xml_data(w->wim_info, image, w->out_fd,
+ ret = write_xml_data(wim->wim_info, image, wim->out_fd,
(write_flags & WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE) ?
- wim_info_get_total_bytes(w->wim_info) : 0,
+ wim_info_get_total_bytes(wim->wim_info) : 0,
&hdr.xml_res_entry);
if (ret)
goto out_close_wim;
struct wim_header checkpoint_hdr;
memcpy(&checkpoint_hdr, &hdr, sizeof(struct wim_header));
zero_resource_entry(&checkpoint_hdr.integrity);
- ret = write_header(&checkpoint_hdr, w->out_fd);
+ checkpoint_hdr.flags |= WIM_HDR_FLAG_WRITE_IN_PROGRESS;
+ ret = write_header(&checkpoint_hdr, wim->out_fd);
if (ret)
goto out_close_wim;
}
off_t old_lookup_table_end;
off_t new_lookup_table_end;
if (write_flags & WIMLIB_WRITE_FLAG_REUSE_INTEGRITY_TABLE) {
- old_lookup_table_end = w->hdr.lookup_table_res_entry.offset +
- w->hdr.lookup_table_res_entry.size;
+ old_lookup_table_end = wim->hdr.lookup_table_res_entry.offset +
+ wim->hdr.lookup_table_res_entry.size;
} else {
old_lookup_table_end = 0;
}
new_lookup_table_end = hdr.lookup_table_res_entry.offset +
hdr.lookup_table_res_entry.size;
- ret = write_integrity_table(w->out_fd,
+ ret = write_integrity_table(wim->out_fd,
&hdr.integrity,
new_lookup_table_end,
old_lookup_table_end,
zero_resource_entry(&hdr.integrity);
}
- ret = write_header(&hdr, w->out_fd);
+ hdr.flags &= ~WIM_HDR_FLAG_WRITE_IN_PROGRESS;
+ ret = write_header(&hdr, wim->out_fd);
if (ret)
goto out_close_wim;
if (write_flags & WIMLIB_WRITE_FLAG_FSYNC) {
- if (fsync(w->out_fd)) {
+ if (fsync(wim->out_fd)) {
ERROR_WITH_ERRNO("Error syncing data to WIM file");
ret = WIMLIB_ERR_WRITE;
}
}
out_close_wim:
- if (close(w->out_fd)) {
+ if (close(wim->out_fd)) {
ERROR_WITH_ERRNO("Failed to close the output WIM file");
if (ret == 0)
ret = WIMLIB_ERR_WRITE;
}
- w->out_fd = -1;
+ wim->out_fd = -1;
return ret;
}
#if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
int
-lock_wim(WIMStruct *w, int fd)
+lock_wim(WIMStruct *wim, int fd)
{
int ret = 0;
- if (fd != -1 && !w->wim_locked) {
+ if (fd != -1 && !wim->wim_locked) {
ret = flock(fd, LOCK_EX | LOCK_NB);
if (ret != 0) {
if (errno == EWOULDBLOCK) {
ERROR("`%"TS"' is already being modified or has been "
"mounted read-write\n"
- " by another process!", w->filename);
+ " by another process!", wim->filename);
ret = WIMLIB_ERR_ALREADY_LOCKED;
} else {
WARNING_WITH_ERRNO("Failed to lock `%"TS"'",
- w->filename);
+ wim->filename);
ret = 0;
}
} else {
- w->wim_locked = 1;
+ wim->wim_locked = 1;
}
}
return ret;
#endif
static int
-open_wim_writable(WIMStruct *w, const tchar *path, int open_flags)
+open_wim_writable(WIMStruct *wim, const tchar *path, int open_flags)
{
- w->out_fd = topen(path, open_flags | O_BINARY, 0644);
- if (w->out_fd == -1) {
+ wim->out_fd = topen(path, open_flags | O_BINARY, 0644);
+ if (wim->out_fd == -1) {
ERROR_WITH_ERRNO("Failed to open `%"TS"' for writing", path);
return WIMLIB_ERR_OPEN;
}
void
-close_wim_writable(WIMStruct *w)
+close_wim_writable(WIMStruct *wim)
{
- if (w->out_fd != -1) {
- if (close(w->out_fd))
+ if (wim->out_fd != -1) {
+ if (close(wim->out_fd))
WARNING_WITH_ERRNO("Failed to close output WIM");
- w->out_fd = -1;
+ wim->out_fd = -1;
}
}
/* Open file stream and write dummy header for WIM. */
int
-begin_write(WIMStruct *w, const tchar *path, int write_flags)
+begin_write(WIMStruct *wim, const tchar *path, int write_flags)
{
int ret;
int open_flags = O_TRUNC | O_CREAT;
open_flags |= O_RDWR;
else
open_flags |= O_WRONLY;
- ret = open_wim_writable(w, path, open_flags);
+ ret = open_wim_writable(wim, path, open_flags);
if (ret)
return ret;
/* Write dummy header. It will be overwritten later. */
- ret = write_header(&w->hdr, w->out_fd);
+ wim->hdr.flags |= WIM_HDR_FLAG_WRITE_IN_PROGRESS;
+ ret = write_header(&wim->hdr, wim->out_fd);
+ wim->hdr.flags &= ~WIM_HDR_FLAG_WRITE_IN_PROGRESS;
if (ret)
return ret;
- if (lseek(w->out_fd, WIM_HEADER_DISK_SIZE, SEEK_SET) == -1) {
+ if (lseek(wim->out_fd, WIM_HEADER_DISK_SIZE, SEEK_SET) == -1) {
ERROR_WITH_ERRNO("Failed to seek to end of WIM header");
return WIMLIB_ERR_WRITE;
}
/* Writes a stand-alone WIM to a file. */
WIMLIBAPI int
-wimlib_write(WIMStruct *w, const tchar *path,
+wimlib_write(WIMStruct *wim, const tchar *path,
int image, int write_flags, unsigned num_threads,
wimlib_progress_func_t progress_func)
{
write_flags &= WIMLIB_WRITE_MASK_PUBLIC;
if (image != WIMLIB_ALL_IMAGES &&
- (image < 1 || image > w->hdr.image_count))
+ (image < 1 || image > wim->hdr.image_count))
return WIMLIB_ERR_INVALID_IMAGE;
- if (w->hdr.total_parts != 1) {
+ if (wim->hdr.total_parts != 1) {
ERROR("Cannot call wimlib_write() on part of a split WIM");
return WIMLIB_ERR_SPLIT_UNSUPPORTED;
}
- ret = begin_write(w, path, write_flags);
+ ret = begin_write(wim, path, write_flags);
if (ret)
goto out_close_wim;
- ret = write_wim_streams(w, image, write_flags, num_threads,
+ ret = write_wim_streams(wim, image, write_flags, num_threads,
progress_func);
if (ret)
goto out_close_wim;
if (progress_func)
progress_func(WIMLIB_PROGRESS_MSG_WRITE_METADATA_BEGIN, NULL);
- ret = for_image(w, image, write_metadata_resource);
+ ret = for_image(wim, image, write_metadata_resource);
if (ret)
goto out_close_wim;
if (progress_func)
progress_func(WIMLIB_PROGRESS_MSG_WRITE_METADATA_END, NULL);
- ret = finish_write(w, image, write_flags, progress_func);
+ ret = finish_write(wim, image, write_flags, progress_func);
/* finish_write() closed the WIM for us */
goto out;
out_close_wim:
- close_wim_writable(w);
+ close_wim_writable(wim);
out:
DEBUG("wimlib_write(path=%"TS") = %d", path, ret);
return ret;
}
static bool
-any_images_modified(WIMStruct *w)
+any_images_modified(WIMStruct *wim)
{
- for (int i = 0; i < w->hdr.image_count; i++)
- if (w->image_metadata[i]->modified)
+ for (int i = 0; i < wim->hdr.image_count; i++)
+ if (wim->image_metadata[i]->modified)
return true;
return false;
}
* small amount of space compared to the streams, however.)
*/
static int
-overwrite_wim_inplace(WIMStruct *w, int write_flags,
+overwrite_wim_inplace(WIMStruct *wim, int write_flags,
unsigned num_threads,
wimlib_progress_func_t progress_func)
{
u64 old_lookup_table_end, old_xml_begin, old_xml_end;
int open_flags;
- DEBUG("Overwriting `%"TS"' in-place", w->filename);
+ DEBUG("Overwriting `%"TS"' in-place", wim->filename);
/* Make sure that the integrity table (if present) is after the XML
* data, and that there are no stream resources, metadata resources, or
* lookup tables after the XML data. Otherwise, these data would be
* overwritten. */
- old_xml_begin = w->hdr.xml_res_entry.offset;
- old_xml_end = old_xml_begin + w->hdr.xml_res_entry.size;
- old_lookup_table_end = w->hdr.lookup_table_res_entry.offset +
- w->hdr.lookup_table_res_entry.size;
- if (w->hdr.integrity.offset != 0 && w->hdr.integrity.offset < old_xml_end) {
+ old_xml_begin = wim->hdr.xml_res_entry.offset;
+ old_xml_end = old_xml_begin + wim->hdr.xml_res_entry.size;
+ old_lookup_table_end = wim->hdr.lookup_table_res_entry.offset +
+ wim->hdr.lookup_table_res_entry.size;
+ if (wim->hdr.integrity.offset != 0 && wim->hdr.integrity.offset < old_xml_end) {
ERROR("Didn't expect the integrity table to be before the XML data");
return WIMLIB_ERR_RESOURCE_ORDER;
}
* allow any file and metadata resources to appear without returning
* WIMLIB_ERR_RESOURCE_ORDER (due to the fact that we would otherwise
* overwrite these resources). */
- if (!w->deletion_occurred && !any_images_modified(w)) {
+ if (!wim->deletion_occurred && !any_images_modified(wim)) {
/* If no images have been modified and no images have been
* deleted, a new lookup table does not need to be written. We
* shall write the new XML data and optional integrity table
old_wim_end = old_lookup_table_end;
write_flags |= WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE |
WIMLIB_WRITE_FLAG_CHECKPOINT_AFTER_XML;
- } else if (w->hdr.integrity.offset) {
+ } else if (wim->hdr.integrity.offset) {
/* Old WIM has an integrity table; begin writing new streams
* after it. */
- old_wim_end = w->hdr.integrity.offset + w->hdr.integrity.size;
+ old_wim_end = wim->hdr.integrity.offset + wim->hdr.integrity.size;
} else {
/* No existing integrity table; begin writing new streams after
* the old XML data. */
old_wim_end = old_xml_end;
}
- ret = prepare_streams_for_overwrite(w, old_wim_end, &stream_list);
+ ret = prepare_streams_for_overwrite(wim, old_wim_end, &stream_list);
if (ret)
return ret;
open_flags |= O_RDWR;
else
open_flags |= O_WRONLY;
- ret = open_wim_writable(w, w->filename, open_flags);
+ ret = open_wim_writable(wim, wim->filename, open_flags);
if (ret)
return ret;
- ret = lock_wim(w, w->out_fd);
+ ret = lock_wim(wim, wim->out_fd);
if (ret) {
- close_wim_writable(w);
+ close_wim_writable(wim);
return ret;
}
- if (lseek(w->out_fd, old_wim_end, SEEK_SET) == -1) {
+ /* Set WIM_HDR_FLAG_WRITE_IN_PROGRESS flag in header. */
+ ret = write_header_flags(wim->hdr.flags | WIM_HDR_FLAG_WRITE_IN_PROGRESS,
+ wim->out_fd);
+ if (ret) {
+ ERROR_WITH_ERRNO("Error updating WIM header flags");
+ close_wim_writable(wim);
+ goto out_unlock_wim;
+ }
+
+ if (lseek(wim->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;
- return WIMLIB_ERR_WRITE;
+ close_wim_writable(wim);
+ ret = WIMLIB_ERR_WRITE;
+ goto out_unlock_wim;
}
DEBUG("Writing newly added streams (offset = %"PRIu64")",
old_wim_end);
ret = write_stream_list(&stream_list,
- w->lookup_table,
- w->out_fd,
- wimlib_get_compression_type(w),
+ wim->lookup_table,
+ wim->out_fd,
+ wim->compression_type,
write_flags,
num_threads,
progress_func);
if (ret)
goto out_truncate;
- for (int i = 0; i < w->hdr.image_count; i++) {
- if (w->image_metadata[i]->modified) {
- select_wim_image(w, i + 1);
- ret = write_metadata_resource(w);
+ for (int i = 0; i < wim->hdr.image_count; i++) {
+ if (wim->image_metadata[i]->modified) {
+ select_wim_image(wim, i + 1);
+ ret = write_metadata_resource(wim);
if (ret)
goto out_truncate;
}
}
write_flags |= WIMLIB_WRITE_FLAG_REUSE_INTEGRITY_TABLE;
- ret = finish_write(w, WIMLIB_ALL_IMAGES, write_flags,
+ ret = finish_write(wim, WIMLIB_ALL_IMAGES, write_flags,
progress_func);
out_truncate:
- close_wim_writable(w);
+ close_wim_writable(wim);
if (ret != 0 && !(write_flags & WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE)) {
WARNING("Truncating `%"TS"' to its original size (%"PRIu64" bytes)",
- w->filename, old_wim_end);
+ wim->filename, old_wim_end);
/* Return value of truncate() is ignored because this is already
* an error path. */
- (void)ttruncate(w->filename, old_wim_end);
+ (void)ttruncate(wim->filename, old_wim_end);
}
- w->wim_locked = 0;
+out_unlock_wim:
+ wim->wim_locked = 0;
return ret;
}
static int
-overwrite_wim_via_tmpfile(WIMStruct *w, int write_flags,
+overwrite_wim_via_tmpfile(WIMStruct *wim, int write_flags,
unsigned num_threads,
wimlib_progress_func_t progress_func)
{
size_t wim_name_len;
int ret;
- DEBUG("Overwriting `%"TS"' via a temporary file", w->filename);
+ DEBUG("Overwriting `%"TS"' via a temporary file", wim->filename);
/* Write the WIM to a temporary file in the same directory as the
* original WIM. */
- wim_name_len = tstrlen(w->filename);
+ wim_name_len = tstrlen(wim->filename);
tchar tmpfile[wim_name_len + 10];
- tmemcpy(tmpfile, w->filename, wim_name_len);
+ tmemcpy(tmpfile, wim->filename, wim_name_len);
randomize_char_array_with_alnum(tmpfile + wim_name_len, 9);
tmpfile[wim_name_len + 9] = T('\0');
- ret = wimlib_write(w, tmpfile, WIMLIB_ALL_IMAGES,
+ ret = wimlib_write(wim, tmpfile, WIMLIB_ALL_IMAGES,
write_flags | WIMLIB_WRITE_FLAG_FSYNC,
num_threads, progress_func);
if (ret) {
goto out_unlink;
}
- close_wim(w);
+ close_wim(wim);
- DEBUG("Renaming `%"TS"' to `%"TS"'", tmpfile, w->filename);
+ DEBUG("Renaming `%"TS"' to `%"TS"'", tmpfile, wim->filename);
/* Rename the new file to the old file .*/
- if (trename(tmpfile, w->filename) != 0) {
+ if (trename(tmpfile, wim->filename) != 0) {
ERROR_WITH_ERRNO("Failed to rename `%"TS"' to `%"TS"'",
- tmpfile, w->filename);
+ tmpfile, wim->filename);
ret = WIMLIB_ERR_RENAME;
goto out_unlink;
}
if (progress_func) {
union wimlib_progress_info progress;
progress.rename.from = tmpfile;
- progress.rename.to = w->filename;
+ progress.rename.to = wim->filename;
progress_func(WIMLIB_PROGRESS_MSG_RENAME, &progress);
}
goto out;
* Writes a WIM file to the original file that it was read from, overwriting it.
*/
WIMLIBAPI int
-wimlib_overwrite(WIMStruct *w, int write_flags,
+wimlib_overwrite(WIMStruct *wim, int write_flags,
unsigned num_threads,
wimlib_progress_func_t progress_func)
{
+ int ret;
+ u32 orig_hdr_flags;
+
write_flags &= WIMLIB_WRITE_MASK_PUBLIC;
- if (!w->filename)
+ if (!wim->filename)
return WIMLIB_ERR_NO_FILENAME;
- if (w->hdr.total_parts != 1) {
- ERROR("Cannot modify a split WIM");
- return WIMLIB_ERR_SPLIT_UNSUPPORTED;
- }
+ orig_hdr_flags = wim->hdr.flags;
+ if (write_flags & WIMLIB_WRITE_FLAG_IGNORE_READONLY_FLAG)
+ wim->hdr.flags &= ~WIM_HDR_FLAG_READONLY;
+ ret = can_modify_wim(wim);
+ wim->hdr.flags = orig_hdr_flags;
+ if (ret)
+ return ret;
- if ((!w->deletion_occurred || (write_flags & WIMLIB_WRITE_FLAG_SOFT_DELETE))
+ if ((!wim->deletion_occurred || (write_flags & WIMLIB_WRITE_FLAG_SOFT_DELETE))
&& !(write_flags & WIMLIB_WRITE_FLAG_REBUILD))
{
int ret;
- ret = overwrite_wim_inplace(w, write_flags, num_threads,
+ ret = overwrite_wim_inplace(wim, write_flags, num_threads,
progress_func);
if (ret == WIMLIB_ERR_RESOURCE_ORDER)
WARNING("Falling back to re-building entire WIM");
else
return ret;
}
- return overwrite_wim_via_tmpfile(w, write_flags, num_threads,
+ return overwrite_wim_via_tmpfile(wim, write_flags, num_threads,
progress_func);
}
git://wimlib.net / wimlib / blobdiff