Fix an infinite recursion bug

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

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index f77584708bb20a94d01496da33465dd0ffec40c7..df85e352ee78c05874b40ac6d406c421db816a04 100644 (file)
--- a/source/fs/dir.cpp
+++ b/source/fs/dir.cpp
@@ -1,6 +1,7 @@
 #include <cstdlib>
 #include <unistd.h>
 #include <dirent.h>
+#include <msp/core/application.h>
 #include <msp/core/systemerror.h>
 #include <msp/strings/regex.h>
 #include <msp/strings/utils.h>
@@ -17,6 +18,15 @@ namespace FS {
 namespace
 {
 
+enum
+{
+#ifdef WIN32
+       ITEMSEP = ';'
+#else
+       ITEMSEP = ':'
+#endif
+};
+
 /** Helper function to determine the location of the program's executable.
 Caches the last result to cut down filesystem access with repeated calls. */
 const Path &get_bin_dir(const string &argv0)
@@ -30,7 +40,7 @@ const Path &get_bin_dir(const string &argv0)
                if(argv0.find('/')==string::npos)
                {
                        const char *path = getenv("PATH");
-                       vector<string> dirs = split(path, ':');
+                       vector<string> dirs = split(path, ITEMSEP);
                        for(vector<string>::const_iterator i=dirs.begin(); i!=dirs.end(); ++i)
                                if(exists(Path(*i)/argv0))
                                {
@@ -38,7 +48,8 @@ const Path &get_bin_dir(const string &argv0)
                                        break;
                                }
                }
-               else
+
+               if(exe.empty())
                        exe = realpath(argv0);
 
                last_argv0 = argv0;
@@ -103,18 +114,18 @@ list<string> list_filtered(const Path &path, const string &filter)
 
        list<string> result;
        DIR *dir = opendir(path.str().c_str());
-       if(dir)
+       if(!dir)
+               throw system_error("opendir");
+
+       while(dirent *de = readdir(dir))
        {
-               while(dirent *de = readdir(dir))
-               {
-                       const char *fn = de->d_name;
-                       if(fn[0]=='.' && (fn[1]==0 || (fn[1]=='.' && fn[2]==0))) 
-                               continue;
-                       if(r_filter.match(fn))
-                               result.push_back(fn);
-               }
-               closedir(dir);
+               const char *fn = de->d_name;
+               if(fn[0]=='.' && (fn[1]==0 || (fn[1]=='.' && fn[2]==0))) 
+                       continue;
+               if(r_filter.match(fn))
+                       result.push_back(fn);
        }
+       closedir(dir);
 
        return result;
 }
@@ -125,8 +136,19 @@ Path getcwd()
        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)
 {
+       if(argv0.empty())
+               throw invalid_argument("get_sys_conf_dir");
+
        Path dir = get_bin_dir(argv0);
 
        if(dir[-1]=="bin" || dir[-1]=="sbin")
@@ -140,8 +162,19 @@ Path get_sys_conf_dir(const string &argv0)
                return dir;
 }
 
+Path get_sys_conf_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")
@@ -152,8 +185,19 @@ Path get_sys_data_dir(const string &argv0, const string &appname)
                return dir;
 }
 
+Path get_sys_data_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")
@@ -162,11 +206,38 @@ Path get_sys_lib_dir(const string &argv0, const string &appname)
                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)
+{
+       for(list<Path>::const_iterator i=paths.begin(); i!=paths.end(); ++i)
+       {
+               Path full = *i/name;
+               if(exists(full))
+                       return realpath(full);
+       }
+
+       return Path();
+}
+
+Path path_lookup(const string &name)
+{
+       const char *path = getenv("PATH");
+       vector<string> dirs = split(path, ITEMSEP);
+       return path_lookup(name, list<Path>(dirs.begin(), dirs.end()));
+}
+
 } // namespace FS
 } // namespace Msp