}
DEBUG("Calculating SHA1 checksums for all new staging files.");
- list_for_each_entry(lte, &ctx->staging_list, staging_list) {
+ list_for_each_entry_safe(lte, tmp, &ctx->staging_list, staging_list) {
ret = update_lte_of_staging_file(lte, w->lookup_table);
if (ret != 0)
return ret;
return WIMLIB_ERR_NOTDIR;
}
- p = dir_path;
- while (*p) {
+ for (p = dir_path; *p; p++)
if (*p == '/')
*p = 0xff;
- p++;
- }
ctx->unmount_to_daemon_mq_name = strcat_dup(u2d_prefix, dir_path,
NAME_MAX);
if (!inode)
return -errno;
- if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT)
- return -EEXIST;
-
- if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY)
+ if (inode->i_attributes & (FILE_ATTRIBUTE_DIRECTORY |
+ FILE_ATTRIBUTE_REPARSE_POINT))
return -EPERM;
from_dentry_parent = get_parent_dentry(w, from);
if (!from_dentry_parent)
- return -ENOENT;
+ return -errno;
if (!dentry_is_directory(from_dentry_parent))
return -ENOTDIR;
}
ret = alloc_wimfs_fd(inode, stream_id, lte, &fd,
- wimfs_ctx_readonly(ctx));
+ wimfs_ctx_readonly(ctx));
if (ret != 0)
return ret;
return -ENOTDIR;
}
- ret = set_dentry_name(src, to);
+ ret = set_dentry_name(src, path_basename(to));
if (ret != 0)
return -ENOMEM;
if (dst)
if (ret)
ret = WIMLIB_ERR_FUSE;
+
+ /* Try to delete the staging directory if a deletion wasn't yet
+ * attempted due to an earlier error */
+ if (ctx.staging_dir_name)
+ delete_staging_dir(&ctx);
+
out_free_dir_copy:
FREE(dir_copy);
out_unlock: