Use read_stream_list() for extraction

[wimlib] / src / mount_image.c

diff --git a/src/mount_image.c b/src/mount_image.c
index b1a3f1c7ca7bcf9e72e82d3a81ed75b0aa2603af..99db4ab38199f7bbca519f45858ff20732955f1c 100644 (file)
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -569,8 +569,7 @@ extract_resource_to_staging_dir(struct wim_inode *inode,
                struct filedes wimlib_fd;
                filedes_init(&wimlib_fd, fd);
                extract_size = min(old_lte->size, size);
-               ret = extract_wim_resource_to_fd(old_lte, &wimlib_fd,
-                                                extract_size);
+               ret = extract_stream_to_fd(old_lte, &wimlib_fd, extract_size);
        } else {
                ret = 0;
                extract_size = 0;
@@ -1667,7 +1666,7 @@ wimfs_getxattr(const char *path, const char *name, char *value,
        if (stream_size > size)
                return -ERANGE;
 
-       ret = read_full_resource_into_buf(lte, value);
+       ret = read_full_stream_into_buf(lte, value);
        if (ret) {
                if (errno)
                        return -errno;
@@ -1942,8 +1941,8 @@ wimfs_read(const char *path, char *buf, size_t size,
                        ret = -errno;
                break;
        case RESOURCE_IN_WIM:
-               if (read_partial_wim_resource_into_buf(fd->f_lte, size,
-                                                      offset, buf))
+               if (read_partial_wim_stream_into_buf(fd->f_lte, size,
+                                                    offset, buf))
                        ret = -errno;
                else
                        ret = size;
@@ -2415,6 +2414,11 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
                        return ret;
        }
 
+       if (wim->hdr.wim_version == WIM_VERSION_STREAM_CONCAT) {
+               WARNING("WIM contains streams not compressed independently; "
+                       "access may be slow.");
+       }
+
        ret = select_wim_image(wim, image);
        if (ret)
                return ret;