X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmount_image.c;h=bd1a7d54bc5aee6660905ef3be4fa24407380ecf;hp=e5d7fb98462b4fc5a853e918a82348d137f0f5ba;hb=8a3ba2dade2f96c9fcb7e24834b0e882b6e45e97;hpb=fabacee4b6205284e197f07b4fefb8e66b1c3f4f

diff --git a/src/mount_image.c b/src/mount_image.c
index e5d7fb98..bd1a7d54 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -802,7 +802,7 @@ static int rebuild_wim(struct wimfs_context *ctx, int write_flags,
 	}
 
 	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;
@@ -848,12 +848,9 @@ static int set_message_queue_names(struct wimfs_context *ctx,
 			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);
@@ -1613,15 +1610,13 @@ static int wimfs_link(const char *to, const char *from)
 	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;
 
@@ -1779,7 +1774,7 @@ static int wimfs_open(const char *path, struct fuse_file_info *fi)
 	}
 
 	ret = alloc_wimfs_fd(inode, stream_id, lte, &fd,
-			      wimfs_ctx_readonly(ctx));
+			     wimfs_ctx_readonly(ctx));
 	if (ret != 0)
 		return ret;
 
@@ -2501,6 +2496,12 @@ WIMLIBAPI int wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
 
 	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: