fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-12 05:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up XDG_CONFIG_HOME patch.

Browse Source
This commit is contained in:
rakshasa
2016-03-10 04:21:24 +09:00
parent 4fb036f87d
commit a92da121d7
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cc
+4 -10
View File
@@ -835,19 +835,13 @@ main(int argc, char** argv) {
} else {
char* config_dir = std::getenv("XDG_CONFIG_HOME");
char* home_dir = std::getenv("HOME");
bool absolute_path = false;
if(config_dir && config_dir[0] == '/') {
absolute_path = true;
}
if(access((std::string(config_dir) + "/rtorrent/rtorrent.rc").c_str(), F_OK ) != -1 && absolute_path) {
if (config_dir != NULL && config_dir[0] == '/' &&
access((std::string(config_dir) + "/rtorrent/rtorrent.rc").c_str(), F_OK) != -1) {
rpc::parse_command_single(rpc::make_target(), "try_import = " + std::string(config_dir) + "/rtorrent/rtorrent.rc");
}
else if(access((std::string(home_dir) +"/.config/rtorrent/rtorrent.rc").c_str(), F_OK ) != -1) {
} else if (home_dir != NULL && access((std::string(home_dir) + "/.config/rtorrent/rtorrent.rc").c_str(), F_OK) != -1) {
rpc::parse_command_single(rpc::make_target(), "try_import = ~/.config/rtorrent/rtorrent.rc");
}
else {
} else {
rpc::parse_command_single(rpc::make_target(), "try_import = ~/.rtorrent.rc");
}
}