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

Stuff.

Browse Source
This commit is contained in:
rakshasa
2026-08-09 22:49:49 +02:00
parent ee64f8ea50
commit 877e5f6ed3
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cc
+9 -9
View File
@@ -126,9 +126,9 @@ main(int argc, char** argv) {
SignalHandler::set_block(SIGCHLD); SignalHandler::set_block(SIGCHLD);
// All signal handlers must restore errno if they return. // All signal handlers must restore errno if they return.
SignalHandler::set_handler(SIGSEGV, std::bind(&do_panic, SIGSEGV)); SignalHandler::set_handler(SIGSEGV, []() { do_panic(SIGSEGV); });
SignalHandler::set_handler(SIGILL, std::bind(&do_panic, SIGILL)); SignalHandler::set_handler(SIGILL, []() { do_panic(SIGILL); });
SignalHandler::set_handler(SIGFPE, std::bind(&do_panic, SIGFPE)); SignalHandler::set_handler(SIGFPE, []() { do_panic(SIGFPE); });
// Limited list of commands with the following format: // Limited list of commands with the following format:
// //
@@ -144,10 +144,10 @@ main(int argc, char** argv) {
control = new Control; control = new Control;
SignalHandler::set_handler(SIGINT, std::bind(&Control::receive_normal_shutdown, control)); SignalHandler::set_handler(SIGINT, []() { control->receive_normal_shutdown(); });
SignalHandler::set_handler(SIGHUP, std::bind(&Control::receive_normal_shutdown, control)); SignalHandler::set_handler(SIGHUP, []() { control->receive_normal_shutdown(); });
SignalHandler::set_handler(SIGTERM, std::bind(&Control::receive_quick_shutdown, control)); SignalHandler::set_handler(SIGTERM, []() { control->receive_quick_shutdown(); });
SignalHandler::set_handler(SIGWINCH, std::bind(&display::Manager::force_redraw, control->display())); SignalHandler::set_handler(SIGWINCH, []() { control->display()->force_redraw(); });
SignalHandler::set_sigaction_handler(SIGBUS, &handle_sigbus); SignalHandler::set_sigaction_handler(SIGBUS, &handle_sigbus);
@@ -163,8 +163,6 @@ main(int argc, char** argv) {
torrent::initialize(); torrent::initialize();
torrent::main_thread::set_client_callback(&client_perform); torrent::main_thread::set_client_callback(&client_perform);
torrent::runtime::initialize_worker_process();
scgi::ThreadScgi::create_thread(); scgi::ThreadScgi::create_thread();
session::ThreadSession::create_thread(); session::ThreadSession::create_thread();
@@ -464,6 +462,8 @@ main(int argc, char** argv) {
control->ui()->load_input_history(); control->ui()->load_input_history();
torrent::net_thread::http_stack()->set_user_agent(USER_AGENT); torrent::net_thread::http_stack()->set_user_agent(USER_AGENT);
torrent::runtime::initialize_worker_process();
torrent::runtime::initialize_network(); torrent::runtime::initialize_network();
// Load session torrents and perform scheduled tasks to ensure session torrents are loaded // Load session torrents and perform scheduled tasks to ensure session torrents are loaded
src/setup.cc
+2 -2
View File
@@ -131,8 +131,8 @@ parse_config_file_comments(const std::string& category, const std::string& path)
if (equal_pos == std::string::npos) if (equal_pos == std::string::npos)
throw torrent::input_error("Invalid command in config file comment: " + line); throw torrent::input_error("Invalid command in config file comment: " + line);
std::string command = line.substr(5, equal_pos - 5); auto command = line.substr(prefix.size(), equal_pos - prefix.size());
std::string args = line.substr(equal_pos + 1); auto args = line.substr(equal_pos + 1);
if (command.empty()) if (command.empty())
throw torrent::input_error("Invalid command in config file comment: " + line); throw torrent::input_error("Invalid command in config file comment: " + line);