X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract.c;h=656a76c9487e9cdd509015c04c8d1727f0b83e11;hp=95071bd7bfbb35b45dec106755a88b1c0db204e8;hb=0d94d9db6e2e8397b4a556bb0218ab82136583e9;hpb=61db93f82eca3fe9f7676355c709c58cc425a6ad diff --git a/src/extract.c b/src/extract.c index 95071bd7..656a76c9 100644 --- a/src/extract.c +++ b/src/extract.c @@ -53,7 +53,6 @@ #include "wimlib/reparse.h" #include "wimlib/resource.h" #include "wimlib/security.h" -#include "wimlib/swm.h" #ifdef __WIN32__ # include "wimlib/win32.h" /* for realpath() equivalent */ #endif @@ -123,13 +122,19 @@ ref_stream_to_extract(struct wim_lookup_table_entry *lte, if (!lte) return 0; - if (likely(!is_linked_extraction(ctx)) || (lte->out_refcnt == 0 && - lte->extracted_file == NULL)) + /* Tally the size only for each extraction of the stream (not hard + * links). */ + if (!(dentry->d_inode->i_visited && + ctx->supported_features.hard_links) && + (!is_linked_extraction(ctx) || (lte->out_refcnt == 0 && + lte->extracted_file == NULL))) { ctx->progress.extract.total_bytes += wim_resource_size(lte); ctx->progress.extract.num_streams++; } + /* Add stream to the extraction_list only one time, even if it's going + * to be extracted to multiple locations. */ if (lte->out_refcnt == 0) { list_add_tail(<e->extraction_list, &ctx->stream_list); ctx->num_streams_remaining++; @@ -183,7 +188,9 @@ ref_stream_to_extract(struct wim_lookup_table_entry *lte, * extracted (ctx->stream_list) if not already done so, and also update the * progress information (ctx->progress) with the stream. Furthermore, if doing * a sequential extraction, build a mapping from each the stream to the dentries - * referencing it. */ + * referencing it. + * + * This uses the i_visited member of the inodes (assumed to be 0 initially). */ static int dentry_add_streams_to_extract(struct wim_dentry *dentry, void *_ctx) { @@ -195,10 +202,6 @@ dentry_add_streams_to_extract(struct wim_dentry *dentry, void *_ctx) if (dentry->extraction_skipped) return 0; - /* Don't process additional hard links. */ - if (inode->i_visited && ctx->supported_features.hard_links) - return 0; - /* The unnamed data stream will always be extracted, except in an * unlikely case. */ if (!inode_is_encrypted_directory(inode)) { @@ -333,13 +336,22 @@ extract_inode(const tchar *path, struct apply_ctx *ctx, struct wim_inode *inode) } else #endif /* !__WIN32__ */ if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) { - ret = ctx->ops->create_directory(path, ctx); + ret = ctx->ops->create_directory(path, ctx, &inode->extract_cookie); if (ret) { ERROR_WITH_ERRNO("Failed to create the directory " "\"%"TS"\"", path); } + } else if ((inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) && + ctx->ops->extract_encrypted_stream_creates_file && + ctx->supported_features.encrypted_files) { + ret = ctx->ops->extract_encrypted_stream( + path, inode_unnamed_lte_resolved(inode), ctx); + if (ret) { + ERROR_WITH_ERRNO("Failed to create and extract " + "encrypted file \"%"TS"\"", path); + } } else { - ret = ctx->ops->create_file(path, ctx); + ret = ctx->ops->create_file(path, ctx, &inode->extract_cookie); if (ret) { ERROR_WITH_ERRNO("Failed to create the file " "\"%"TS"\"", path); @@ -553,6 +565,7 @@ extract_streams(const tchar *path, struct apply_ctx *ctx, { struct wim_inode *inode = dentry->d_inode; struct wim_lookup_table_entry *lte; + file_spec_t file_spec; int ret; if (dentry->was_hardlinked) @@ -571,6 +584,11 @@ extract_streams(const tchar *path, struct apply_ctx *ctx, } #endif + if (ctx->ops->uses_cookies) + file_spec.cookie = inode->extract_cookie; + else + file_spec.path = path; + /* Unnamed data stream. */ lte = inode_unnamed_lte_resolved(inode); if (lte && (!lte_spec || lte == lte_spec)) { @@ -579,13 +597,20 @@ extract_streams(const tchar *path, struct apply_ctx *ctx, if (!(inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_REPARSE_POINT))) { - if ((inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) && - ctx->supported_features.encrypted_files) - ret = ctx->ops->extract_encrypted_stream(path, lte, ctx); - else - ret = ctx->ops->extract_unnamed_stream(path, lte, ctx); - if (ret) - goto error; + if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED && + ctx->supported_features.encrypted_files) { + if (!ctx->ops->extract_encrypted_stream_creates_file) { + ret = ctx->ops->extract_encrypted_stream( + path, lte, ctx); + if (ret) + goto error; + } + } else { + ret = ctx->ops->extract_unnamed_stream( + file_spec, lte, ctx); + if (ret) + goto error; + } update_extract_progress(ctx, lte); } else if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) @@ -617,7 +642,7 @@ extract_streams(const tchar *path, struct apply_ctx *ctx, continue; if (lte_spec) lte = lte_override; - ret = ctx->ops->extract_named_stream(path, entry->stream_name, + ret = ctx->ops->extract_named_stream(file_spec, entry->stream_name, entry->stream_name_nbytes / 2, lte, ctx); if (ret) @@ -636,16 +661,29 @@ error: * extraction mode. */ static int extract_file_attributes(const tchar *path, struct apply_ctx *ctx, - struct wim_dentry *dentry) + struct wim_dentry *dentry, unsigned pass) { int ret; - if (ctx->ops->set_file_attributes) { - if (dentry == ctx->extract_root && ctx->root_dentry_is_special) - return 0; - ret = ctx->ops->set_file_attributes(path, - dentry->d_inode->i_attributes, - ctx); + if (ctx->ops->set_file_attributes && + !(dentry == ctx->extract_root && ctx->root_dentry_is_special)) { + u32 attributes = dentry->d_inode->i_attributes; + + /* Clear unsupported attributes. */ + attributes &= ctx->supported_attributes_mask; + + if ((attributes & FILE_ATTRIBUTE_DIRECTORY && + !ctx->supported_features.encrypted_directories) || + (!(attributes & FILE_ATTRIBUTE_DIRECTORY) && + !ctx->supported_features.encrypted_files)) + { + attributes &= ~FILE_ATTRIBUTE_ENCRYPTED; + } + + if (attributes == 0) + attributes = FILE_ATTRIBUTE_NORMAL; + + ret = ctx->ops->set_file_attributes(path, attributes, ctx, pass); if (ret) { ERROR_WITH_ERRNO("Failed to set attributes on " "\"%"TS"\"", path); @@ -740,20 +778,21 @@ extract_security(const tchar *path, struct apply_ctx *ctx, desc_size = sd->sizes[inode->i_security_id]; ret = ctx->ops->set_security_descriptor(path, desc, - desc_size, ctx, - !!(ctx->extract_flags & - WIMLIB_EXTRACT_FLAG_STRICT_ACLS)); + desc_size, ctx); if (ret) { if (ctx->extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_ACLS) { ERROR_WITH_ERRNO("Failed to set security " "descriptor on \"%"TS"\"", path); return ret; } else { + #if 0 if (errno != EACCES) { WARNING_WITH_ERRNO("Failed to set " "security descriptor " "on \"%"TS"\"", path); } + #endif + ctx->no_security_descriptors++; } } } @@ -800,12 +839,15 @@ dentry_is_supported(struct wim_dentry *dentry, struct wim_inode *inode = dentry->d_inode; if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) { - if (supported_features->reparse_points) - return true; - if (supported_features->symlink_reparse_points && - inode_is_symlink(inode)) - return true; - return false; + return supported_features->reparse_points || + (inode_is_symlink(inode) && + supported_features->symlink_reparse_points); + } + if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) { + if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) + return supported_features->encrypted_directories != 0; + else + return supported_features->encrypted_files != 0; } return true; } @@ -878,6 +920,11 @@ static unsigned get_num_path_components(const tchar *path, tchar path_separator) { unsigned num_components = 0; +#ifdef __WIN32__ + /* Ignore drive letter. */ + if (path[0] != L'\0' && path[1] == L':') + path += 2; +#endif while (*path) { while (*path == path_separator) @@ -920,7 +967,11 @@ extract_multiimage_symlink(const tchar *oldpath, const tchar *newpath, num_target_path_components--; } - p_old = oldpath; + p_old = oldpath + ctx->ops->path_prefix_nchars; +#ifdef __WIN32__ + if (p_old[0] != L'\0' && p_old[1] == ':') + p_old += 2; +#endif while (*p_old == ctx->ops->path_separator) p_old++; while (--num_target_path_components) { @@ -999,13 +1050,18 @@ do_dentry_extract_skeleton(tchar path[], struct wim_dentry *dentry, /* Create empty named data streams. */ if (can_extract_named_data_streams(ctx)) { for (u16 i = 0; i < inode->i_num_ads; i++) { + file_spec_t file_spec; struct wim_ads_entry *entry = &inode->i_ads_entries[i]; if (!ads_entry_is_named_stream(entry)) continue; if (entry->lte) continue; - ret = ctx->ops->extract_named_stream(path, + if (ctx->ops->uses_cookies) + file_spec.cookie = inode->extract_cookie; + else + file_spec.path = path; + ret = ctx->ops->extract_named_stream(file_spec, entry->stream_name, entry->stream_name_nbytes / 2, entry->lte, ctx); @@ -1019,7 +1075,7 @@ do_dentry_extract_skeleton(tchar path[], struct wim_dentry *dentry, } /* Set file attributes (if supported). */ - ret = extract_file_attributes(path, ctx, dentry); + ret = extract_file_attributes(path, ctx, dentry, 0); if (ret) return ret; @@ -1062,15 +1118,68 @@ hardlink: return 0; } +/* This is a wrapper around do_dentry_extract_skeleton() that handles building + * the path, doing short name reordering. This is also idempotent; dentries + * already processed have skeleton_extracted set and no action is taken. See + * apply_operations.requires_short_name_reordering for more details about short + * name reordering. */ static int dentry_extract_skeleton(struct wim_dentry *dentry, void *_ctx) { struct apply_ctx *ctx = _ctx; tchar path[ctx->ops->path_max]; + struct wim_dentry *orig_dentry; + struct wim_dentry *other_dentry; + int ret; + + if (dentry->skeleton_extracted) + return 0; + orig_dentry = NULL; + if (ctx->supported_features.short_names + && ctx->ops->requires_short_name_reordering + && !dentry_has_short_name(dentry) + && !dentry->d_inode->i_dos_name_extracted) + { + inode_for_each_dentry(other_dentry, dentry->d_inode) { + if (dentry_has_short_name(other_dentry) + && !other_dentry->skeleton_extracted + && other_dentry->in_extraction_tree) + { + DEBUG("Creating %"TS" before %"TS" " + "to guarantee correct DOS name extraction", + dentry_full_path(other_dentry), + dentry_full_path(dentry)); + orig_dentry = dentry; + dentry = other_dentry; + break; + } + } + } +again: if (!build_extraction_path(path, dentry, ctx)) return 0; - return do_dentry_extract_skeleton(path, dentry, ctx); + ret = do_dentry_extract_skeleton(path, dentry, ctx); + if (ret) + return ret; + + dentry->skeleton_extracted = 1; + + if (orig_dentry) { + dentry = orig_dentry; + orig_dentry = NULL; + goto again; + } + dentry->d_inode->i_dos_name_extracted = 1; + return 0; +} + +static int +dentry_extract_dir_skeleton(struct wim_dentry *dentry, void *_ctx) +{ + if (dentry->d_inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) + return dentry_extract_skeleton(dentry, _ctx); + return 0; } /* Create a file or directory, then immediately extract all streams. This @@ -1083,13 +1192,13 @@ dentry_extract(struct wim_dentry *dentry, void *_ctx) tchar path[ctx->ops->path_max]; int ret; - if (!build_extraction_path(path, dentry, ctx)) - return 0; - - ret = do_dentry_extract_skeleton(path, dentry, ctx); + ret = dentry_extract_skeleton(dentry, ctx); if (ret) return ret; + if (!build_extraction_path(path, dentry, ctx)) + return 0; + return extract_streams(path, ctx, dentry, NULL, NULL); } @@ -1203,8 +1312,7 @@ extract_stream_list(struct apply_ctx *ctx) bool can_seek; int ret; - can_seek = !(lseek(ctx->wim->in_fd.fd, 0, SEEK_CUR) == (off_t)-1 && - errno == ESPIPE); + can_seek = (lseek(ctx->wim->in_fd.fd, 0, SEEK_CUR) != -1); list_for_each_entry(lte, &ctx->stream_list, extraction_list) { ret = extract_stream_instances(lte, ctx, can_seek); if (ret) @@ -1213,35 +1321,44 @@ extract_stream_list(struct apply_ctx *ctx) return 0; } +#define PWM_ALLOW_WIM_HDR 0x00001 +#define PWM_SILENT_EOF 0x00002 + /* Read the header from a stream in a pipable WIM. */ static int read_pwm_stream_header(WIMStruct *pwm, struct wim_lookup_table_entry *lte, - bool allow_header) + int flags, struct wim_header_disk *hdr_ret) { - struct pwm_stream_hdr stream_hdr; + union { + struct pwm_stream_hdr stream_hdr; + struct wim_header_disk pwm_hdr; + } buf; int ret; - ret = full_read(&pwm->in_fd, &stream_hdr, sizeof(stream_hdr)); + ret = full_read(&pwm->in_fd, &buf.stream_hdr, sizeof(buf.stream_hdr)); if (ret) goto read_error; - if (allow_header && stream_hdr.magic == PWM_MAGIC) { - u8 buf[WIM_HEADER_DISK_SIZE - sizeof(stream_hdr)]; - ret = full_read(&pwm->in_fd, buf, sizeof(buf)); + if ((flags & PWM_ALLOW_WIM_HDR) && buf.stream_hdr.magic == PWM_MAGIC) { + BUILD_BUG_ON(sizeof(buf.pwm_hdr) < sizeof(buf.stream_hdr)); + ret = full_read(&pwm->in_fd, &buf.stream_hdr + 1, + sizeof(buf.pwm_hdr) - sizeof(buf.stream_hdr)); + if (ret) goto read_error; lte->resource_location = RESOURCE_NONEXISTENT; + memcpy(hdr_ret, &buf.pwm_hdr, sizeof(buf.pwm_hdr)); return 0; } - if (stream_hdr.magic != PWM_STREAM_MAGIC) { + if (buf.stream_hdr.magic != PWM_STREAM_MAGIC) { ERROR("Data read on pipe is invalid (expected stream header)."); return WIMLIB_ERR_INVALID_PIPABLE_WIM; } - lte->resource_entry.original_size = le64_to_cpu(stream_hdr.uncompressed_size); - copy_hash(lte->hash, stream_hdr.hash); - lte->resource_entry.flags = le32_to_cpu(stream_hdr.flags); + lte->resource_entry.original_size = le64_to_cpu(buf.stream_hdr.uncompressed_size); + copy_hash(lte->hash, buf.stream_hdr.hash); + lte->resource_entry.flags = le32_to_cpu(buf.stream_hdr.flags); lte->resource_entry.offset = pwm->in_fd.offset; lte->resource_location = RESOURCE_IN_WIM; lte->wim = pwm; @@ -1256,7 +1373,8 @@ read_pwm_stream_header(WIMStruct *pwm, struct wim_lookup_table_entry *lte, return 0; read_error: - ERROR_WITH_ERRNO("Error reading pipable WIM from pipe"); + if (ret != WIMLIB_ERR_UNEXPECTED_END_OF_FILE || !(flags & PWM_SILENT_EOF)) + ERROR_WITH_ERRNO("Error reading pipable WIM from pipe"); return ret; } @@ -1276,7 +1394,9 @@ extract_streams_from_pipe(struct apply_ctx *ctx) struct wim_lookup_table_entry *found_lte; struct wim_lookup_table_entry *needed_lte; struct wim_lookup_table *lookup_table; + struct wim_header_disk pwm_hdr; int ret; + int pwm_flags; ret = WIMLIB_ERR_NOMEM; found_lte = new_lookup_table_entry(); @@ -1284,15 +1404,30 @@ extract_streams_from_pipe(struct apply_ctx *ctx) goto out; lookup_table = ctx->wim->lookup_table; - + pwm_flags = PWM_ALLOW_WIM_HDR; + if ((ctx->extract_flags & WIMLIB_EXTRACT_FLAG_RESUME)) + pwm_flags |= PWM_SILENT_EOF; + memcpy(ctx->progress.extract.guid, ctx->wim->hdr.guid, WIM_GID_LEN); + ctx->progress.extract.part_number = ctx->wim->hdr.part_number; + ctx->progress.extract.total_parts = ctx->wim->hdr.total_parts; + if (ctx->progress_func) + ctx->progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_SPWM_PART_BEGIN, + &ctx->progress); while (ctx->num_streams_remaining) { - ret = read_pwm_stream_header(ctx->wim, found_lte, true); - if (ret) + ret = read_pwm_stream_header(ctx->wim, found_lte, pwm_flags, + &pwm_hdr); + if (ret) { + if (ret == WIMLIB_ERR_UNEXPECTED_END_OF_FILE && + (ctx->extract_flags & WIMLIB_EXTRACT_FLAG_RESUME)) + { + goto resume_done; + } goto out_free_found_lte; + } if ((found_lte->resource_location != RESOURCE_NONEXISTENT) && !(found_lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA) - && (needed_lte = __lookup_resource(lookup_table, found_lte->hash)) + && (needed_lte = lookup_resource(lookup_table, found_lte->hash)) && (needed_lte->out_refcnt)) { copy_resource_entry(&needed_lte->resource_entry, @@ -1310,6 +1445,26 @@ extract_streams_from_pipe(struct apply_ctx *ctx) ret = skip_pwm_stream(found_lte); if (ret) goto out_free_found_lte; + } else { + u16 part_number = le16_to_cpu(pwm_hdr.part_number); + u16 total_parts = le16_to_cpu(pwm_hdr.total_parts); + + if (part_number != ctx->progress.extract.part_number || + total_parts != ctx->progress.extract.total_parts || + memcmp(pwm_hdr.guid, ctx->progress.extract.guid, + WIM_GID_LEN)) + { + ctx->progress.extract.part_number = part_number; + ctx->progress.extract.total_parts = total_parts; + memcpy(ctx->progress.extract.guid, + pwm_hdr.guid, WIM_GID_LEN); + if (ctx->progress_func) { + ctx->progress_func( + WIMLIB_PROGRESS_MSG_EXTRACT_SPWM_PART_BEGIN, + &ctx->progress); + } + + } } } ret = 0; @@ -1317,6 +1472,10 @@ out_free_found_lte: free_lookup_table_entry(found_lte); out: return ret; + +resume_done: + /* TODO */ + return 0; } /* Finish extracting a file, directory, or symbolic link by setting file @@ -1335,43 +1494,14 @@ dentry_extract_final(struct wim_dentry *dentry, void *_ctx) if (ret) return ret; - return extract_timestamps(path, ctx, dentry); -} - -/* Sorts a list of streams in ascending order of their offset in the WIM file in - * order to prepare for sequential extraction. */ -static int -sort_stream_list_by_wim_position(struct list_head *stream_list) -{ - struct list_head *cur; - size_t num_streams; - struct wim_lookup_table_entry **array; - size_t i; - size_t array_size; - - num_streams = 0; - list_for_each(cur, stream_list) - num_streams++; - array_size = num_streams * sizeof(array[0]); - array = MALLOC(array_size); - if (!array) { - ERROR("Failed to allocate %zu bytes to sort stream entries", - array_size); - return WIMLIB_ERR_NOMEM; - } - cur = stream_list->next; - for (i = 0; i < num_streams; i++) { - array[i] = container_of(cur, struct wim_lookup_table_entry, extraction_list); - cur = cur->next; + if (ctx->ops->requires_final_set_attributes_pass) { + /* Set file attributes (if supported). */ + ret = extract_file_attributes(path, ctx, dentry, 1); + if (ret) + return ret; } - qsort(array, num_streams, sizeof(array[0]), cmp_streams_by_wim_position); - - INIT_LIST_HEAD(stream_list); - for (i = 0; i < num_streams; i++) - list_add_tail(&array[i]->extraction_list, stream_list); - FREE(array); - return 0; + return extract_timestamps(path, ctx, dentry); } /* @@ -1494,6 +1624,8 @@ dentry_calculate_extraction_path(struct wim_dentry *dentry, void *_args) struct apply_ctx *ctx = _args; int ret; + dentry->in_extraction_tree = 1; + if (dentry == ctx->extract_root || dentry->extraction_skipped) return 0; @@ -1613,11 +1745,14 @@ dentry_reset_needs_extraction(struct wim_dentry *dentry, void *_ignore) { struct wim_inode *inode = dentry->d_inode; + dentry->in_extraction_tree = 0; dentry->extraction_skipped = 0; dentry->was_hardlinked = 0; + dentry->skeleton_extracted = 0; inode->i_visited = 0; FREE(inode->i_extracted_file); inode->i_extracted_file = NULL; + inode->i_dos_name_extracted = 0; if ((void*)dentry->extraction_name != (void*)dentry->file_name) FREE(dentry->extraction_name); dentry->extraction_name = NULL; @@ -1639,8 +1774,12 @@ dentry_tally_features(struct wim_dentry *dentry, void *_features) features->system_files++; if (inode->i_attributes & FILE_ATTRIBUTE_COMPRESSED) features->compressed_files++; - if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) - features->encrypted_files++; + if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED) { + if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) + features->encrypted_directories++; + else + features->encrypted_files++; + } if (inode->i_attributes & FILE_ATTRIBUTE_NOT_CONTENT_INDEXED) features->not_context_indexed_files++; if (inode->i_attributes & FILE_ATTRIBUTE_SPARSE_FILE) @@ -1666,96 +1805,142 @@ dentry_tally_features(struct wim_dentry *dentry, void *_features) return 0; } -static int -dentry_clear_inode_visited(struct wim_dentry *dentry, void *_ignore) -{ - dentry->d_inode->i_visited = 0; - return 0; -} - /* Tally the features necessary to extract a dentry tree. */ static void dentry_tree_get_features(struct wim_dentry *root, struct wim_features *features) { memset(features, 0, sizeof(struct wim_features)); for_dentry_in_tree(root, dentry_tally_features, features); - for_dentry_in_tree(root, dentry_clear_inode_visited, NULL); + dentry_tree_clear_inode_visited(root); +} + +static u32 +compute_supported_attributes_mask(const struct wim_features *supported_features) +{ + u32 mask = ~(u32)0; + + if (!supported_features->archive_files) + mask &= ~FILE_ATTRIBUTE_ARCHIVE; + + if (!supported_features->hidden_files) + mask &= ~FILE_ATTRIBUTE_HIDDEN; + + if (!supported_features->system_files) + mask &= ~FILE_ATTRIBUTE_SYSTEM; + + if (!supported_features->not_context_indexed_files) + mask &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + + if (!supported_features->compressed_files) + mask &= ~FILE_ATTRIBUTE_COMPRESSED; + + if (!supported_features->sparse_files) + mask &= ~FILE_ATTRIBUTE_SPARSE_FILE; + + if (!supported_features->reparse_points) + mask &= ~FILE_ATTRIBUTE_REPARSE_POINT; + + return mask; } static int do_feature_check(const struct wim_features *required_features, const struct wim_features *supported_features, int extract_flags, - const struct apply_operations *ops) + const struct apply_operations *ops, + const tchar *wim_source_path) { + const tchar *loc; + const tchar *mode = T("this extraction mode"); + + if (wim_source_path[0] == '\0') + loc = T("the WIM image"); + else + loc = wim_source_path; + + /* We're an archive program, so theoretically we can do what we want + * with FILE_ATTRIBUTE_ARCHIVE (which is a dumb flag anyway). Don't + * bother the user about it. */ +#if 0 if (required_features->archive_files && !supported_features->archive_files) { WARNING( - "%lu files are marked as archived, but this attribute\n" -" is not supported in this extraction mode or volume.", - required_features->archive_files); + "%lu files in %"TS" are marked as archived, but this attribute\n" +" is not supported in %"TS".", + required_features->archive_files, loc, mode); } +#endif if (required_features->hidden_files && !supported_features->hidden_files) { WARNING( - "%lu files are marked as hidden, but this attribute\n" -" is not supported in this extraction mode or volume.", - required_features->hidden_files); + "%lu files in %"TS" are marked as hidden, but this\n" +" attribute is not supported in %"TS".", + required_features->hidden_files, loc, mode); } if (required_features->system_files && !supported_features->system_files) { WARNING( - "%lu files are marked as system files, but this attribute\n" -" is not supported in this extraction mode or volume.", - required_features->system_files); + "%lu files in %"TS" are marked as system files,\n" +" but this attribute is not supported in %"TS".", + required_features->system_files, loc, mode); } if (required_features->compressed_files && !supported_features->compressed_files) { WARNING( - "%lu files are marked as being transparently compressed, but\n" -" transparent compression is not supported in this extraction\n" -" mode or volume. These files will be extracted as uncompressed.", - required_features->compressed_files); + "%lu files in %"TS" are marked as being transparently\n" +" compressed, but transparent compression is not supported in\n" +" %"TS". These files will be extracted as uncompressed.", + required_features->compressed_files, loc, mode); } if (required_features->encrypted_files && !supported_features->encrypted_files) { WARNING( - "%lu files are marked as being encrypted, but encryption is not\n" -" supported in this extraction mode or volume. These files will be\n" -" extracted as raw encrypted data instead.", - required_features->encrypted_files); + "%lu files in %"TS" are marked as being encrypted,\n" +" but encryption is not supported in %"TS". These files\n" +" will not be extracted.", + required_features->encrypted_files, loc, mode); + } + + if (required_features->encrypted_directories && + !supported_features->encrypted_directories) + { + WARNING( + "%lu directories in %"TS" are marked as being encrypted,\n" +" but encryption is not supported in %"TS".\n" +" These directories will be extracted as unencrypted.", + required_features->encrypted_directories, loc, mode); } if (required_features->not_context_indexed_files && !supported_features->not_context_indexed_files) { WARNING( - "%lu files are marked as not content indexed, but this attribute\n" -" is not supported in this extraction mode or volume.", - required_features->not_context_indexed_files); + "%lu files in %"TS" are marked as not content indexed,\n" +" but this attribute is not supported in %"TS".", + required_features->not_context_indexed_files, loc, mode); } if (required_features->sparse_files && !supported_features->sparse_files) { WARNING( - "%lu files are marked as sparse, but creating sparse files is not\n" -" supported in this extraction mode or volume. These files will be\n" -" extracted as non-sparse.", - required_features->not_context_indexed_files); + "%lu files in %"TS" are marked as sparse, but creating\n" +" sparse files is not supported in %"TS". These files\n" +" will be extracted as non-sparse.", + required_features->sparse_files, loc, mode); } if (required_features->named_data_streams && !supported_features->named_data_streams) { WARNING( - "%lu files contain one or more alternate (named) data streams,\n" -" which are not supported in this extraction mode or volume.\n" + "%lu files in %"TS" contain one or more alternate (named)\n" +" data streams, which are not supported in %"TS".\n" " Alternate data streams will NOT be extracted.", - required_features->named_data_streams); + required_features->named_data_streams, loc, mode); } if (unlikely(extract_flags & (WIMLIB_EXTRACT_FLAG_HARDLINK | @@ -1764,19 +1949,19 @@ do_feature_check(const struct wim_features *required_features, supported_features->named_data_streams) { WARNING( - "%lu files contain one or more alternate (named) data streams,\n" -" which are not supported in linked extraction mode.\n" + "%lu files in %"TS" contain one or more alternate (named)\n" +" data streams, which are not supported in linked extraction mode.\n" " Alternate data streams will NOT be extracted.", - required_features->named_data_streams); + required_features->named_data_streams, loc); } if (required_features->hard_links && !supported_features->hard_links) { WARNING( - "%lu files are hard links, but hard links are not supported in\n" -" this extraction mode or volume. Hard links will be extracted as\n" + "%lu files in %"TS" are hard links, but hard links are\n" +" not supported in %"TS". Hard links will be extracted as\n" " duplicate copies of the linked files.", - required_features->hard_links); + required_features->hard_links, loc, mode); } if (required_features->reparse_points && !supported_features->reparse_points) @@ -1784,16 +1969,17 @@ do_feature_check(const struct wim_features *required_features, if (supported_features->symlink_reparse_points) { if (required_features->other_reparse_points) { WARNING( - "%lu files are reparse points that are neither symbolic links\n" -" nor junction points and are not supported in this extraction mode\n" -" or volume. These reparse points will not be extracted.", - required_features->other_reparse_points); + "%lu files in %"TS" are reparse points that are neither\n" +" symbolic links nor junction points and are not supported in\n" +" %"TS". These reparse points will not be extracted.", + required_features->other_reparse_points, loc, + mode); } } else { WARNING( - "%lu files are reparse points, which are not supported in this\n" -" extraction mode or volume and will not be extracted.", - required_features->reparse_points); + "%lu files in %"TS" are reparse points, which are\n" +" not supported in %"TS" and will not be extracted.", + required_features->reparse_points, loc, mode); } } @@ -1801,40 +1987,37 @@ do_feature_check(const struct wim_features *required_features, !supported_features->security_descriptors) { WARNING( - "%lu files have Windows NT security descriptors, but extracting\n" -" security descriptors is not supported in this extraction mode\n" -" or volume. No security descriptors will be extracted.", - required_features->security_descriptors); + "%lu files in %"TS" have Windows NT security descriptors,\n" +" but extracting security descriptors is not supported in\n" +" %"TS". No security descriptors will be extracted.", + required_features->security_descriptors, loc, mode); } if (required_features->short_names && !supported_features->short_names) { WARNING( - "%lu files have short (DOS) names, but extracting short names\n" -" is not supported in this extraction mode or volume. Short names\n" -" will not be extracted.\n", - required_features->short_names); + "%lu files in %"TS" have short (DOS) names, but\n" +" extracting short names is not supported in %"TS".\n" +" Short names will not be extracted.\n", + required_features->short_names, loc, mode); } if ((extract_flags & WIMLIB_EXTRACT_FLAG_UNIX_DATA) && required_features->unix_data && !supported_features->unix_data) { - ERROR("UNIX data not supported in this extraction mode " - "or volume", ops->name); + ERROR("Extracting UNIX data is not supported in %"TS, mode); return WIMLIB_ERR_UNSUPPORTED; } if ((extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_SHORT_NAMES) && required_features->short_names && !supported_features->short_names) { - ERROR("Short names are not supported in this extraction " - "mode or volume", ops->name); + ERROR("Extracting short names is not supported in %"TS"", mode); return WIMLIB_ERR_UNSUPPORTED; } if ((extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_TIMESTAMPS) && !ops->set_timestamps) { - ERROR("Timestamps are not supported in this extraction " - "mode or volume", ops->name); + ERROR("Extracting timestamps is not supported in %"TS"", mode); return WIMLIB_ERR_UNSUPPORTED; } if (((extract_flags & (WIMLIB_EXTRACT_FLAG_STRICT_ACLS | @@ -1843,8 +2026,7 @@ do_feature_check(const struct wim_features *required_features, required_features->security_descriptors && !supported_features->security_descriptors) { - ERROR("Security descriptors not supported in this extraction " - "mode or volume."); + ERROR("Extracting security descriptors is not supported in %"TS, mode); return WIMLIB_ERR_UNSUPPORTED; } @@ -1852,7 +2034,16 @@ do_feature_check(const struct wim_features *required_features, !supported_features->hard_links) { ERROR("Hard link extraction mode requested, but " - "extraction mode or volume does not support hard links!"); + "%"TS" does not support hard links!", mode); + return WIMLIB_ERR_UNSUPPORTED; + } + + if ((extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_SYMLINKS) && + required_features->symlink_reparse_points && + !(supported_features->symlink_reparse_points || + supported_features->reparse_points)) + { + ERROR("Extracting symbolic links is not supported in %"TS, mode); return WIMLIB_ERR_UNSUPPORTED; } @@ -1860,13 +2051,38 @@ do_feature_check(const struct wim_features *required_features, !supported_features->symlink_reparse_points) { ERROR("Symbolic link extraction mode requested, but " - "extraction mode or volume does not support symbolic " - "links!"); + "%"TS" does not support symbolic " + "links!", mode); return WIMLIB_ERR_UNSUPPORTED; } return 0; } +static void +do_extract_warnings(struct apply_ctx *ctx) +{ + if (ctx->partial_security_descriptors == 0 && + ctx->no_security_descriptors == 0) + return; + + WARNING("Extraction to \"%"TS"\" complete, but with one or more warnings:", + ctx->target); + if (ctx->partial_security_descriptors != 0) { + WARNING("- Could only partially set the security descriptor\n" + " on %lu files or directories.", + ctx->partial_security_descriptors); + } + if (ctx->no_security_descriptors != 0) { + WARNING("- Could not set security descriptor at all\n" + " on %lu files or directories.", + ctx->no_security_descriptors); + } +#ifdef __WIN32__ + WARNING("To fully restore all security descriptors, run the program\n" + " with Administrator rights."); +#endif +} + /* * extract_tree - Extract a file or directory tree from the currently selected * WIM image. @@ -1975,10 +2191,13 @@ extract_tree(WIMStruct *wim, const tchar *wim_source_path, const tchar *target, dentry_tree_get_features(root, &required_features); ret = do_feature_check(&required_features, &ctx.supported_features, - extract_flags, ctx.ops); + extract_flags, ctx.ops, wim_source_path); if (ret) goto out_finish_or_abort_extract; + ctx.supported_attributes_mask = + compute_supported_attributes_mask(&ctx.supported_features); + /* Figure out whether the root dentry is being extracted to the root of * a volume and therefore needs to be treated "specially", for example * not being explicitly created and not having attributes set. */ @@ -2012,18 +2231,24 @@ extract_tree(WIMStruct *wim, const tchar *wim_source_path, const tchar *target, * However, we can get a reasonably accurate estimate by taking * from the corresponding in the WIM XML * data. This does assume that a full image is being extracted, - * but currently there is no API for doing otherwise. */ + * but currently there is no API for doing otherwise. (Also, + * subtract from this if hard links are + * supported by the extraction mode.) */ ctx.progress.extract.total_bytes = wim_info_get_image_total_bytes(wim->wim_info, wim->current_image); + if (ctx.supported_features.hard_links) { + ctx.progress.extract.total_bytes -= + wim_info_get_image_hard_link_bytes(wim->wim_info, + wim->current_image); + } } /* Handle the special case of extracting a file to standard * output. In that case, "root" should be a single file, not a * directory tree. (If not, extract_dentry_to_stdout() will * return an error.) */ - if (extract_flags & WIMLIB_EXTRACT_FLAG_TO_STDOUT && - !(extract_flags & WIMLIB_EXTRACT_FLAG_FROM_PIPE)) { + if (extract_flags & WIMLIB_EXTRACT_FLAG_TO_STDOUT) { ret = extract_dentry_to_stdout(root); goto out_teardown_stream_list; } @@ -2035,7 +2260,10 @@ extract_tree(WIMStruct *wim, const tchar *wim_source_path, const tchar *target, WIMLIB_EXTRACT_FLAG_FROM_PIPE)) == WIMLIB_EXTRACT_FLAG_SEQUENTIAL) { - ret = sort_stream_list_by_wim_position(&ctx.stream_list); + ret = sort_stream_list_by_sequential_order( + &ctx.stream_list, + offsetof(struct wim_lookup_table_entry, + extraction_list)); if (ret) goto out_teardown_stream_list; } @@ -2089,6 +2317,13 @@ extract_tree(WIMStruct *wim, const tchar *wim_source_path, const tchar *target, ctx.realtarget_nchars = tstrlen(ctx.realtarget); } + if (ctx.ops->requires_short_name_reordering) { + ret = for_dentry_in_tree(root, dentry_extract_dir_skeleton, + &ctx); + if (ret) + goto out_free_realtarget; + } + /* Finally, the important part: extract the tree of files. */ if (extract_flags & (WIMLIB_EXTRACT_FLAG_SEQUENTIAL | WIMLIB_EXTRACT_FLAG_FROM_PIPE)) { @@ -2097,9 +2332,12 @@ extract_tree(WIMStruct *wim, const tchar *wim_source_path, const tchar *target, if (progress_func) progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_BEGIN, &ctx.progress); - ret = for_dentry_in_tree(root, dentry_extract_skeleton, &ctx); - if (ret) - goto out_free_realtarget; + + if (!(extract_flags & WIMLIB_EXTRACT_FLAG_RESUME)) { + ret = for_dentry_in_tree(root, dentry_extract_skeleton, &ctx); + if (ret) + goto out_free_realtarget; + } if (progress_func) progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_END, &ctx.progress); @@ -2158,6 +2396,8 @@ extract_tree(WIMStruct *wim, const tchar *wim_source_path, const tchar *target, &ctx.progress); } + do_extract_warnings(&ctx); + ret = 0; out_free_realtarget: FREE(ctx.realtarget); @@ -2214,6 +2454,11 @@ check_extract_command(struct wimlib_extract_command *cmd, int wim_header_flags) WIMLIB_EXTRACT_FLAG_NORPFIX)) return WIMLIB_ERR_INVALID_PARAM; + if ((extract_flags & + (WIMLIB_EXTRACT_FLAG_RESUME | + WIMLIB_EXTRACT_FLAG_FROM_PIPE)) == WIMLIB_EXTRACT_FLAG_RESUME) + return WIMLIB_ERR_INVALID_PARAM; + if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { #ifndef WITH_NTFS_3G ERROR("wimlib was compiled without support for NTFS-3g, so\n" @@ -2276,8 +2521,7 @@ do_wimlib_extract_files(WIMStruct *wim, return ret; /* Make sure there are no streams in the WIM that have not been - * checksummed yet. Needed at least because 'unhashed_list' aliases - * 'extraction_list' in `struct wim_lookup_table_entry'. */ + * checksummed yet. */ ret = wim_checksum_unhashed_streams(wim); if (ret) return ret; @@ -2320,8 +2564,6 @@ wimlib_extract_files(WIMStruct *wim, const struct wimlib_extract_command *cmds, size_t num_cmds, int default_extract_flags, - WIMStruct **additional_swms, - unsigned num_additional_swms, wimlib_progress_func_t progress_func) { int ret; @@ -2330,21 +2572,12 @@ wimlib_extract_files(WIMStruct *wim, default_extract_flags &= WIMLIB_EXTRACT_MASK_PUBLIC; - ret = verify_swm_set(wim, additional_swms, num_additional_swms); - if (ret) - goto out; - if (num_cmds == 0) - goto out; - - if (num_additional_swms) - merge_lookup_tables(wim, additional_swms, num_additional_swms); + return 0; cmds_copy = CALLOC(num_cmds, sizeof(cmds[0])); - if (!cmds_copy) { - ret = WIMLIB_ERR_NOMEM; - goto out_restore_lookup_table; - } + if (!cmds_copy) + return WIMLIB_ERR_NOMEM; for (size_t i = 0; i < num_cmds; i++) { cmds_copy[i].extract_flags = (default_extract_flags | @@ -2381,10 +2614,6 @@ out_free_cmds_copy: FREE(cmds_copy[i].fs_dest_path); } FREE(cmds_copy); -out_restore_lookup_table: - if (num_additional_swms) - unmerge_lookup_table(wim); -out: return ret; } @@ -2461,12 +2690,10 @@ extract_all_images(WIMStruct *wim, extract_flags |= WIMLIB_EXTRACT_FLAG_MULTI_IMAGE; -#ifdef WITH_NTFS_3G if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { ERROR("Cannot extract multiple images in NTFS extraction mode."); return WIMLIB_ERR_INVALID_PARAM; } -#endif if (tstat(target, &stbuf)) { if (errno == ENOENT) { @@ -2507,24 +2734,10 @@ do_wimlib_extract_image(WIMStruct *wim, int image, const tchar *target, int extract_flags, - WIMStruct **additional_swms, - unsigned num_additional_swms, wimlib_progress_func_t progress_func) { int ret; - if (extract_flags & WIMLIB_EXTRACT_FLAG_FROM_PIPE) { - wimlib_assert(wim->hdr.part_number == 1); - wimlib_assert(num_additional_swms == 0); - } else { - ret = verify_swm_set(wim, additional_swms, num_additional_swms); - if (ret) - return ret; - - if (num_additional_swms) - merge_lookup_tables(wim, additional_swms, num_additional_swms); - } - if (image == WIMLIB_ALL_IMAGES) { ret = extract_all_images(wim, target, extract_flags, progress_func); @@ -2540,8 +2753,6 @@ do_wimlib_extract_image(WIMStruct *wim, lte_free_extracted_file, NULL); } - if (num_additional_swms) - unmerge_lookup_table(wim); return ret; } @@ -2569,8 +2780,7 @@ wimlib_extract_image_from_pipe(int pipe_fd, const tchar *image_num_or_name, * wimlib_open_wim(), getting a WIMStruct in this way will result in * an empty lookup table, no XML data read, and no filename set. */ ret = open_wim_as_WIMStruct(&pipe_fd, - WIMLIB_OPEN_FLAG_FROM_PIPE | - WIMLIB_OPEN_FLAG_SPLIT_OK, + WIMLIB_OPEN_FLAG_FROM_PIPE, &pwm, progress_func); if (ret) return ret; @@ -2602,7 +2812,7 @@ wimlib_extract_image_from_pipe(int pipe_fd, const tchar *image_num_or_name, * WIMs.) */ { struct wim_lookup_table_entry xml_lte; - ret = read_pwm_stream_header(pwm, &xml_lte, false); + ret = read_pwm_stream_header(pwm, &xml_lte, 0, NULL); if (ret) goto out_wimlib_free; @@ -2629,16 +2839,26 @@ wimlib_extract_image_from_pipe(int pipe_fd, const tchar *image_num_or_name, /* Get image index (this may use the XML data that was just read to * resolve an image name). */ - image = wimlib_resolve_image(pwm, image_num_or_name); - if (image == WIMLIB_NO_IMAGE) { - ERROR("\"%"TS"\" is not a valid image in the pipable WIM!", - image_num_or_name); - ret = WIMLIB_ERR_INVALID_IMAGE; - goto out_wimlib_free; - } else if (image == WIMLIB_ALL_IMAGES) { - ERROR("Applying all images from a pipe is not supported."); - ret = WIMLIB_ERR_INVALID_IMAGE; - goto out_wimlib_free; + if (image_num_or_name) { + image = wimlib_resolve_image(pwm, image_num_or_name); + if (image == WIMLIB_NO_IMAGE) { + ERROR("\"%"TS"\" is not a valid image in the pipable WIM!", + image_num_or_name); + ret = WIMLIB_ERR_INVALID_IMAGE; + goto out_wimlib_free; + } else if (image == WIMLIB_ALL_IMAGES) { + ERROR("Applying all images from a pipe is not supported."); + ret = WIMLIB_ERR_INVALID_IMAGE; + goto out_wimlib_free; + } + } else { + if (pwm->hdr.image_count != 1) { + ERROR("No image was specified, but the pipable WIM " + "did not contain exactly 1 image"); + ret = WIMLIB_ERR_INVALID_IMAGE; + goto out_wimlib_free; + } + image = 1; } /* Load the needed metadata resource. */ @@ -2652,7 +2872,7 @@ wimlib_extract_image_from_pipe(int pipe_fd, const tchar *image_num_or_name, goto out_wimlib_free; } - ret = read_pwm_stream_header(pwm, metadata_lte, false); + ret = read_pwm_stream_header(pwm, metadata_lte, 0, NULL); imd = pwm->image_metadata[i - 1]; imd->metadata_lte = metadata_lte; if (ret) @@ -2685,7 +2905,7 @@ wimlib_extract_image_from_pipe(int pipe_fd, const tchar *image_num_or_name, /* Extract the image. */ extract_flags |= WIMLIB_EXTRACT_FLAG_FROM_PIPE; ret = do_wimlib_extract_image(pwm, image, target, - extract_flags, NULL, 0, progress_func); + extract_flags, progress_func); /* Clean up and return. */ out_wimlib_free: wimlib_free(pwm); @@ -2698,12 +2918,9 @@ wimlib_extract_image(WIMStruct *wim, int image, const tchar *target, int extract_flags, - WIMStruct **additional_swms, - unsigned num_additional_swms, wimlib_progress_func_t progress_func) { extract_flags &= WIMLIB_EXTRACT_MASK_PUBLIC; return do_wimlib_extract_image(wim, image, target, extract_flags, - additional_swms, num_additional_swms, progress_func); }