From d4427931a2f03b8fd9f80895ace12fb95e0b759c Mon Sep 17 00:00:00 2001
From: stickz <stickman002@mail.com>
Date: Fri, 6 Sep 2024 11:05:35 -0400
Subject: [PATCH 1/2] Fix session file data corruption

From https://github.com/jesec/rtorrent/commit/f9a875b633eb083ec82f89ebeae8678ca424e8b2

This commit ensures session files land on the disk in the event of a system crash or power outage. It prevents data corruption of rTorrent session files, which causes torrent client breakage.

Optimizations from the initial implementation include
1) Skipping unnecessary file metadata updates during the sync process.
2) Skipping variable initialization since open will assign -1 on failure.
---
 src/core/download_store.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/core/download_store.cc b/src/core/download_store.cc
index 536dba10..3345cddc 100644
--- a/src/core/download_store.cc
+++ b/src/core/download_store.cc
@@ -40,6 +40,7 @@
 
 #include <fstream>
 #include <stdio.h>
+#include <fcntl.h>
 #include <unistd.h>
 #include <rak/error_number.h>
 #include <rak/path.h>
@@ -121,6 +122,15 @@ DownloadStore::write_bencode(const std::string& filename, const torrent::Object&
     goto download_store_save_error;
 
   output.close();
+
+  // Ensure that the new file is actually written to the disk
+  int fd = ::open(filename.c_str(), O_WRONLY);
+  if (fd < 0)
+    goto download_store_save_error;
+
+  fdatasync(fd);
+  ::close(fd);
+
   return true;
 
 download_store_save_error:

From 133ce3657061fa0f821c72731419c4dddbd60211 Mon Sep 17 00:00:00 2001
From: rakshasa <sundell.software@gmail.com>
Date: Sat, 7 Sep 2024 08:29:00 +0000
Subject: [PATCH 2/2] Fixed goto warning.

---
 src/core/download_store.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/download_store.cc b/src/core/download_store.cc
index a67c0493..0c151db3 100644
--- a/src/core/download_store.cc
+++ b/src/core/download_store.cc
@@ -101,6 +101,7 @@ DownloadStore::set_path(const std::string& path) {
 
 bool
 DownloadStore::write_bencode(const std::string& filename, const torrent::Object& obj, uint32_t skip_mask) {
+  int fd;
   torrent::Object tmp;
   std::fstream output(filename.c_str(), std::ios::out | std::ios::trunc);
 
@@ -124,7 +125,7 @@ DownloadStore::write_bencode(const std::string& filename, const torrent::Object&
   output.close();
 
   // Ensure that the new file is actually written to the disk
-  int fd = ::open(filename.c_str(), O_WRONLY);
+  fd = ::open(filename.c_str(), O_WRONLY);
   if (fd < 0)
     goto download_store_save_error;