diff options
Diffstat (limited to 'server/server/config.cpp')
| -rwxr-xr-x | server/server/config.cpp | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp index 4d9f960..ac0f95e 100755 --- a/server/server/config.cpp +++ b/server/server/config.cpp @@ -155,12 +155,14 @@ void config::load_servers_list(char* pth) } else config.open(pth, std::fstream::in); + if(!config.is_open()) + return; + if(!servers_list.empty()) + servers_list.clear(); std::string cfg_str((std::istreambuf_iterator<char>(config)), std::istreambuf_iterator<char>()); config.close(); if(!cfg_str.empty()) { - if(!servers_list.empty()) - servers_list.clear(); std::string::size_type p1 = 0, p2 = 0, l = 1; if(cfg_str.find("\r\n") != std::string::npos) l = 2; @@ -196,12 +198,14 @@ void config::load_upload_list(char *pth) } else config.open(pth, std::fstream::in); + if(!config.is_open()) + return; + if(!upload_list.empty()) + upload_list.clear(); std::string cfg_str((std::istreambuf_iterator<char>(config)), std::istreambuf_iterator<char>()); config.close(); if(!cfg_str.empty()) { - if(!upload_list.empty()) - upload_list.clear(); std::string::size_type p1 = 0, p2 = 0, l = 1; if(cfg_str.find("\r\n") != std::string::npos) l = 2; @@ -258,12 +262,14 @@ void config::load_proxy_list(char *pth) } else config.open(pth, std::fstream::in); + if(!config.is_open()) + return; + if(!proxy_list.empty()) + proxy_list.clear(); std::string cfg_str((std::istreambuf_iterator<char>(config)), std::istreambuf_iterator<char>()); config.close(); if(!cfg_str.empty()) { - if(!proxy_list.empty()) - proxy_list.clear(); std::string::size_type p1 = 0, p2 = 0, l = 1; if(cfg_str.rfind("\r\n") != std::string::npos) l = 2; @@ -343,12 +349,14 @@ void config::load_static_proxy_list(char *pth) } else config.open(pth, std::fstream::in); + if(!config.is_open()) + return; + if(!static_proxy_list.empty()) + static_proxy_list.clear(); std::string cfg_str((std::istreambuf_iterator<char>(config)), std::istreambuf_iterator<char>()); config.close(); if(!cfg_str.empty()) { - if(!static_proxy_list.empty()) - static_proxy_list.clear(); std::string::size_type p1 = 0, p2 = 0, l = 1; if(cfg_str.rfind("\r\n") != std::string::npos) l = 2; @@ -422,12 +430,14 @@ void config::load_firewall_list(char* pth) } else config.open(pth, std::fstream::in); + if(!config.is_open()) + return; + if(!firewall_list.empty()) + firewall_list.clear(); std::string cfg_str((std::istreambuf_iterator<char>(config)), std::istreambuf_iterator<char>()); config.close(); if(!cfg_str.empty()) { - if(!firewall_list.empty()) - firewall_list.clear(); std::string::size_type p1 = 0, p2 = 0, l = 1; // if(cfg_str.find("\r\n") != std::string::npos) // l = 2; @@ -455,12 +465,14 @@ void config::load_deleted_list(char* pth) } else config.open(pth, std::fstream::in); + if(!config.is_open()) + return; + if(!deleted_list.empty()) + deleted_list.clear(); std::string cfg_str((std::istreambuf_iterator<char>(config)), std::istreambuf_iterator<char>()); config.close(); if(!cfg_str.empty()) { - if(!deleted_list.empty()) - deleted_list.clear(); std::string::size_type p1 = 0, p2 = 0, l = 1; if(cfg_str.find("\r\n") != std::string::npos) l = 2; |