X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract_image.c;h=fc24d9bd6df04e8c34ac1e892be210a189aeb19a;hp=0f9252a3c36badd60103dc007821e30a7c0a3ca7;hb=cf373e59a7f6ff7d1fd007c1f22defe508aa67d4;hpb=650997e4865a090b6856c7ca34b02f42994e8e29 diff --git a/src/extract_image.c b/src/extract_image.c index 0f9252a3..fc24d9bd 100644 --- a/src/extract_image.c +++ b/src/extract_image.c @@ -111,10 +111,8 @@ extract_regular_file_linked(struct wim_dentry *dentry, 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(output_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++; @@ -268,7 +266,7 @@ extract_regular_file_unlinked(struct wim_dentry *dentry, } 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; } @@ -328,12 +326,12 @@ extract_symlink(struct wim_dentry *dentry, { char target[4096]; ssize_t ret = inode_readlink(dentry->d_inode, target, - sizeof(target), args->w, 0); + sizeof(target), args->w, false); struct wim_lookup_table_entry *lte; if (ret <= 0) { ERROR("Could not read the symbolic link from dentry `%s'", - dentry->full_path); + dentry_full_path(dentry)); return WIMLIB_ERR_INVALID_DENTRY; } ret = symlink(target, output_path); @@ -494,6 +492,7 @@ apply_dentry_normal(struct wim_dentry *dentry, void *arg) struct apply_args *args = arg; tchar *output_path; size_t len; + int ret; len = tstrlen(args->target); if (dentry_is_root(dentry)) { @@ -502,7 +501,7 @@ apply_dentry_normal(struct wim_dentry *dentry, void *arg) 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'); } @@ -526,10 +525,12 @@ apply_dentry_timestamps_normal(struct wim_dentry *dentry, void *arg) if (dentry_is_root(dentry)) { output_path = (tchar*)args->target; } else { + if (!dentry_full_path(dentry)) + return WIMLIB_ERR_NOMEM; 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'); } @@ -553,13 +554,17 @@ maybe_apply_dentry(struct wim_dentry *dentry, void *arg) if (dentry->is_extracted) return 0; + ret = calculate_dentry_full_path(dentry); + if (ret) + return ret; + if (args->extract_flags & WIMLIB_EXTRACT_FLAG_NO_STREAMS) if (inode_unnamed_lte_resolved(dentry->d_inode)) return 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); } @@ -569,54 +574,6 @@ maybe_apply_dentry(struct wim_dentry *dentry, void *arg) return ret; } -static int -cmp_streams_by_wim_position(const void *p1, const void *p2) -{ - const struct wim_lookup_table_entry *lte1, *lte2; - lte1 = *(const struct wim_lookup_table_entry**)p1; - lte2 = *(const struct wim_lookup_table_entry**)p2; - if (lte1->resource_entry.offset < lte2->resource_entry.offset) - return -1; - else if (lte1->resource_entry.offset > lte2->resource_entry.offset) - return 1; - else - 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, staging_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]->staging_list, stream_list); - FREE(array); - return 0; -} - static void calculate_bytes_to_extract(struct list_head *stream_list, int extract_flags, @@ -627,7 +584,7 @@ calculate_bytes_to_extract(struct list_head *stream_list, 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)) { @@ -655,7 +612,7 @@ maybe_add_stream_for_extraction(struct wim_lookup_table_entry *lte, { 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); } } @@ -694,18 +651,17 @@ inode_find_streams_for_extraction(struct wim_inode *inode, } 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) @@ -754,7 +710,7 @@ apply_stream_list(struct list_head *stream_list, * 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 */ @@ -786,6 +742,41 @@ apply_stream_list(struct list_head *stream_list, 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 @@ -795,16 +786,15 @@ extract_single_image(WIMStruct *w, int image, { int ret; struct list_head stream_list; - struct hlist_head *inode_list; struct apply_args args; const struct apply_operations *ops; + memset(&args, 0, sizeof(args)); + args.w = w; args.target = target; args.extract_flags = extract_flags; - args.num_utime_warnings = 0; - args.stream_list = &stream_list; args.progress_func = progress_func; if (progress_func) { @@ -830,13 +820,12 @@ extract_single_image(WIMStruct *w, int image, 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 */ @@ -912,7 +901,7 @@ out: return ret; } -static const tchar *filename_forbidden_chars = +static const tchar *filename_forbidden_chars = T( #ifdef __WIN32__ "<>:\"/\\|?*" @@ -1026,13 +1015,17 @@ wimlib_extract_image(WIMStruct *w, } 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;