mount_image.c: Use fuse_context.umask only when available

[wimlib] / src / add_image.c

diff --git a/src/add_image.c b/src/add_image.c
index 89721052d3a6156effd77fa1f07d873409312e3c..9bd597a131a1c9bdb71fff0a177b17b0f71d923c 100644 (file)
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -210,9 +210,9 @@ unix_capture_symlink(struct wim_dentry **root_p,
                if ((params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_RPFIX) &&
                     dest[0] == '/')
                {
-                       dest = fixup_symlink(dest,
-                                            params->capture_root_ino,
-                                            params->capture_root_dev);
+                       dest = capture_fixup_absolute_symlink(dest,
+                                                             params->capture_root_ino,
+                                                             params->capture_root_dev);
                        if (!dest) {
                                WARNING("Ignoring out of tree absolute symlink "
                                        "\"%s\" -> \"%s\"\n"
@@ -225,8 +225,7 @@ unix_capture_symlink(struct wim_dentry **root_p,
                        }
                        inode->i_not_rpfixed = 0;
                }
-               ret = inode_set_symlink(inode, dest,
-                                       params->lookup_table, NULL);
+               ret = wim_inode_set_symlink(inode, dest, params->lookup_table);
                if (ret == 0) {
                        /* Unfortunately, Windows seems to have the concept of
                         * "file" symbolic links as being different from
@@ -300,9 +299,7 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 
        ret = inode_table_new_dentry(params->inode_table,
                                     path_basename_with_len(path, path_len),
-                                    stbuf.st_ino,
-                                    stbuf.st_dev,
-                                    &root);
+                                    stbuf.st_ino, stbuf.st_dev, false, &root);
        if (ret)
                goto out;