From: sergey.kitov <sergey.kitov@open-xchange.com>
Date: Thu, 16 Feb 2023 14:25:14 +0000 (+0200)
Subject: lib-fs: Disable sis writing.
X-Git-Tag: 2.4.0~2809
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=980aa043bbef476c1e0110dac25c6e5510c662fe;p=thirdparty%2Fdovecot%2Fcore.git

lib-fs: Disable sis writing.
---

diff --git a/src/lib-fs/fs-sis.c b/src/lib-fs/fs-sis.c
index c955342ab6..9197cd9056 100644
--- a/src/lib-fs/fs-sis.c
+++ b/src/lib-fs/fs-sis.c
@@ -178,72 +178,6 @@ static bool fs_sis_try_link(struct sis_fs_file *file)
 	return TRUE;
 }
 
-static void fs_sis_replace_hash_file(struct sis_fs_file *file)
-{
-	struct fs *super_fs = file->file.parent->fs;
-	struct fs_file *temp_file;
-	const char *hash_fname;
-	string_t *temp_path;
-	int ret;
-
-	if (file->hash_input == NULL) {
-		/* hash file didn't exist previously. we should be able to
-		   create it with link() */
-		if (fs_copy(file->file.parent, file->hash_file) < 0) {
-			if (errno == EEXIST) {
-				/* the file was just created. it's probably
-				   a duplicate, but it's too much trouble
-				   trying to deduplicate it anymore */
-			} else {
-				e_error(file->file.event, "%s",
-					fs_file_last_error(file->hash_file));
-			}
-		}
-		return;
-	}
-
-	temp_path = t_str_new(256);
-	hash_fname = strrchr(file->hash_path, '/');
-	if (hash_fname == NULL)
-		hash_fname = file->hash_path;
-	else {
-		str_append_data(temp_path, file->hash_path,
-				(hash_fname-file->hash_path) + 1);
-		hash_fname++;
-	}
-	str_printfa(temp_path, "%s%s.tmp",
-		    super_fs->set.temp_file_prefix, hash_fname);
-
-	/* replace existing hash file atomically */
-	temp_file = fs_file_init_parent(&file->file, str_c(temp_path),
-					FS_OPEN_MODE_READONLY, 0);
-	ret = fs_copy(file->file.parent, temp_file);
-	if (ret < 0 && errno == EEXIST) {
-		/* either someone's racing us or it's a stale file.
-		   try to continue. */
-		if (fs_delete(temp_file) < 0 &&
-		    errno != ENOENT)
-			e_error(file->file.event, "%s", fs_file_last_error(temp_file));
-		ret = fs_copy(file->file.parent, temp_file);
-	}
-	if (ret < 0) {
-		e_error(file->file.event, "%s", fs_file_last_error(temp_file));
-		fs_file_deinit(&temp_file);
-		return;
-	}
-
-	if (fs_rename(temp_file, file->hash_file) < 0) {
-		if (errno == ENOENT) {
-			/* apparently someone else just renamed it. ignore. */
-		} else {
-			e_error(file->file.event, "%s",
-				fs_file_last_error(file->hash_file));
-		}
-		(void)fs_delete(temp_file);
-	}
-	fs_file_deinit(&temp_file);
-}
-
 static int fs_sis_write(struct fs_file *_file, const void *data, size_t size)
 {
 	struct sis_fs_file *file = SIS_FILE(_file);
@@ -261,71 +195,35 @@ static int fs_sis_write(struct fs_file *_file, const void *data, size_t size)
 
 	if (fs_write(_file->parent, data, size) < 0)
 		return -1;
-	T_BEGIN {
-		fs_sis_replace_hash_file(file);
-	} T_END;
 	return 0;
 }
 
 static void fs_sis_write_stream(struct fs_file *_file)
 {
-	struct sis_fs_file *file = SIS_FILE(_file);
-
-	i_assert(_file->output == NULL);
-
 	if (_file->parent == NULL) {
 		_file->output = o_stream_create_error_str(EINVAL, "%s",
 						fs_file_last_error(_file));
 	} else {
-		file->fs_output = fs_write_stream(_file->parent);
-		if (file->hash_input == NULL) {
-			_file->output = file->fs_output;
-			o_stream_ref(_file->output);
-		} else {
-			/* compare if files are equal */
-			_file->output = o_stream_create_cmp(file->fs_output,
-							    file->hash_input);
-		}
+		_file->output = fs_write_stream(_file->parent);
 	}
 	o_stream_set_name(_file->output, _file->path);
 }
 
 static int fs_sis_write_stream_finish(struct fs_file *_file, bool success)
 {
-	struct sis_fs_file *file = SIS_FILE(_file);
 
 	if (!success) {
 		if (_file->parent != NULL)
-			fs_write_stream_abort_parent(_file, &file->fs_output);
-		o_stream_unref(&_file->output);
+			fs_write_stream_abort_parent(_file, &_file->output);
 		return -1;
 	}
 
-	if (file->hash_input != NULL &&
-	    o_stream_cmp_equals(_file->output) &&
-	    i_stream_read_eof(file->hash_input)) {
-		o_stream_unref(&_file->output);
-		if (fs_sis_try_link(file)) {
-			fs_write_stream_abort_parent(_file, &file->fs_output);
-			return 1;
-		}
-	}
-	if (_file->output != NULL)
-		o_stream_unref(&_file->output);
 
-	if (fs_write_stream_finish(_file->parent, &file->fs_output) < 0)
-		return -1;
-	T_BEGIN {
-		fs_sis_replace_hash_file(file);
-	} T_END;
-	return 1;
+	return fs_write_stream_finish(_file->parent, &_file->output);
 }
 
 static int fs_sis_delete(struct fs_file *_file)
 {
-	T_BEGIN {
-		fs_sis_try_unlink_hash_file(_file, _file->parent);
-	} T_END;
 	return fs_delete(_file->parent);
 }