WIMLIB_EXTRACT_FLAG_NO_PRESERVE_DIR_STRUCTURE | \
WIMLIB_EXTRACT_FLAG_WIMBOOT)
+/* Send WIMLIB_PROGRESS_MSG_EXTRACT_FILE_STRUCTURE or
+ * WIMLIB_PROGRESS_MSG_EXTRACT_METADATA. */
+int
+do_file_extract_progress(struct apply_ctx *ctx, enum wimlib_progress_msg msg)
+{
+ ctx->count_until_file_progress = 512; /* Arbitrary value to limit calls */
+ return extract_progress(ctx, msg);
+}
+
/* Check whether the extraction of a dentry should be skipped completely. */
static bool
dentry_is_supported(struct wim_dentry *dentry,
}
ret = 0;
out:
- if (found_lte->resource_location != RESOURCE_IN_WIM)
+ if (found_lte && found_lte->resource_location != RESOURCE_IN_WIM)
FREE(rspec);
free_lookup_table_entry(found_lte);
return ret;
{
struct wim_lookup_table_entry tmpfile_lte;
struct wim_lookup_table_entry *orig_lte = ctx->cur_stream;
- const struct stream_owner *owners = stream_owners(orig_lte);
const struct read_stream_list_callbacks *cbs = ctx->saved_cbs;
int ret;
+ const u32 orig_refcnt = orig_lte->out_refcnt;
+
+ BUILD_BUG_ON(MAX_OPEN_STREAMS < ARRAY_LEN(orig_lte->inline_stream_owners));
+
+ struct stream_owner *owners = orig_lte->stream_owners;
/* Copy the stream's data from the temporary file to each of its
* destinations.
memcpy(&tmpfile_lte, orig_lte, sizeof(struct wim_lookup_table_entry));
tmpfile_lte.resource_location = RESOURCE_IN_FILE_ON_DISK;
tmpfile_lte.file_on_disk = ctx->tmpfile_name;
- tmpfile_lte.out_refcnt = 1;
-
- for (u32 i = 0; i < orig_lte->out_refcnt; i++) {
- tmpfile_lte.inline_stream_owners[0] = owners[i];
+ ret = 0;
+ for (u32 i = 0; i < orig_refcnt; i++) {
/* Note: it usually doesn't matter whether we pass the original
* stream entry to callbacks provided by the extraction backend
* because it needs the original stream location in order to
* create the external backing reference. */
+ orig_lte->out_refcnt = 1;
+ orig_lte->inline_stream_owners[0] = owners[i];
+
ret = (*cbs->begin_stream)(orig_lte, cbs->begin_stream_ctx);
if (ret)
- return ret;
+ break;
/* Extra SHA-1 isn't necessary here, but it shouldn't hurt as
* this case is very rare anyway. */
cbs->consume_chunk,
cbs->consume_chunk_ctx);
- return (*cbs->end_stream)(orig_lte, ret,
- cbs->end_stream_ctx);
+ ret = (*cbs->end_stream)(orig_lte, ret, cbs->end_stream_ctx);
+ if (ret)
+ break;
}
- return 0;
+ FREE(owners);
+ orig_lte->out_refcnt = 0;
+ return ret;
}
static int
}
#endif
-#ifndef __WIN32__
if (extract_flags & WIMLIB_EXTRACT_FLAG_WIMBOOT) {
+#ifdef __WIN32__
+ if (!wim->filename)
+ return WIMLIB_ERR_NO_FILENAME;
+#else
ERROR("WIMBoot extraction is only supported on Windows!");
return WIMLIB_ERR_UNSUPPORTED;
- }
#endif
+ }
+
if ((extract_flags & (WIMLIB_EXTRACT_FLAG_RPFIX |
WIMLIB_EXTRACT_FLAG_NORPFIX |