-#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/core/environ.h>
+#include <msp/core/except.h>
#include <msp/strings/utils.h>
#include "dir.h"
#include "path.h"
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())
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;
+ p /= c;
#ifdef _WIN32
if(p.size()==1 && p.is_absolute())
continue;
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
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)
-{
- Regex r_filter(filter);
-
- list<string> result;
- DIR *dir = opendir(path.str().c_str());
- if(!dir)
- throw system_error("opendir");
-
- 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);
-
- return result;
-}
-
-Path get_sys_conf_dir(const string &)
-{
- return get_sys_conf_dir();
-}
-
Path get_sys_conf_dir()
{
const char *argv0 = Application::get_argv0();
if(!argv0)
- throw logic_error("no startup command");
+ throw invalid_state("no startup command");
Path dir = get_bin_dir(argv0);
return dir;
}
-Path get_sys_data_dir(const string &, const string &)
-{
- return get_sys_data_dir();
-}
-
Path get_sys_data_dir()
{
const char *argv0 = Application::get_argv0();
if(!argv0)
- throw logic_error("no startup command");
+ throw invalid_state("no startup command");
Path dir = get_bin_dir(argv0);
return dir;
}
-Path get_sys_lib_dir(const string &, const string &)
-{
- return get_sys_lib_dir();
-}
-
Path get_sys_lib_dir()
{
const char *argv0 = Application::get_argv0();
if(!argv0)
- throw logic_error("no startup command");
+ throw invalid_state("no startup command");
Path dir = get_bin_dir(argv0);
return dir;
}
-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);
}
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