Use i_unlink() to improve unexpected unlink() error messages.

src/lib-sieve-tool/mail-raw.c

@@ -68,9 +68,8 @@ static int seekable_fd_callback
 	}
 
 	/* we just want the fd, unlink it */
-	if (unlink(str_c(path)) < 0) {
+	if (i_unlink(str_c(path)) < 0) {
 		/* shouldn't happen.. */
-		i_error("unlink(%s) failed: %m", str_c(path));
 		i_close_fd(&fd);
 		return -1;
 	}

src/lib-sieve/storage/file/sieve-file-storage-active.c

@@ -163,7 +163,7 @@ int sieve_file_storage_active_replace_link
 
 	if ( ret < 0 ) {
 		/* Failed; created symlink must be deleted */
-		(void)unlink(active_path_new);
+		i_unlink(active_path_new);
 		sieve_storage_set_critical(storage,
 			"Performing rename() %s to %s failed: %m",
 			active_path_new, fstorage->active_path);

src/lib-sieve/storage/file/sieve-file-storage-save.c

@@ -443,14 +443,14 @@ sieve_file_storage_save_to(struct sieve_file_storage *fstorage,
 			"read(%s) failed: %s", i_stream_get_name(input),
 			i_stream_get_error(input));
 		o_stream_destroy(&output);
-		(void)unlink(str_c(temp_path));
+		i_unlink(str_c(temp_path));
 		return -1;
 	case OSTREAM_SEND_ISTREAM_RESULT_ERROR_OUTPUT:
 		sieve_storage_set_critical(storage,
 			"write(%s) failed: %s", str_c(temp_path),
 			o_stream_get_error(output));
 		o_stream_destroy(&output);
-		(void)unlink(str_c(temp_path));
+		i_unlink(str_c(temp_path));
 		return -1;
 	}
 	o_stream_destroy(&output);
@@ -468,9 +468,8 @@ sieve_file_storage_save_to(struct sieve_file_storage *fstorage,
 				"rename(%s, %s) failed: %m",
 				str_c(temp_path), target);
 		}
+		i_unlink(str_c(temp_path));
 	}
-
-	(void)unlink(str_c(temp_path));
 	return 0;
 }
 

src/lib-sieve/util/program-client.c

@@ -429,9 +429,8 @@ static int program_client_seekable_fd_callback
 	}
 
 	/* we just want the fd, unlink it */
-	if (unlink(str_c(path)) < 0) {
+	if (i_unlink(str_c(path)) < 0) {
 		/* shouldn't happen.. */
-		i_error("unlink(%s) failed: %m", str_c(path));
 		i_close_fd(&fd);
 		return -1;
 	}

src/sieve-tools/sieve-test.c

@@ -398,7 +398,7 @@ int main(int argc, char **argv)
 			break;
 		case SIEVE_EXEC_BIN_CORRUPT:
 			i_info("corrupt binary deleted.");
-			(void) unlink(sieve_binary_path(sbin));
+			i_unlink_if_exists(sieve_binary_path(sbin));
 			/* fall through */
 		case SIEVE_EXEC_FAILURE:
 			i_info("final result: failed; resolved with successful implicit keep");