const char *p2;
size_t i;
- num_path_components =
- get_num_path_components(dentry->full_path) - 1;
- num_output_dir_path_components =
- get_num_path_components(args->target);
+ num_path_components = get_num_path_components(dentry->_full_path) - 1;
+ num_output_dir_path_components = get_num_path_components(args->target);
if (args->extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE) {
num_path_components++;
}
ret = extract_wim_resource_to_fd(lte, out_fd, wim_resource_size(lte));
- if (ret != 0) {
+ if (ret) {
ERROR("Failed to extract resource to `%s'", output_path);
goto out;
}
if (ret <= 0) {
ERROR("Could not read the symbolic link from dentry `%s'",
- dentry->full_path);
+ dentry->_full_path);
return WIMLIB_ERR_INVALID_DENTRY;
}
ret = symlink(target, output_path);
output_path = alloca(len * sizeof(tchar) + dentry->full_path_nbytes +
sizeof(tchar));
memcpy(output_path, args->target, len * sizeof(tchar));
- memcpy(output_path + len, dentry->full_path, dentry->full_path_nbytes);
+ memcpy(output_path + len, dentry->_full_path, dentry->full_path_nbytes);
len += dentry->full_path_nbytes / sizeof(tchar);
output_path[len] = T('\0');
}
output_path = alloca(len * sizeof(tchar) + dentry->full_path_nbytes +
sizeof(tchar));
memcpy(output_path, args->target, len * sizeof(tchar));
- memcpy(output_path + len, dentry->full_path, dentry->full_path_nbytes);
+ memcpy(output_path + len, dentry->_full_path, dentry->full_path_nbytes);
len += dentry->full_path_nbytes / sizeof(tchar);
output_path[len] = T('\0');
}
if ((args->extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) &&
args->progress_func) {
- args->progress.extract.cur_path = dentry->full_path;
+ args->progress.extract.cur_path = dentry->_full_path;
args->progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY,
&args->progress);
}
u64 num_streams = 0;
/* For each stream to be extracted... */
- list_for_each_entry(lte, stream_list, staging_list) {
+ list_for_each_entry(lte, stream_list, extraction_list) {
if (extract_flags &
(WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK))
{
{
if (++lte->out_refcnt == 1) {
INIT_LIST_HEAD(<e->inode_list);
- list_add_tail(<e->staging_list, stream_list);
+ list_add_tail(<e->extraction_list, stream_list);
}
}
}
static void
-find_streams_for_extraction(struct hlist_head *inode_list,
+find_streams_for_extraction(struct wim_image_metadata *imd,
struct list_head *stream_list,
struct wim_lookup_table *lookup_table,
int extract_flags)
{
struct wim_inode *inode;
- struct hlist_node *cur;
struct wim_dentry *dentry;
for_lookup_table_entry(lookup_table, lte_zero_out_refcnt, NULL);
INIT_LIST_HEAD(stream_list);
- hlist_for_each_entry(inode, cur, inode_list, i_hlist) {
+ image_for_each_inode(inode, imd) {
if (!inode->i_resolved)
inode_resolve_ltes(inode, lookup_table);
inode_for_each_dentry(dentry, inode)
* sequential reading of the WIM can be implemented. */
/* For each distinct stream to be extracted */
- list_for_each_entry(lte, stream_list, staging_list) {
+ list_for_each_entry(lte, stream_list, extraction_list) {
/* For each inode that contains the stream */
list_for_each_entry(inode, <e->inode_list, i_lte_inode_list) {
/* For each dentry that points to the inode */
return 0;
}
+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;
+}
+
+
/* Extracts the image @image from the WIM @w to the directory or NTFS volume
* @target. */
static int
{
int ret;
struct list_head stream_list;
- struct hlist_head *inode_list;
struct apply_args args;
const struct apply_operations *ops;
ops = &normal_apply_operations;
ret = select_wim_image(w, image);
- if (ret != 0)
+ if (ret)
goto out;
- inode_list = &w->image_metadata[image - 1].inode_list;
-
/* Build a list of the streams that need to be extracted */
- find_streams_for_extraction(inode_list, &stream_list,
+ find_streams_for_extraction(wim_get_current_image_metadata(w),
+ &stream_list,
w->lookup_table, extract_flags);
/* Calculate the number of bytes of data that will be extracted */
&args.progress);
}
+ ret = calculate_dentry_tree_full_paths(wim_root_dentry(w));
+ if (ret)
+ goto out;
+
/* Make the directory structure and extract empty files */
args.extract_flags |= WIMLIB_EXTRACT_FLAG_NO_STREAMS;
args.apply_dentry = ops->apply_dentry;
ret = for_dentry_in_tree(wim_root_dentry(w), maybe_apply_dentry, &args);
args.extract_flags &= ~WIMLIB_EXTRACT_FLAG_NO_STREAMS;
- if (ret != 0)
+ if (ret)
goto out;
if (progress_func) {
/* Extract non-empty files */
ret = apply_stream_list(&stream_list, &args, ops, progress_func);
- if (ret != 0)
+ if (ret)
goto out;
if (progress_func) {
/* Apply timestamps */
ret = for_dentry_in_tree_depth(wim_root_dentry(w),
ops->apply_dentry_timestamps, &args);
- if (ret != 0)
+ if (ret)
goto out;
if (progress_func) {
return ret;
}
-static const tchar *filename_forbidden_chars =
+static const tchar * const filename_forbidden_chars =
T(
#ifdef __WIN32__
"<>:\"/\\|?*"
}
ret = verify_swm_set(w, additional_swms, num_additional_swms);
- if (ret != 0)
+ if (ret)
+ return ret;
+
+ ret = wim_checksum_unhashed_streams(w);
+ if (ret)
return ret;
if (num_additional_swms) {
ret = new_joined_lookup_table(w, additional_swms,
num_additional_swms, &joined_tab);
- if (ret != 0)
+ if (ret)
return ret;
w_tab_save = w->lookup_table;
w->lookup_table = joined_tab;