X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract_image.c;h=48a916ab5517652e4a2663c42446f983f7cd111e;hp=b18270dfb899ef1a5bc702c908930ebed23d807a;hb=337df3674d64fff382890d1e8757dadf57d93b1f;hpb=394c5bd3292c0f3168416c0a5f25989e557b3cfc diff --git a/src/extract_image.c b/src/extract_image.c index b18270df..48a916ab 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(dentry)) - 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++; @@ -326,20 +324,34 @@ extract_symlink(struct wim_dentry *dentry, struct apply_args *args, const char *output_path) { - char target[4096]; - ssize_t ret = inode_readlink(dentry->d_inode, target, - sizeof(target), args->w, false); + char target[4096 + args->target_realpath_len]; + char *fixed_target; + + ssize_t ret = inode_readlink(dentry->d_inode, + target + args->target_realpath_len, + sizeof(target) - args->target_realpath_len - 1, + 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)); + dentry->_full_path); return WIMLIB_ERR_INVALID_DENTRY; } - ret = symlink(target, output_path); - if (ret != 0) { + target[args->target_realpath_len + ret] = '\0'; + if (target[args->target_realpath_len] == '/' && + args->extract_flags & WIMLIB_EXTRACT_FLAG_RPFIX) + { + memcpy(target, args->target_realpath, + args->target_realpath_len); + fixed_target = target; + } else { + fixed_target = target + args->target_realpath_len; + } + ret = symlink(fixed_target, output_path); + if (ret) { ERROR_WITH_ERRNO("Failed to symlink `%s' to `%s'", - output_path, target); + output_path, fixed_target); return WIMLIB_ERR_LINK; } lte = inode_unnamed_lte_resolved(dentry->d_inode); @@ -353,7 +365,7 @@ extract_symlink(struct wim_dentry *dentry, ret = 0; else ret = symlink_apply_unix_data(output_path, &unix_data); - if (ret != 0) + if (ret) return ret; } args->progress.extract.completed_bytes += wim_resource_size(lte); @@ -499,8 +511,6 @@ apply_dentry_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)); @@ -528,8 +538,6 @@ 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)); @@ -557,16 +565,13 @@ maybe_apply_dentry(struct wim_dentry *dentry, void *arg) if (dentry->is_extracted) return 0; - if (!dentry_full_path(dentry)) - return WIMLIB_ERR_NOMEM; - 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(dentry); + args->progress.extract.cur_path = dentry->_full_path; args->progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY, &args->progress); } @@ -791,6 +796,7 @@ extract_single_image(WIMStruct *w, int image, struct apply_args args; const struct apply_operations *ops; + tchar *target_realpath; memset(&args, 0, sizeof(args)); @@ -855,12 +861,16 @@ extract_single_image(WIMStruct *w, int image, &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) { @@ -868,10 +878,17 @@ extract_single_image(WIMStruct *w, int image, &args.progress); } + if (extract_flags & WIMLIB_EXTRACT_FLAG_RPFIX) { + args.target_realpath = realpath(target, NULL); + if (!args.target_realpath) + return WIMLIB_ERR_NOMEM; + args.target_realpath_len = tstrlen(args.target_realpath); + } + /* Extract non-empty files */ ret = apply_stream_list(&stream_list, &args, ops, progress_func); - if (ret != 0) - goto out; + if (ret) + goto out_free_target_realpath; if (progress_func) { progress_func(WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS, @@ -881,13 +898,15 @@ extract_single_image(WIMStruct *w, int image, /* Apply timestamps */ ret = for_dentry_in_tree_depth(wim_root_dentry(w), ops->apply_dentry_timestamps, &args); - if (ret != 0) - goto out; + if (ret) + goto out_free_target_realpath; if (progress_func) { progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END, &args.progress); } +out_free_target_realpath: + FREE(args.target_realpath); out: #ifdef WITH_NTFS_3G /* Unmount the NTFS volume */ @@ -903,7 +922,7 @@ out: return ret; } -static const tchar *filename_forbidden_chars = +static const tchar * const filename_forbidden_chars = T( #ifdef __WIN32__ "<>:\"/\\|?*" @@ -1016,6 +1035,19 @@ wimlib_extract_image(WIMStruct *w, #endif } + if ((extract_flags & (WIMLIB_EXTRACT_FLAG_RPFIX | + WIMLIB_EXTRACT_FLAG_RPFIX)) == + (WIMLIB_EXTRACT_FLAG_RPFIX | WIMLIB_EXTRACT_FLAG_NORPFIX)) + { + ERROR("Cannot specify RPFIX and NORPFIX flags at the same time!"); + return WIMLIB_ERR_INVALID_PARAM; + } + + if ((extract_flags & (WIMLIB_EXTRACT_FLAG_RPFIX | + WIMLIB_EXTRACT_FLAG_NORPFIX)) == 0) + if (w->hdr.flags & WIM_HDR_FLAG_RP_FIX) + extract_flags |= WIMLIB_EXTRACT_FLAG_RPFIX; + ret = verify_swm_set(w, additional_swms, num_additional_swms); if (ret) return ret;