Use correct directory separator to check for absolute binary path

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

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index ffe56708bffeb85552839e6867663470b9b0a418..be471628ceac105de600b341107ff2064a0bc090 100644 (file)
--- a/source/fs/dir.cpp
+++ b/source/fs/dir.cpp
@@ -20,7 +20,7 @@ namespace
 
 enum
 {
-#ifdef WIN32
+#ifdef _WIN32
        ITEMSEP = ';'
 #else
        ITEMSEP = ':'
@@ -37,7 +37,7 @@ 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);
@@ -73,7 +73,7 @@ void mkpath(const Path &path, int mode)
        for(Path::Iterator i=path.begin(); i!=path.end(); ++i)
        {
                p /= *i;
-#ifdef WIN32
+#ifdef _WIN32
                if(p.size()==1 && p.is_absolute())
                        continue;
 #endif
@@ -130,24 +130,16 @@ list<string> list_filtered(const Path &path, const string &filter)
        return result;
 }
 
-Path getcwd()
+Path get_sys_conf_dir(const string &)
 {
-       char buf[1024];
-       return ::getcwd(buf, sizeof(buf));
+       return get_sys_conf_dir();
 }
 
-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();
-}
-
-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,62 +154,63 @@ Path get_sys_conf_dir(const string &argv0)
                return dir;
 }
 
-Path get_sys_conf_dir()
+Path get_sys_data_dir(const string &, const string &)
 {
-       const char *argv0 = Application::get_argv0();
-       if(!argv0)
-               throw logic_error("no startup command");
-       return get_sys_conf_dir(argv0);
+       return get_sys_data_dir();
 }
 
-Path get_sys_data_dir(const string &argv0, const string &appname)
+Path get_sys_data_dir()
 {
-       if(argv0.empty() || appname.empty())
-               throw invalid_argument("get_sys_data_dir");
+       const char *argv0 = Application::get_argv0();
+       if(!argv0)
+               throw logic_error("no startup command");
 
        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 string &, const string &)
 {
-       const char *argv0 = Application::get_argv0();
-       if(!argv0)
-               throw logic_error("no startup command");
-       return get_sys_data_dir(argv0, Application::get_name());
+       return get_sys_lib_dir();
 }
 
-Path get_sys_lib_dir(const string &argv0, const string &appname)
+Path get_sys_lib_dir()
 {
-       if(argv0.empty() || appname.empty())
-               throw invalid_argument("get_sys_data_dir");
+       const char *argv0 = Application::get_argv0();
+       if(!argv0)
+               throw logic_error("no startup command");
 
        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()
+Path path_lookup(const string &name, const list<Path> &paths)
 {
-       const char *argv0 = Application::get_argv0();
-       if(!argv0)
-               throw logic_error("no startup command");
-       return get_sys_lib_dir(argv0, Application::get_name());
+       for(list<Path>::const_iterator i=paths.begin(); i!=paths.end(); ++i)
+       {
+               Path full = *i/name;
+               if(exists(full))
+                       return realpath(full);
+       }
+
+       return Path();
 }
 
-void chdir(const Path &path)
+Path path_lookup(const string &name)
 {
-       if(::chdir(path.str().c_str())==-1)
-               throw system_error("chdir");
+       const char *path = getenv("PATH");
+       vector<string> dirs = split(path, ITEMSEP);
+       return path_lookup(name, list<Path>(dirs.begin(), dirs.end()));
 }
 
 } // namespace FS