From 4a50cd7f46234ed70ba67665def4a4953be5d310 Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss@sss.chaoslab.ru>
Date: Wed, 9 Nov 2011 02:04:28 +0200
Subject: better path's handling

---
 server/proxy_ui_server.workspace |  1 +
 server/server/config.cpp         | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'server')

diff --git a/server/proxy_ui_server.workspace b/server/proxy_ui_server.workspace
index 075d714..30e9c53 100644
--- a/server/proxy_ui_server.workspace
+++ b/server/proxy_ui_server.workspace
@@ -12,6 +12,7 @@
   <Environment>
     <![CDATA[
   
+  
   ]]>
   </Environment>
 </CodeLite_Workspace>
diff --git a/server/server/config.cpp b/server/server/config.cpp
index b6b343d..1fa6ca2 100644
--- a/server/server/config.cpp
+++ b/server/server/config.cpp
@@ -60,7 +60,11 @@ void config::load_proxy_list(char *pth)
 {
 	std::ifstream config;
 	if(!pth)
-		config.open("./proxy_list.cfg", std::fstream::in);
+	{
+		std::string cfg_path = boost::filesystem::initial_path().string();
+		cfg_path += "/proxy_list.cfg";
+		config.open(cfg_path.c_str(), std::fstream::in);
+	}
 	else
 		config.open(pth, std::fstream::in);
 	std::string cfg_str((std::istreambuf_iterator<char>(config)), std::istreambuf_iterator<char>());
@@ -128,7 +132,11 @@ void config::load_static_proxy_list(char *pth)
 {
 	std::ifstream config;
 	if(!pth)
-		config.open("./static_proxy_list.cfg", std::fstream::in);
+	{
+		std::string cfg_path = boost::filesystem::initial_path().string();
+		cfg_path += "/static_proxy_list.cfg";
+		config.open(cfg_path.c_str(), std::fstream::in);
+	}
 	else
 		config.open(pth, std::fstream::in);
 	std::string cfg_str((std::istreambuf_iterator<char>(config)), std::istreambuf_iterator<char>());
@@ -189,7 +197,11 @@ void config::load_firewall_list(char* pth)
 {
 	std::ifstream config;
 	if(!pth)
-		config.open("./firewall_list.cfg", std::fstream::in);
+	{
+		std::string cfg_path = boost::filesystem::initial_path().string();
+		cfg_path += "/firewall_list.cfg";
+		config.open(cfg_path.c_str(), std::fstream::in);
+	}
 	else
 		config.open(pth, std::fstream::in);
 	std::string cfg_str((std::istreambuf_iterator<char>(config)), std::istreambuf_iterator<char>());
-- 
cgit v1.2.3