X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract.c;h=625224b34924d4eae6068f15b891402261cdf323;hp=5fcf52480ee2ca9cd95712c0edb905da843ba642;hb=d820468f3c760006bbab61771ba608deb727c53f;hpb=b82856cb22783df0e19990eb68d3694753f52220 diff --git a/src/extract.c b/src/extract.c index 5fcf5248..625224b3 100644 --- a/src/extract.c +++ b/src/extract.c @@ -328,10 +328,7 @@ extract_chunk_wrapper(const void *chunk, size_t size, void *_ctx) const struct wim_inode *inode = targets[i].inode; const struct wim_dentry *dentry; - list_for_each_entry(dentry, - &inode->i_extraction_aliases, - d_extraction_alias_node) - { + inode_for_each_extraction_alias(dentry, inode) { progress->extract.completed_bytes += size; if (ctx->cur_blob_offset == ctx->cur_blob->size) progress->extract.completed_streams++; @@ -384,61 +381,31 @@ extract_chunk_wrapper(const void *chunk, size_t size, void *_ctx) return call_consume_chunk(chunk, size, ctx->saved_cbs); } +/* Copy the blob's data from the temporary file to each of its targets. + * + * This is executed only in the very uncommon case that a blob is being + * extracted to more than MAX_OPEN_FILES targets! */ static int -extract_from_tmpfile(const tchar *tmpfile_name, struct apply_ctx *ctx) +extract_from_tmpfile(const tchar *tmpfile_name, + const struct blob_descriptor *orig_blob, + const struct read_blob_callbacks *cbs) { struct blob_descriptor tmpfile_blob; - struct blob_descriptor *orig_blob = ctx->cur_blob; - const struct read_blob_callbacks *cbs = ctx->saved_cbs; + const struct blob_extraction_target *targets = blob_extraction_targets(orig_blob); int ret; - const u32 orig_refcnt = orig_blob->out_refcnt; - - BUILD_BUG_ON(MAX_OPEN_FILES < - ARRAY_LEN(orig_blob->inline_blob_extraction_targets)); - - struct blob_extraction_target *targets = orig_blob->blob_extraction_targets; - - /* Copy the blob's data from the temporary file to each of its targets. - * - * This is executed only in the very uncommon case that a blob is being - * extracted to more than MAX_OPEN_FILES targets! */ memcpy(&tmpfile_blob, orig_blob, sizeof(struct blob_descriptor)); tmpfile_blob.blob_location = BLOB_IN_FILE_ON_DISK; - tmpfile_blob.file_on_disk = ctx->tmpfile_name; - ret = 0; - for (u32 i = 0; i < orig_refcnt; i++) { - - /* Note: it usually doesn't matter whether we pass the original - * blob descriptor to callbacks provided by the extraction - * backend as opposed to the tmpfile blob descriptor, since they - * shouldn't actually read data from the blob other than through - * the read_blob_with_cbs() call below. But for - * WIMLIB_EXTRACT_FLAG_WIMBOOT mode on Windows it does matter - * because it needs access to the original WIM resource - * descriptor in order to create the external backing reference. - */ - - orig_blob->out_refcnt = 1; - orig_blob->inline_blob_extraction_targets[0] = targets[i]; - - ret = call_begin_blob(orig_blob, cbs); - if (ret) - break; + tmpfile_blob.file_on_disk = (tchar *)tmpfile_name; + tmpfile_blob.out_refcnt = 1; - struct read_blob_callbacks wrapper_cbs = { - .consume_chunk = cbs->consume_chunk, - .ctx = cbs->ctx, - }; - ret = read_blob_with_cbs(&tmpfile_blob, &wrapper_cbs); - - ret = call_end_blob(orig_blob, ret, cbs); + for (u32 i = 0; i < orig_blob->out_refcnt; i++) { + tmpfile_blob.inline_blob_extraction_targets[0] = targets[i]; + ret = read_blob_with_cbs(&tmpfile_blob, cbs); if (ret) - break; + return ret; } - FREE(targets); - orig_blob->out_refcnt = 0; - return ret; + return 0; } static int @@ -449,7 +416,8 @@ end_extract_blob_wrapper(struct blob_descriptor *blob, int status, void *_ctx) if (unlikely(filedes_valid(&ctx->tmpfile_fd))) { filedes_close(&ctx->tmpfile_fd); if (!status) - status = extract_from_tmpfile(ctx->tmpfile_name, ctx); + status = extract_from_tmpfile(ctx->tmpfile_name, blob, + ctx->saved_cbs); filedes_invalidate(&ctx->tmpfile_fd); tunlink(ctx->tmpfile_name); FREE(ctx->tmpfile_name); @@ -554,14 +522,14 @@ remove_duplicate_trees(struct wim_dentry **trees, size_t num_trees) { size_t i, j = 0; for (i = 0; i < num_trees; i++) { - if (!trees[i]->tmp_flag) { + if (!trees[i]->d_tmp_flag) { /* Found distinct dentry. */ - trees[i]->tmp_flag = 1; + trees[i]->d_tmp_flag = 1; trees[j++] = trees[i]; } } for (i = 0; i < j; i++) - trees[i]->tmp_flag = 0; + trees[i]->d_tmp_flag = 0; return j; } @@ -575,23 +543,23 @@ remove_contained_trees(struct wim_dentry **trees, size_t num_trees) { size_t i, j = 0; for (i = 0; i < num_trees; i++) - trees[i]->tmp_flag = 1; + trees[i]->d_tmp_flag = 1; for (i = 0; i < num_trees; i++) { struct wim_dentry *d = trees[i]; while (!dentry_is_root(d)) { d = d->d_parent; - if (d->tmp_flag) + if (d->d_tmp_flag) goto tree_contained; } trees[j++] = trees[i]; continue; tree_contained: - trees[i]->tmp_flag = 0; + trees[i]->d_tmp_flag = 0; } for (i = 0; i < j; i++) - trees[i]->tmp_flag = 0; + trees[i]->d_tmp_flag = 0; return j; } @@ -612,8 +580,10 @@ dentry_reset_extraction_list_node(struct wim_dentry *dentry) static int dentry_delete_from_list(struct wim_dentry *dentry, void *_ignore) { - list_del(&dentry->d_extraction_list_node); - dentry_reset_extraction_list_node(dentry); + if (will_extract_dentry(dentry)) { + list_del(&dentry->d_extraction_list_node); + dentry_reset_extraction_list_node(dentry); + } return 0; } @@ -675,7 +645,7 @@ destroy_dentry_list(struct list_head *dentry_list) dentry_reset_extraction_list_node(dentry); inode->i_visited = 0; inode->i_can_externally_back = 0; - if ((void *)dentry->d_extraction_name != (void *)dentry->file_name) + if ((void *)dentry->d_extraction_name != (void *)dentry->d_name) FREE(dentry->d_extraction_name); dentry->d_extraction_name = NULL; dentry->d_extraction_name_nchars = 0; @@ -750,8 +720,8 @@ dentry_calculate_extraction_name(struct wim_dentry *dentry, #ifdef WITH_NTFS_3G if (ctx->extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { - dentry->d_extraction_name = dentry->file_name; - dentry->d_extraction_name_nchars = dentry->file_name_nbytes / + dentry->d_extraction_name = dentry->d_name; + dentry->d_extraction_name_nchars = dentry->d_name_nbytes / sizeof(utf16lechar); return 0; } @@ -784,12 +754,13 @@ dentry_calculate_extraction_name(struct wim_dentry *dentry, } } - if (file_name_valid(dentry->file_name, dentry->file_name_nbytes / 2, false)) { - ret = utf16le_get_tstr(dentry->file_name, - dentry->file_name_nbytes, + if (file_name_valid(dentry->d_name, dentry->d_name_nbytes / 2, false)) { + size_t nbytes = 0; + ret = utf16le_get_tstr(dentry->d_name, + dentry->d_name_nbytes, (const tchar **)&dentry->d_extraction_name, - &dentry->d_extraction_name_nchars); - dentry->d_extraction_name_nchars /= sizeof(tchar); + &nbytes); + dentry->d_extraction_name_nchars = nbytes / sizeof(tchar); return ret; } else { if (ctx->extract_flags & WIMLIB_EXTRACT_FLAG_REPLACE_INVALID_FILENAMES) @@ -809,16 +780,16 @@ dentry_calculate_extraction_name(struct wim_dentry *dentry, out_replace: { - utf16lechar utf16_name_copy[dentry->file_name_nbytes / 2]; + utf16lechar utf16_name_copy[dentry->d_name_nbytes / 2]; - memcpy(utf16_name_copy, dentry->file_name, dentry->file_name_nbytes); - file_name_valid(utf16_name_copy, dentry->file_name_nbytes / 2, true); + memcpy(utf16_name_copy, dentry->d_name, dentry->d_name_nbytes); + file_name_valid(utf16_name_copy, dentry->d_name_nbytes / 2, true); const tchar *tchar_name; size_t tchar_nchars; ret = utf16le_get_tstr(utf16_name_copy, - dentry->file_name_nbytes, + dentry->d_name_nbytes, &tchar_name, &tchar_nchars); if (ret) return ret; @@ -1112,18 +1083,14 @@ static void dentry_list_build_inode_alias_lists(struct list_head *dentry_list) { struct wim_dentry *dentry; - struct wim_inode *inode; + + list_for_each_entry(dentry, dentry_list, d_extraction_list_node) + dentry->d_inode->i_first_extraction_alias = NULL; list_for_each_entry(dentry, dentry_list, d_extraction_list_node) { - inode = dentry->d_inode; - if (!inode->i_visited) - INIT_LIST_HEAD(&inode->i_extraction_aliases); - list_add_tail(&dentry->d_extraction_alias_node, - &inode->i_extraction_aliases); - inode->i_visited = 1; + dentry->d_next_extraction_alias = dentry->d_inode->i_first_extraction_alias; + dentry->d_inode->i_first_extraction_alias = dentry; } - list_for_each_entry(dentry, dentry_list, d_extraction_list_node) - dentry->d_inode->i_visited = 0; } static void @@ -1157,7 +1124,7 @@ inode_tally_features(const struct wim_inode *inode, else features->other_reparse_points++; } - if (inode->i_security_id != -1) + if (inode_has_security_descriptor(inode)) features->security_descriptors++; if (inode_has_unix_data(inode)) features->unix_data++;