*
**************************************************************************/
-#include <cstdlib> // getenv
+#include <stlplus/portability/file_system.hpp>
#include "log.hh"
#include "settings.hh"
{
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();
}
}
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())