X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Fdir.cpp;h=9c6a97a8318ceaccb77c2d708f7ae65a45f3d951;hp=0b6873277d4feb014d76df62afdde602d0679698;hb=edf916d784e503505ddac2acef6f3e9a72abb0d6;hpb=2a6afe61db5603d508468adbd538ad4e96acc3fc

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index 0b68732..9c6a97a 100644
--- 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>
@@ -47,7 +48,8 @@ const Path &get_bin_dir(const string &argv0)
 					break;
 				}
 		}
-		else
+
+		if(exe.empty())
 			exe = realpath(argv0);
 
 		last_argv0 = argv0;
@@ -128,14 +130,19 @@ list<string> list_filtered(const Path &path, const string &filter)
 	return result;
 }
 
-Path getcwd()
+Path get_user_data_dir()
 {
-	char buf[1024];
-	return ::getcwd(buf, sizeof(buf));
+	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")
@@ -149,8 +156,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")
@@ -161,8 +179,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")
@@ -171,10 +200,31 @@ Path get_sys_lib_dir(const string &argv0, const string &appname)
 		return dir;
 }
 
-void chdir(const Path &path)
+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());
+}
+
+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)
 {
-	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