*/
/*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
* 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)
/* 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
)
{
- 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_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);
+ 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;
+ }
+ *ni_ret = ni;
}
- *ni_ret = ni;
- }
+ break;
#endif
+#if defined(__CYGWIN__) || defined(__WIN32__)
+ case RESOURCE_WIN32:
+ if (!lte->file_on_disk_fp) {
+ lte->file_on_disk_fp = win32_open_handle(lte->file_on_disk);
+ if (!lte->file_on_disk_fp)
+ 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
+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;
}
ntfs_inode_close(ni);
}
#endif
+#if defined(__CYGWIN__) || defined(__WIN32__)
+ else if (lte->resource_location == RESOURCE_WIN32
+ && lte->file_on_disk_fp)
+ {
+ win32_close_handle(lte->file_on_disk_fp);
+ lte->file_on_disk_fp = NULL;
+ }
+#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)
*
* Returns 0 on success; nonzero on failure.
*/
-int write_wim_resource(struct lookup_table_entry *lte,
+int write_wim_resource(struct wim_lookup_table_entry *lte,
FILE *out_fp, int out_ctype,
struct resource_entry *out_res_entry,
int flags)
#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];
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,
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);
// 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
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)
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)
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,
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);
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;
&progress);
}
+struct lte_overwrite_prepare_args {
+ WIMStruct *wim;
+ off_t end_offset;
+ struct list_head *stream_list;
+};
-static int dentry_find_streams_to_write(struct dentry *dentry,
- void *wim)
+static int lte_overwrite_prepare(struct wim_lookup_table_entry *lte, void *arg)
{
- WIMStruct *w = wim;
- struct list_head *stream_list = w->private;
- struct lookup_table_entry *lte;
- for (unsigned i = 0; i <= dentry->d_inode->num_ads; i++) {
- lte = inode_stream_lte(dentry->d_inode, i, w->lookup_table);
- if (lte && ++lte->out_refcnt == 1)
- list_add_tail(<e->staging_list, stream_list);
+ struct lte_overwrite_prepare_args *args = arg;
+
+ 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, stderr);
+ #endif
+ return WIMLIB_ERR_RESOURCE_ORDER;
+ }
+
+ lte->out_refcnt = lte->refcnt;
+ memcpy(<e->output_resource_entry, <e->resource_entry,
+ sizeof(struct resource_entry));
+ if (!(lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA)) {
+ wimlib_assert(lte->resource_location != RESOURCE_NONEXISTENT);
+ if (lte->resource_location != RESOURCE_IN_WIM || lte->wim != args->wim)
+ list_add(<e->staging_list, args->stream_list);
}
return 0;
}
-static int find_streams_to_write(WIMStruct *w)
+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,
+ .end_offset = end_offset,
+ .stream_list = stream_list,
+ };
+
+ return for_lookup_table_entry(wim->lookup_table,
+ lte_overwrite_prepare, &args);
+}
+
+static int inode_find_streams_to_write(struct wim_inode *inode,
+ struct wim_lookup_table *table,
+ struct list_head *stream_list)
{
- return for_dentry_in_tree(wim_root_dentry(w),
- dentry_find_streams_to_write, w);
+ 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->i_nlink;
+ }
+ }
+ return 0;
+}
+
+static int image_find_streams_to_write(WIMStruct *w)
+{
+ 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, 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,
for_lookup_table_entry(w->lookup_table, lte_zero_out_refcnt, NULL);
LIST_HEAD(stream_list);
w->private = &stream_list;
- for_image(w, image, find_streams_to_write);
+ for_image(w, image, image_find_streams_to_write);
return write_stream_list(&stream_list, w->out_fp,
wimlib_get_compression_type(w), write_flags,
num_threads, progress_func);
}
#if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
-int lock_wim(FILE *fp, const char *path)
+int lock_wim(WIMStruct *w, FILE *fp)
{
int ret = 0;
- if (fp) {
+ if (fp && !w->wim_locked) {
ret = flock(fileno(fp), LOCK_EX | LOCK_NB);
if (ret != 0) {
if (errno == EWOULDBLOCK) {
ERROR("`%s' is already being modified or has been "
"mounted read-write\n"
- " by another process!", path);
+ " by another process!", w->filename);
ret = WIMLIB_ERR_ALREADY_LOCKED;
} else {
- WARNING("Failed to lock `%s': %s",
- path, strerror(errno));
+ WARNING_WITH_ERRNO("Failed to lock `%s'",
+ w->filename);
ret = 0;
}
+ } else {
+ w->wim_locked = 1;
}
}
return ret;
{
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;
}
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 int lte_overwrite_prepare(struct lookup_table_entry *lte,
- void *ignore)
-{
- memcpy(<e->output_resource_entry, <e->resource_entry,
- sizeof(struct resource_entry));
- lte->out_refcnt = 0;
- return 0;
-}
-
-static int check_resource_offset(struct lookup_table_entry *lte, void *arg)
+static bool any_images_modified(WIMStruct *w)
{
- wimlib_assert(lte->out_refcnt <= lte->refcnt);
- if (lte->out_refcnt < lte->refcnt) {
- off_t end_offset = *(u64*)arg;
- if (lte->resource_entry.offset +
- lte->resource_entry.size > end_offset)
- {
- ERROR("The following resource is after the XML data:");
- print_lookup_table_entry(lte);
- return WIMLIB_ERR_RESOURCE_ORDER;
- }
- }
- return 0;
-}
-
-static int find_new_streams(struct lookup_table_entry *lte, void *arg)
-{
- if (lte->out_refcnt == lte->refcnt) {
- /* Newly added stream that is only referenced in the modified
- * images. Append it to the list of streams to write. */
- list_add(<e->staging_list, (struct list_head*)arg);
- } else {
- /* Not a newly added stream. But set out_refcnt to the full
- * refcnt so that it's written correctly. */
- lte->out_refcnt = lte->refcnt;
- }
- return 0;
+ for (int i = 0; i < w->hdr.image_count; i++)
+ if (w->image_metadata[i].modified)
+ return true;
+ return false;
}
/*
*/
static int overwrite_wim_inplace(WIMStruct *w, int write_flags,
unsigned num_threads,
- wimlib_progress_func_t progress_func,
- int modified_image_idx)
+ wimlib_progress_func_t progress_func)
{
int ret;
struct list_head stream_list;
off_t old_wim_end;
+ bool found_modified_image;
DEBUG("Overwriting `%s' in-place", w->filename);
return WIMLIB_ERR_RESOURCE_ORDER;
}
- DEBUG("Identifying newly added streams");
- for_lookup_table_entry(w->lookup_table, lte_overwrite_prepare, NULL);
- INIT_LIST_HEAD(&stream_list);
- for (int i = modified_image_idx; i < w->hdr.image_count; i++) {
- DEBUG("Identifiying streams in image %d", i + 1);
- w->private = &stream_list;
- for_dentry_in_tree(w->image_metadata[i].root_dentry,
- dentry_find_streams_to_write, w);
- }
if (w->hdr.integrity.offset)
old_wim_end = w->hdr.integrity.offset + w->hdr.integrity.size;
else
old_wim_end = w->hdr.xml_res_entry.offset + w->hdr.xml_res_entry.size;
- ret = for_lookup_table_entry(w->lookup_table, check_resource_offset,
- &old_wim_end);
- if (ret != 0)
- return ret;
-
- if (modified_image_idx == w->hdr.image_count && !w->deletion_occurred) {
+ if (!w->deletion_occurred && !any_images_modified(w)) {
/* If no images have been modified and no images have been
* deleted, a new lookup table does not need to be written. */
old_wim_end = w->hdr.lookup_table_res_entry.offset +
write_flags |= WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE |
WIMLIB_WRITE_FLAG_CHECKPOINT_AFTER_XML;
}
-
INIT_LIST_HEAD(&stream_list);
- for_lookup_table_entry(w->lookup_table, find_new_streams,
- &stream_list);
+ ret = wim_find_new_streams(w, old_wim_end, &stream_list);
+ if (ret != 0)
+ return ret;
ret = open_wim_writable(w, w->filename, false,
(write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY) != 0);
if (ret != 0)
return ret;
- ret = lock_wim(w->out_fp, w->filename);
+ ret = lock_wim(w, w->out_fp);
if (ret != 0) {
fclose(w->out_fp);
w->out_fp = NULL;
ERROR_WITH_ERRNO("Can't seek to end of WIM");
fclose(w->out_fp);
w->out_fp = NULL;
+ w->wim_locked = 0;
return WIMLIB_ERR_WRITE;
}
DEBUG("No new streams were added");
}
- for (int i = modified_image_idx; i < w->hdr.image_count; i++) {
- select_wim_image(w, i + 1);
- ret = write_metadata_resource(w);
- if (ret != 0)
- goto out_ftruncate;
+ found_modified_image = false;
+ for (int i = 0; i < w->hdr.image_count; i++) {
+ if (!found_modified_image)
+ found_modified_image = w->image_metadata[i].modified;
+ if (found_modified_image) {
+ select_wim_image(w, i + 1);
+ ret = write_metadata_resource(w);
+ if (ret != 0)
+ goto out_ftruncate;
+ }
}
write_flags |= WIMLIB_WRITE_FLAG_REUSE_INTEGRITY_TABLE;
ret = finish_write(w, WIMLIB_ALL_IMAGES, write_flags,
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;
}
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;
}
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;
}
if ((!w->deletion_occurred || (write_flags & WIMLIB_WRITE_FLAG_SOFT_DELETE))
&& !(write_flags & WIMLIB_WRITE_FLAG_REBUILD))
{
- int i;
- int modified_image_idx;
int ret;
-
- for (i = 0; i < w->hdr.image_count && !w->image_metadata[i].modified; i++)
- ;
- modified_image_idx = i;
- for (; i < w->hdr.image_count && w->image_metadata[i].modified &&
- !w->image_metadata[i].has_been_mounted_rw; i++)
- ;
- if (i == w->hdr.image_count) {
- ret = overwrite_wim_inplace(w, write_flags, num_threads,
- progress_func,
- modified_image_idx);
- if (ret == WIMLIB_ERR_RESOURCE_ORDER)
- WARNING("Falling back to re-building entire WIM");
- else
- return ret;
- }
+ ret = overwrite_wim_inplace(w, 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,
progress_func);
git://wimlib.net / wimlib / blobdiff