refcnt image metadata; calculate full path on-demand

[wimlib] / src / extract_image.c

diff --git a/src/extract_image.c b/src/extract_image.c
index 0f9252a3c36badd60103dc007821e30a7c0a3ca7..85b5af8aa4dc6be4c0914c2b9d2c806eae167bfb 100644 (file)
--- a/src/extract_image.c
+++ b/src/extract_image.c
@@ -112,7 +112,7 @@ extract_regular_file_linked(struct wim_dentry *dentry,
                size_t i;
 
                num_path_components =
-                       get_num_path_components(dentry->full_path) - 1;
+                       get_num_path_components(dentry_full_path(dentry)) - 1;
                num_output_dir_path_components =
                        get_num_path_components(args->target);
 
@@ -328,12 +328,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);
@@ -499,10 +499,12 @@ 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));
-               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 +528,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 +557,16 @@ 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;
+               args->progress.extract.cur_path = dentry_full_path(dentry);
                args->progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY,
                                    &args->progress);
        }
@@ -569,54 +576,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,
@@ -800,11 +759,11 @@ extract_single_image(WIMStruct *w, int image,
        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,10 +789,10 @@ 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;
+       inode_list = &wim_get_current_image_metadata(w)->inode_list;
 
        /* Build a list of the streams that need to be extracted */
        find_streams_for_extraction(inode_list, &stream_list,
@@ -912,7 +871,7 @@ out:
        return ret;
 }
 
-static const tchar *filename_forbidden_chars = 
+static const tchar *filename_forbidden_chars =
 T(
 #ifdef __WIN32__
 "<>:\"/\\|?*"