{
struct apply_ctx *ctx = _ctx;
tchar path[ctx->ops->path_max];
+ struct wim_dentry *orig_dentry;
+ struct wim_dentry *other_dentry;
+ int ret;
+ /* Here we may re-order the extraction of multiple names (hard links)
+ * for the same file in the same directory in order to ensure the short
+ * (DOS) name is set correctly. A short name is always associated with
+ * exactly one long name, and at least on NTFS, only one long name for a
+ * file can have a short name associated with it. (More specifically,
+ * there can be unlimited names in the POSIX namespace, but only one
+ * name can be in the Win32+DOS namespace, or one name in the Win32
+ * namespace with a corresponding name in the DOS namespace.) To ensure
+ * the short name of a file is associated with the correct long name in
+ * a directory, we extract the long name with a corresponding short name
+ * before any additional names. This can affect NTFS-3g extraction
+ * (which uses ntfs_set_ntfs_dos_name(), which doesn't allow specifying
+ * the long name to associate with a short name) and may affect Win32
+ * extraction as well (which uses SetFileShortName()). */
+
+ if (dentry->skeleton_extracted)
+ return 0;
+ orig_dentry = NULL;
+ if (ctx->supported_features.short_names
+ && !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->parent == dentry->parent)
+ {
+ 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;
}
/* Create a file or directory, then immediately extract all streams. This
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);
}
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)
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 pwm_stream_hdr stream_hdr;
int ret;
if (ret)
goto read_error;
- if (allow_header && stream_hdr.magic == PWM_MAGIC) {
+ if ((flags & PWM_ALLOW_WIM_HDR) && stream_hdr.magic == PWM_MAGIC) {
u8 buf[WIM_HEADER_DISK_SIZE - sizeof(stream_hdr)];
ret = full_read(&pwm->in_fd, buf, sizeof(buf));
if (ret)
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;
}
struct wim_lookup_table_entry *needed_lte;
struct wim_lookup_table *lookup_table;
int ret;
+ int pwm_flags;
ret = WIMLIB_ERR_NOMEM;
found_lte = new_lookup_table_entry();
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;
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);
+ 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)
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
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;
- }
-
- 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;
-}
-
/*
* Extract a WIM dentry to standard output.
*
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;
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 = "this extraction mode";
+
+ if (wim_source_path[0] == '\0')
+ loc = "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 be extracted as raw encrypted data instead.",
+ required_features->encrypted_files, 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 |
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)
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);
}
}
!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 |
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;
}
!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;
}
!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;
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;
* 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;
}
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;
}
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);
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"
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;
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) {
* 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);
if (ret)
goto out_wimlib_free;
/* 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. */
goto out_wimlib_free;
}
- ret = read_pwm_stream_header(pwm, metadata_lte, false);
+ ret = read_pwm_stream_header(pwm, metadata_lte, 0);
imd = pwm->image_metadata[i - 1];
imd->metadata_lte = metadata_lte;
if (ret)
git://wimlib.net / wimlib / blobdiff