Add wrappers for environment manipulation functions

[libs/core.git] / source / fs / dir.cpp

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index df85e352ee78c05874b40ac6d406c421db816a04..218a7a5cf75e0b8a1a05576bf4d5893423f02ec9 100644 (file)
--- a/source/fs/dir.cpp
+++ b/source/fs/dir.cpp
@@ -1,7 +1,6 @@
-#include <cstdlib>
-#include <unistd.h>
 #include <dirent.h>
 #include <msp/core/application.h>
+#include <msp/core/environ.h>
 #include <msp/core/systemerror.h>
 #include <msp/strings/regex.h>
 #include <msp/strings/utils.h>
@@ -20,7 +19,7 @@ namespace
 
 enum
 {
-#ifdef WIN32
+#ifdef _WIN32
        ITEMSEP = ';'
 #else
        ITEMSEP = ':'
@@ -37,16 +36,18 @@ const Path &get_bin_dir(const string &argv0)
        if(!(argv0==last_argv0))
        {
                Path exe;
-               if(argv0.find('/')==string::npos)
+               if(argv0.find(DIRSEP)==string::npos)
                {
-                       const char *path = getenv("PATH");
-                       vector<string> dirs = split(path, ITEMSEP);
-                       for(vector<string>::const_iterator i=dirs.begin(); i!=dirs.end(); ++i)
-                               if(exists(Path(*i)/argv0))
-                               {
-                                       exe = realpath(Path(*i)/argv0);
-                                       break;
-                               }
+                       string path = getenv("PATH");
+                       if(!path.empty())
+                       {
+                               for(const string &d: split(path, ITEMSEP))
+                                       if(exists(Path(d)/argv0))
+                                       {
+                                               exe = realpath(Path(d)/argv0);
+                                               break;
+                                       }
+                       }
                }
 
                if(exe.empty())
@@ -70,10 +71,10 @@ not_a_directory::not_a_directory(const Path &p):
 void mkpath(const Path &path, int mode)
 {
        Path p;
-       for(Path::Iterator i=path.begin(); i!=path.end(); ++i)
+       for(const string &c: path)
        {
-               p /= *i;
-#ifdef WIN32
+               p /= c;
+#ifdef _WIN32
                if(p.size()==1 && p.is_absolute())
                        continue;
 #endif
@@ -90,10 +91,9 @@ void mkpath(const Path &path, int mode)
 
 void rmpath(const Path &path)
 {
-       list<string> files = list_files(path);
-       for(list<string>::iterator i=files.begin(); i!=files.end(); ++i)
+       for(const string &f: list_files(path))
        {
-               Path p = path / *i;
+               Path p = path/f;
                if(is_dir(p))
                        rmpath(p);
                else
@@ -103,16 +103,16 @@ void rmpath(const Path &path)
        rmdir(path);
 }
 
-list<string> list_files(const Path &path)
+vector<string> list_files(const Path &path)
 {
        return list_filtered(path, string());
 }
 
-list<string> list_filtered(const Path &path, const string &filter)
+vector<string> list_filtered(const Path &path, const string &filter)
 {
        Regex r_filter(filter);
 
-       list<string> result;
+       vector<string> result;
        DIR *dir = opendir(path.str().c_str());
        if(!dir)
                throw system_error("opendir");
@@ -130,24 +130,11 @@ list<string> list_filtered(const Path &path, const string &filter)
        return result;
 }
 
-Path getcwd()
-{
-       char buf[1024];
-       return ::getcwd(buf, sizeof(buf));
-}
-
-Path get_user_data_dir()
-{
-       const string &name = Application::get_name();
-       if(name.empty())
-               throw logic_error("application name not known");
-       return get_user_data_dir(name);
-}
-
-Path get_sys_conf_dir(const string &argv0)
+Path get_sys_conf_dir()
 {
-       if(argv0.empty())
-               throw invalid_argument("get_sys_conf_dir");
+       const char *argv0 = Application::get_argv0();
+       if(!argv0)
+               throw logic_error("no startup command");
 
        Path dir = get_bin_dir(argv0);
 
@@ -162,69 +149,41 @@ Path get_sys_conf_dir(const string &argv0)
                return dir;
 }
 
-Path get_sys_conf_dir()
+Path get_sys_data_dir()
 {
        const char *argv0 = Application::get_argv0();
        if(!argv0)
                throw logic_error("no startup command");
-       return get_sys_conf_dir(argv0);
-}
-
-Path get_sys_data_dir(const string &argv0, const string &appname)
-{
-       if(argv0.empty() || appname.empty())
-               throw invalid_argument("get_sys_data_dir");
 
        Path dir = get_bin_dir(argv0);
 
        if(dir[-1]=="bin" || dir[-1]=="sbin")
-               return dir/".."/"share"/appname;
+               return dir/".."/"share"/Application::get_name();
        else if(dir[-1]=="MacOS")
                return dir/".."/"Resources";
        else
                return dir;
 }
 
-Path get_sys_data_dir()
+Path get_sys_lib_dir()
 {
        const char *argv0 = Application::get_argv0();
        if(!argv0)
                throw logic_error("no startup command");
-       return get_sys_data_dir(argv0, Application::get_name());
-}
-
-Path get_sys_lib_dir(const string &argv0, const string &appname)
-{
-       if(argv0.empty() || appname.empty())
-               throw invalid_argument("get_sys_data_dir");
 
        Path dir = get_bin_dir(argv0);
 
        if(dir[-1]=="bin" || dir[-1]=="sbin")
-               return dir/".."/"lib"/appname;
+               return dir/".."/"lib"/Application::get_name();
        else
                return dir;
 }
 
-Path get_sys_lib_dir()
-{
-       const char *argv0 = Application::get_argv0();
-       if(!argv0)
-               throw logic_error("no startup command");
-       return get_sys_lib_dir(argv0, Application::get_name());
-}
-
-void chdir(const Path &path)
-{
-       if(::chdir(path.str().c_str())==-1)
-               throw system_error("chdir");
-}
-
-Path path_lookup(const string &name, const list<Path> &paths)
+Path path_lookup(const string &name, const vector<Path> &paths)
 {
-       for(list<Path>::const_iterator i=paths.begin(); i!=paths.end(); ++i)
+       for(const Path &p: paths)
        {
-               Path full = *i/name;
+               Path full = p/name;
                if(exists(full))
                        return realpath(full);
        }
@@ -234,9 +193,9 @@ Path path_lookup(const string &name, const list<Path> &paths)
 
 Path path_lookup(const string &name)
 {
-       const char *path = getenv("PATH");
+       string path = getenv("PATH");
        vector<string> dirs = split(path, ITEMSEP);
-       return path_lookup(name, list<Path>(dirs.begin(), dirs.end()));
+       return path_lookup(name, vector<Path>(dirs.begin(), dirs.end()));
 }
 
 } // namespace FS