From: Timo Sirainen <tss@iki.fi>
Date: Sat, 25 Oct 2014 23:03:22 +0000 (+0300)
Subject: fs-posix: fs_copy() no longer fails if destination exists and FS_OPEN_MODE_REPLACE... 
X-Git-Tag: 2.2.16.rc1~282
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc525738d566a2b45270d68f2781021cb3755ab1;p=thirdparty%2Fdovecot%2Fcore.git

fs-posix: fs_copy() no longer fails if destination exists and FS_OPEN_MODE_REPLACE is used
---

diff --git a/src/lib-fs/fs-posix.c b/src/lib-fs/fs-posix.c
index f6bf8a27fe..397fc2ae1b 100644
--- a/src/lib-fs/fs-posix.c
+++ b/src/lib-fs/fs-posix.c
@@ -610,11 +610,18 @@ static int fs_posix_stat(struct fs_file *_file, struct stat *st_r)
 
 static int fs_posix_copy(struct fs_file *_src, struct fs_file *_dest)
 {
+	struct posix_fs_file *dest = (struct posix_fs_file *)_dest;
 	struct posix_fs *fs = (struct posix_fs *)_src->fs;
 	unsigned int try_count = 0;
 	int ret;
 
 	ret = link(_src->path, _dest->path);
+	if (errno == EEXIST && dest->open_mode == FS_OPEN_MODE_REPLACE) {
+		/* destination file already exists - replace it */
+		if (unlink(_dest->path) < 0 && errno != ENOENT)
+			i_error("unlink(%s) failed: %m", _dest->path);
+		ret = link(_src->path, _dest->path);
+	}
 	while (ret < 0 && errno == ENOENT &&
 	       try_count <= MAX_MKDIR_RETRY_COUNT) {
 		if (fs_posix_mkdir_parents(fs, _dest->path) < 0)