fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-20 08:06:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply remaining changes

Browse Source 
Co-authored-by: rakshasa <475125+rakshasa@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-10-19 22:20:32 +00:00
committed by GitHub
parent 7a38112149
commit d47ce9d129
9 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/command_local.cc
+3
View File
@@ -123,6 +123,8 @@ initialize_command_local() {
CMD_ANY_STRING_V("session.path.set", [](auto, auto& str) { return session_thread::manager()->set_path(str); });
CMD_ANY ("session.use_lock", [](auto, auto) { return session_thread::manager()->use_lock(); });
CMD_ANY_VALUE_V ("session.use_lock.set", [](auto, auto& value) { return session_thread::manager()->set_use_lock(value); });
CMD_ANY ("session.umask", [](auto, auto) { return session_thread::manager()->umask(); });
CMD_ANY_VALUE_V ("session.umask.set", [](auto, auto& value) { return session_thread::manager()->set_umask(value); });
CMD_VAR_BOOL ("session.on_completion", true);
CMD_ANY_V ("session.save", [dList](auto, auto) { return dList->session_save(); });
@@ -171,6 +173,7 @@ initialize_command_local() {
rpc::rpc.mark_safe("directory.default.realpath.or_empty");
rpc::rpc.mark_safe("directory.default.realpath.or_throw");
rpc::rpc.mark_safe("session.use_lock");
rpc::rpc.mark_safe("session.umask");
rpc::rpc.mark_safe("session.on_completion");
rpc::rpc.mark_safe("pieces.sync.always_safe");
src/session/download_storer.cc
+12 -5
View File
@@ -5,6 +5,7 @@
#include <cerrno>
#include <fcntl.h>
#include <fstream>
#include <sys/stat.h>
#include <unistd.h>
#include <torrent/exceptions.h>
#include <torrent/object.h>
@@ -123,7 +124,7 @@ is_correct_format(const std::string& f) {
}
void
save_stream(const std::string& path, bool use_fsyncdisk, const std::stringstream& stream) {
save_stream(const std::string& path, bool use_fsyncdisk, mode_t file_mode, const std::stringstream& stream) {
// Remove any leftover temporary file first so that O_EXCL only ever fails on
// an entry that appeared after the unlink, and O_NOFOLLOW keeps a symlink
// planted in the session directory from redirecting the write.
@@ -136,6 +137,12 @@ save_stream(const std::string& path, bool use_fsyncdisk, const std::stringstream
if (fd < 0)
throw torrent::storage_error("failed to open file for writing : " + path);
// open() applies the process umask, so set the configured mode explicitly.
if (::fchmod(fd, file_mode) == -1) {
::close(fd);
throw torrent::storage_error("failed to set file permissions : " + path);
}
const auto data = stream.view();
std::size_t remaining = data.size();
const char* cursor = data.data();
@@ -196,7 +203,7 @@ sync_directory_of(const std::string& path) {
} // namespace anonymous
void
DownloadStorer::save_and_move_streams(const std::string& path, bool use_fsyncdisk,
DownloadStorer::save_and_move_streams(const std::string& path, bool use_fsyncdisk, mode_t file_mode,
const std::stringstream* torrent_stream,
const std::stringstream* rtorrent_stream,
const std::stringstream* libtorrent_stream) {
@@ -205,10 +212,10 @@ DownloadStorer::save_and_move_streams(const std::string& path, bool use_fsyncdis
auto rtorrent_path = path + ".rtorrent";
if (torrent_stream)
save_stream(torrent_path + ".new", use_fsyncdisk, *torrent_stream);
save_stream(torrent_path + ".new", use_fsyncdisk, file_mode, *torrent_stream);
save_stream(libtorrent_path + ".new", use_fsyncdisk, *libtorrent_stream);
save_stream(rtorrent_path + ".new", use_fsyncdisk, *rtorrent_stream);
save_stream(libtorrent_path + ".new", use_fsyncdisk, file_mode, *libtorrent_stream);
save_stream(rtorrent_path + ".new", use_fsyncdisk, file_mode, *rtorrent_stream);
if (torrent_stream) {
if (::rename((torrent_path + ".new").c_str(), torrent_path.c_str()) == -1)
src/session/download_storer.h
+2 -1
View File
@@ -3,6 +3,7 @@
#include <memory>
#include <sstream>
#include <sys/types.h>
#include <string>
#include <torrent/common.h>
@@ -33,7 +34,7 @@ public:
auto rtorrent_stream() { return std::move(m_rtorrent_stream); }
auto libtorrent_stream() { return std::move(m_libtorrent_stream); }
static void save_and_move_streams(const std::string& path, bool use_fsyncdisk,
static void save_and_move_streams(const std::string& path, bool use_fsyncdisk, mode_t file_mode,
const std::stringstream* torrent_stream,
const std::stringstream* rtorrent_stream,
const std::stringstream* libtorrent_stream);
src/session/session_manager.cc
+17 -1
View File
@@ -65,6 +65,22 @@ SessionManager::set_use_lock(bool use_lock) {
m_use_lock = use_lock;
}
void
SessionManager::set_umask(int64_t umask) {
assert(torrent::this_thread::thread() == torrent::main_thread::thread());
if (m_freeze_info)
throw torrent::input_error("Session umask option cannot be changed after startup.");
if (umask < 0 || umask > 0777)
throw torrent::input_error("Session umask must be in the range 0 to 0777.");
if ((umask & 0600) != 0)
throw torrent::input_error("Session umask must not mask owner read/write permissions (0600).");
m_umask = umask;
}
void
SessionManager::save_resume_download(core::Download* download) {
assert(torrent::this_thread::thread() == torrent::main_thread::thread());
@@ -379,7 +395,7 @@ SessionManager::process_next_save_request_unsafe() {
};
try {
DownloadStorer::save_and_move_streams(itr->second.path, m_use_fsyncdisk,
DownloadStorer::save_and_move_streams(itr->second.path, m_use_fsyncdisk, file_mode(),
itr->second.torrent_stream.get(),
itr->second.rtorrent_stream.get(),
itr->second.libtorrent_stream.get());
src/session/session_manager.h
+9
View File
@@ -6,6 +6,8 @@
#include <deque>
#include <future>
#include <list>
#include <cstdint>
#include <sys/types.h>
#include <memory>
#include <mutex>
#include <sstream>
@@ -59,6 +61,10 @@ public:
bool use_lock() const;
void set_use_lock(bool use_lock);
int umask() const;
void set_umask(int64_t umask);
mode_t file_mode() const;
void save_full_download(core::Download* download);
void save_resume_download(core::Download* download);
void remove_download(core::Download* download);
@@ -99,6 +105,7 @@ private:
std::string m_path;
bool m_use_fsyncdisk{true};
bool m_use_lock{true};
int m_umask{0077};
align_cacheline
@@ -133,6 +140,8 @@ inline bool SessionManager::is_used() const { return !m_path.e
inline std::string SessionManager::path() const { return m_path; }
inline bool SessionManager::use_fsyncdisk() const { return m_use_fsyncdisk; }
inline bool SessionManager::use_lock() const { return m_use_lock; }
inline int SessionManager::umask() const { return m_umask; }
inline mode_t SessionManager::file_mode() const { return 0666 & ~m_umask; }
inline void SessionManager::flush_all_pending_builds() { process_pending_builds(true); }
} // namespace session