X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ffs%2Fdir.cpp;h=ffe56708bffeb85552839e6867663470b9b0a418;hb=cc7c798b275b8ea9992eb82d68177ecfd50e0974;hp=2ae5122e63768492f54274a7b7062e861445a094;hpb=f2fbac3ccb4960c4a3d057f641c28dba10ebf799;p=libs%2Fcore.git

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index 2ae5122..ffe5670 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>
@@ -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;
@@ -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();
+}
+
 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,6 +206,14 @@ 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)