[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.105,1.106

[Yura P. <yu...@de...>]

Changes by: yura

Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv6028/ntfsprogs

Modified Files:
	ntfsmount.c 
Log Message:
ntfsmount: fix rename if destination already exists.


Index: ntfsmount.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- ntfsmount.c	6 Dec 2006 18:50:13 -0000	1.105
+++ ntfsmount.c	6 Dec 2006 19:51:59 -0000	1.106
@@ -1013,9 +1013,36 @@ static int ntfs_fuse_unlink(const char *
 static int ntfs_fuse_rename(const char *old_path, const char *new_path)
 {
 	int ret;
+	u64 inum_new, inum_old;
 
+	/* Check whether destination already exists. */
+	if ((inum_new = ntfs_pathname_to_inode_num(ctx->vol, NULL, new_path)) !=
+			(u64)-1) {
+		if (errno != ENOENT)
+			return -errno;
+		/*
+		 * If source and destination belongs to the same inode, then
+		 * just unlink source if mount is case sensitive or return
+		 * -EINVAL if mount is case insensitive, because of a lot of
+		 * brain damaged cases here. Anyway coreutils is broken for
+		 * case sensitive filesystems.
+		 *
+		 * If source and destination belongs to different inodes, then
+		 * unlink current destination, so we can create link to source.
+		 */
+		inum_old = ntfs_pathname_to_inode_num(ctx->vol, NULL, old_path);
+		if (inum_old == inum_new) {
+			if (NVolCaseSensitive(ctx->vol))
+				goto unlink;
+			else
+				return -EINVAL;
+		} else
+			if ((ret = ntfs_fuse_unlink(new_path)))
+				return ret;
+	}
 	if ((ret = ntfs_fuse_link(old_path, new_path)))
 		return ret;
+unlink:
 	if ((ret = ntfs_fuse_unlink(old_path))) {
 		ntfs_fuse_unlink(new_path);
 		return ret;