maybe_apply_dentry(): Fix NO_STREAMS case

[wimlib] / src / extract_image.c

diff --git a/src/extract_image.c b/src/extract_image.c
index 7effb4f395d4abab7eff5e7b80b09a38e9b30a18..b6eeaf194809c4b3c7802f286026df9eb79bfa09 100644 (file)
--- a/src/extract_image.c
+++ b/src/extract_image.c
@@ -326,11 +326,11 @@ extract_symlink(struct wim_dentry *dentry,
 {
        char target[4096 + args->target_realpath_len];
        char *fixed_target;
+       const struct wim_inode *inode = dentry->d_inode;
 
-       ssize_t ret = inode_readlink(dentry->d_inode,
-                                    target + args->target_realpath_len,
-                                    sizeof(target) - args->target_realpath_len - 1,
-                                    args->w, false);
+       ssize_t ret = wim_inode_readlink(inode,
+                                        target + args->target_realpath_len,
+                                        sizeof(target) - args->target_realpath_len - 1);
        struct wim_lookup_table_entry *lte;
 
        if (ret <= 0) {
@@ -357,11 +357,9 @@ extract_symlink(struct wim_dentry *dentry,
                                 output_path, fixed_target);
                return WIMLIB_ERR_LINK;
        }
-       lte = inode_unnamed_lte_resolved(dentry->d_inode);
-       wimlib_assert(lte != NULL);
        if (args->extract_flags & WIMLIB_EXTRACT_FLAG_UNIX_DATA) {
                struct wimlib_unix_data unix_data;
-               ret = inode_get_unix_data(dentry->d_inode, &unix_data, NULL);
+               ret = inode_get_unix_data(inode, &unix_data, NULL);
                if (ret > 0)
                        ;
                else if (ret < 0)
@@ -371,6 +369,8 @@ extract_symlink(struct wim_dentry *dentry,
                if (ret)
                        return ret;
        }
+       lte = inode_unnamed_lte_resolved(inode);
+       wimlib_assert(lte != NULL);
        args->progress.extract.completed_bytes += wim_resource_size(lte);
        return 0;
 }
@@ -555,8 +555,9 @@ apply_dentry_timestamps_normal(struct wim_dentry *dentry, void *arg)
 #endif
 }
 
-/* Extract a dentry if it hasn't already been extracted, and either the dentry
- * has no streams or WIMLIB_EXTRACT_FLAG_NO_STREAMS is not specified. */
+/* Extract a dentry if it hasn't already been extracted and either
+ * WIMLIB_EXTRACT_FLAG_NO_STREAMS is not specified, or the dentry is a directory
+ * and/or has no unnamed stream. */
 static int
 maybe_apply_dentry(struct wim_dentry *dentry, void *arg)
 {
@@ -566,9 +567,10 @@ maybe_apply_dentry(struct wim_dentry *dentry, void *arg)
        if (dentry->is_extracted)
                return 0;
 
-       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_NO_STREAMS &&
+           !dentry_is_directory(dentry) &&
+           inode_unnamed_lte_resolved(dentry->d_inode) != NULL)
+               return 0;
 
        if ((args->extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) &&
             args->progress_func) {