X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Fsettings.cc;h=11dfe31b7d9b4478af16a457cb1e42863602e0c0;hp=4e026929dd779c8dfbffaa0dfa98b26f15f6a928;hb=e0fb747f2e647115d0b8953615c254d25c045345;hpb=449366f5f32d24f2a2a6589da6e16b2bf0d61773

diff --git a/src/moof/settings.cc b/src/moof/settings.cc
index 4e02692..11dfe31 100644
--- a/src/moof/settings.cc
+++ b/src/moof/settings.cc
@@ -9,7 +9,7 @@
 *
 **************************************************************************/
 
-#include <cstdlib>		// getenv
+#include <stlplus/portability/file_system.hpp>
 
 #include "log.hh"
 #include "settings.hh"
@@ -41,8 +41,7 @@ void settings::parse_args(int argc, char* argv[])
 		{
 			std::string str;
 			script_[-1].get(str);
-			log_warning << "invalid option: " << argv[i]
-					   << ": " << str << std::endl;
+			log_warning("invalid option", argv[i], "returned", str);
 			script_.clear_stack();
 		}
 	}
@@ -59,19 +58,10 @@ void settings::load_files(const std::string& path)
 
 void settings::load_files(const std::vector<std::string>& path)
 {
-	std::vector<std::string> copy(path);
-	std::vector<std::string>::iterator it;
-
-#if defined(_WIN32)
-	char* homeDrive = getenv("HOMEDRIVE");
-	char* homePath = getenv("HOMEPATH");
-	std::string home(homeDrive ? homeDrive : "");
-	if (homePath) home += homePath;
-#else
-	char *homePath = getenv("HOME");
-	std::string home(homePath ? homePath : "");
-#endif
+	std::string home = stlplus::folder_home();
 
+	std::vector<std::string>::iterator it;
+	std::vector<std::string> copy(path);
 	for (it = copy.begin(); it != copy.end(); ++it)
 	{
 		if (!home.empty())