Style update: spaces around assignments

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

diff --git a/source/dir.cpp b/source/dir.cpp
index 612d017dd1735f1829e3db0c1cfe6f16c7659142..ad2e013085024fbbcfaf54d3cf154f0a256711a2 100644 (file)
--- a/source/dir.cpp
+++ b/source/dir.cpp
@@ -14,6 +14,7 @@ Distributed under the LGPL
 #endif
 #include <msp/core/except.h>
 #include <msp/strings/regex.h>
+#include <msp/strings/utils.h>
 #include "dir.h"
 #include "path.h"
 #include "stat.h"
@@ -24,15 +25,53 @@ using namespace std;
 namespace Msp {
 namespace FS {
 
+namespace
+{
+
+/**
+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)
+{
+       static string last_argv0;
+       static Path bin_dir;
+
+       if(!(argv0==last_argv0))
+       {
+               Path exe;
+               if(argv0.find('/')==string::npos)
+               {
+                       const char *path = getenv("PATH");
+                       vector<string> dirs = split(path, ':');
+                       for(vector<string>::const_iterator i=dirs.begin(); i!=dirs.end(); ++i)
+                               if(exists(Path(*i)/argv0))
+                               {
+                                       exe = realpath(Path(*i)/argv0);
+                                       break;
+                               }
+               }
+               else
+                       exe = realpath(argv0);
+
+               last_argv0 = argv0;
+               bin_dir = dirname(exe);
+       }
+
+       return bin_dir;
+}
+
+}
+
 void mkdir(const Path &path, int mode)
 {
        int err;
 #ifdef WIN32
        // The win32 version of this function doesn't take the mode argument.  Go figure.
        (void)mode;
-       err=::mkdir(path.str().c_str());
+       err = ::mkdir(path.str().c_str());
 #else
-       err=::mkdir(path.str().c_str(), mode);
+       err = ::mkdir(path.str().c_str(), mode);
 #endif
 
        if(err==-1)
@@ -44,13 +83,13 @@ void mkpath(const Path &path, int mode)
        Path p;
        for(Path::Iterator i=path.begin(); i!=path.end(); ++i)
        {
-               p/=*i;
+               p /= *i;
 #ifdef WIN32
-               if(p.size()==1 && is_windows_drive(*i))
+               if(p.size()==1 && p.is_absolute())
                        continue;
 #endif
                struct stat st;
-               int err=stat(p, st);
+               int err = stat(p, st);
                if(err==0)
                {
                        if(!S_ISDIR(st.st_mode))
@@ -72,11 +111,11 @@ void rmdir(const Path &path)
 
 void rmdirs(const Path &path)
 {
-       list<string> files=list_files(path);
+       list<string> files = list_files(path);
        for(list<string>::iterator i=files.begin(); i!=files.end(); ++i)
        {
-               Path p=path / *i;
-               struct stat st=stat(p.str().c_str());
+               Path p = path / *i;
+               struct stat st = stat(p.str().c_str());
                if(S_ISDIR(st.st_mode))
                        rmdirs(p);
                else
@@ -96,12 +135,12 @@ list<string> list_filtered(const Path &path, const string &filter)
        Regex r_filter(filter);
 
        list<string> result;
-       DIR *dir=opendir(path.str().c_str());
+       DIR *dir = opendir(path.str().c_str());
        if(dir)
        {
-               while(dirent *de=readdir(dir))
+               while(dirent *de = readdir(dir))
                {
-                       const char *fn=de->d_name;
+                       const char *fn = de->d_name;
                        if(fn[0]=='.' && (fn[1]==0 || (fn[1]=='.' && fn[2]==0))) 
                                continue;
                        if(r_filter.match(fn))
@@ -126,7 +165,7 @@ Path get_home_dir()
        if(SHGetFolderPath(0, CSIDL_PERSONAL, 0, 0, home)==S_OK)
                return home;
 #else
-       const char *home=getenv("HOME");
+       const char *home = getenv("HOME");
        if(home)
                return home;
 #endif
@@ -145,6 +184,41 @@ Path get_user_data_dir(const string &appname)
 #endif
 }
 
+Path get_sys_conf_dir(const string &argv0)
+{
+       Path dir = get_bin_dir(argv0);
+
+       if(dir[-1]=="bin" || dir[-1]=="sbin")
+       {
+               dir /= "..";
+               if(dir[-1]=="usr")
+                       dir /= "..";
+               return dir/"etc";
+       }
+       else
+               return dir;
+}
+
+Path get_sys_data_dir(const string &argv0, const string &appname)
+{
+       Path dir = get_bin_dir(argv0);
+
+       if(dir[-1]=="bin" || dir[-1]=="sbin")
+               return dir/".."/"share"/appname;
+       else
+               return dir;
+}
+
+Path get_sys_lib_dir(const string &argv0, const string &appname)
+{
+       Path dir = get_bin_dir(argv0);
+
+       if(dir[-1]=="bin" || dir[-1]=="sbin")
+               return dir/".."/"lib"/appname;
+       else
+               return dir;
+}
+
 void chdir(const Path &path)
 {
        if(::chdir(path.str().c_str())==-1)