X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fextract.c;h=e8fd7a69ce5211f8d95ca7efd5d14765258c6e96;hb=156bb1de48ff4a594f6a2a2f86e86213d65a6b08;hp=e62fa8a890cc27927f9fbe22290db85045d9cb8b;hpb=93ff837938b51373bc60153ef60409f6c1f795c8;p=wimlib diff --git a/src/extract.c b/src/extract.c index e62fa8a8..e8fd7a69 100644 --- a/src/extract.c +++ b/src/extract.c @@ -90,6 +90,15 @@ 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, @@ -217,7 +226,7 @@ load_streams_from_pipe(struct apply_ctx *ctx, lte_unbind_wim_resource_spec(found_lte); lte_bind_wim_resource_spec(needed_lte, rspec); - ret = (*cbs->begin_stream)(needed_lte, 0, + ret = (*cbs->begin_stream)(needed_lte, cbs->begin_stream_ctx); if (ret) { lte_unbind_wim_resource_spec(needed_lte); @@ -306,18 +315,17 @@ retry: } static int -begin_extract_stream_wrapper(struct wim_lookup_table_entry *lte, - u32 flags, void *_ctx) +begin_extract_stream_wrapper(struct wim_lookup_table_entry *lte, void *_ctx) { struct apply_ctx *ctx = _ctx; ctx->cur_stream = lte; + ctx->cur_stream_offset = 0; if (unlikely(lte->out_refcnt > MAX_OPEN_STREAMS)) return create_temporary_file(&ctx->tmpfile_fd, &ctx->tmpfile_name); else - return (*ctx->saved_cbs->begin_stream)(lte, flags, - ctx->saved_cbs->begin_stream_ctx); + return (*ctx->saved_cbs->begin_stream)(lte, ctx->saved_cbs->begin_stream_ctx); } static int @@ -327,9 +335,13 @@ extract_chunk_wrapper(const void *chunk, size_t size, void *_ctx) union wimlib_progress_info *progress = &ctx->progress; int ret; + ctx->cur_stream_offset += size; + if (likely(ctx->supported_features.hard_links)) { progress->extract.completed_bytes += (u64)size * ctx->cur_stream->out_refcnt; + if (ctx->cur_stream_offset == ctx->cur_stream->size) + progress->extract.completed_streams += ctx->cur_stream->out_refcnt; } else { const struct stream_owner *owners = stream_owners(ctx->cur_stream); for (u32 i = 0; i < ctx->cur_stream->out_refcnt; i++) { @@ -341,6 +353,8 @@ extract_chunk_wrapper(const void *chunk, size_t size, void *_ctx) d_extraction_alias_node) { progress->extract.completed_bytes += size; + if (ctx->cur_stream_offset == ctx->cur_stream->size) + progress->extract.completed_streams++; } } } @@ -392,14 +406,17 @@ extract_chunk_wrapper(const void *chunk, size_t size, void *_ctx) } static int -extract_from_tmpfile(const tchar *tmpfile_name, - struct wim_lookup_table_entry *orig_lte, - struct apply_ctx *ctx) +extract_from_tmpfile(const tchar *tmpfile_name, struct apply_ctx *ctx) { struct wim_lookup_table_entry tmpfile_lte; - const struct stream_owner *owners = stream_owners(orig_lte); + struct wim_lookup_table_entry *orig_lte = ctx->cur_stream; + const struct read_stream_list_callbacks *cbs = ctx->saved_cbs; int ret; + 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. * @@ -410,15 +427,38 @@ extract_from_tmpfile(const tchar *tmpfile_name, 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; - + ret = 0; for (u32 i = 0; i < orig_lte->out_refcnt; i++) { - tmpfile_lte.inline_stream_owners[0] = owners[i]; - ret = read_full_stream_with_cbs(&tmpfile_lte, ctx->saved_cbs); + + /* Note: it usually doesn't matter whether we pass the original + * stream entry to callbacks provided by the extraction backend + * as opposed to the tmpfile stream entry, since they shouldn't + * actually read data from the stream other than through the + * read_stream_prefix() call below. But for + * WIMLIB_EXTRACT_FLAG_WIMBOOT mode on Windows it does matter + * 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. */ + ret = extract_stream(&tmpfile_lte, tmpfile_lte.size, + cbs->consume_chunk, + cbs->consume_chunk_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 @@ -430,8 +470,7 @@ end_extract_stream_wrapper(struct wim_lookup_table_entry *stream, if (unlikely(filedes_valid(&ctx->tmpfile_fd))) { filedes_close(&ctx->tmpfile_fd); if (!status) - status = extract_from_tmpfile(ctx->tmpfile_name, - stream, ctx); + status = extract_from_tmpfile(ctx->tmpfile_name, ctx); filedes_invalidate(&ctx->tmpfile_fd); tunlink(ctx->tmpfile_name); FREE(ctx->tmpfile_name); @@ -945,7 +984,7 @@ ref_stream(struct wim_lookup_table_entry *lte, u32 stream_idx, return 0; ctx->progress.extract.total_bytes += lte->size; - ctx->progress.extract.num_streams++; + ctx->progress.extract.total_streams++; if (inode->i_visited) return 0; @@ -1488,12 +1527,16 @@ check_extract_flags(const WIMStruct *wim, int *extract_flags_p) } #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 |