Win32: Add untested support for encryted capture

[wimlib] / src / extract_image.c

diff --git a/src/extract_image.c b/src/extract_image.c
index fa72edb845c19e4cf52801b11b31362399d4cb0c..8941b0e7ab1a90901401d6418bd67b41b3d8d025 100644 (file)
--- 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++;
@@ -333,7 +331,7 @@ extract_symlink(struct wim_dentry *dentry,
 
        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);
@@ -499,8 +497,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 +524,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 +551,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);
        }
@@ -855,12 +846,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) {
@@ -870,7 +865,7 @@ extract_single_image(WIMStruct *w, int image,
 
        /* Extract non-empty files */
        ret = apply_stream_list(&stream_list, &args, ops, progress_func);
-       if (ret != 0)
+       if (ret)
                goto out;
 
        if (progress_func) {
@@ -881,7 +876,7 @@ 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)
+       if (ret)
                goto out;
 
        if (progress_func) {
@@ -1027,7 +1022,7 @@ wimlib_extract_image(WIMStruct *w,
        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;