X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Fdir.cpp;h=8625b783ef464357439833a0d3685175ab40041a;hp=bd9eaa59fe06ad933209f5331b12e86a0ae6a0a5;hb=9e98607f1b6a2c757de51fca6c1649cbdf536597;hpb=2d608d773f3494e84cb154bdbb07954e87d9af86

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index bd9eaa5..8625b78 100644
--- a/source/fs/dir.cpp
+++ b/source/fs/dir.cpp
@@ -130,18 +130,16 @@ list<string> list_filtered(const Path &path, const string &filter)
 	return result;
 }
 
-Path get_user_data_dir()
+Path get_sys_conf_dir(const string &)
 {
-	const string &name = Application::get_name();
-	if(name.empty())
-		throw logic_error("application name not known");
-	return get_user_data_dir(name);
+	return get_sys_conf_dir();
 }
 
-Path get_sys_conf_dir(const string &argv0)
+Path get_sys_conf_dir()
 {
-	if(argv0.empty())
-		throw invalid_argument("get_sys_conf_dir");
+	const char *argv0 = Application::get_argv0();
+	if(!argv0)
+		throw logic_error("no startup command");
 
 	Path dir = get_bin_dir(argv0);
 
@@ -156,58 +154,46 @@ Path get_sys_conf_dir(const string &argv0)
 		return dir;
 }
 
-Path get_sys_conf_dir()
+Path get_sys_data_dir(const string &, const string &)
 {
-	const char *argv0 = Application::get_argv0();
-	if(!argv0)
-		throw logic_error("no startup command");
-	return get_sys_conf_dir(argv0);
+	return get_sys_data_dir();
 }
 
-Path get_sys_data_dir(const string &argv0, const string &appname)
+Path get_sys_data_dir()
 {
-	if(argv0.empty() || appname.empty())
-		throw invalid_argument("get_sys_data_dir");
+	const char *argv0 = Application::get_argv0();
+	if(!argv0)
+		throw logic_error("no startup command");
 
 	Path dir = get_bin_dir(argv0);
 
 	if(dir[-1]=="bin" || dir[-1]=="sbin")
-		return dir/".."/"share"/appname;
+		return dir/".."/"share"/Application::get_name();
 	else if(dir[-1]=="MacOS")
 		return dir/".."/"Resources";
 	else
 		return dir;
 }
 
-Path get_sys_data_dir()
+Path get_sys_lib_dir(const string &, const string &)
 {
-	const char *argv0 = Application::get_argv0();
-	if(!argv0)
-		throw logic_error("no startup command");
-	return get_sys_data_dir(argv0, Application::get_name());
+	return get_sys_lib_dir();
 }
 
-Path get_sys_lib_dir(const string &argv0, const string &appname)
+Path get_sys_lib_dir()
 {
-	if(argv0.empty() || appname.empty())
-		throw invalid_argument("get_sys_lib_dir");
+	const char *argv0 = Application::get_argv0();
+	if(!argv0)
+		throw logic_error("no startup command");
 
 	Path dir = get_bin_dir(argv0);
 
 	if(dir[-1]=="bin" || dir[-1]=="sbin")
-		return dir/".."/"lib"/appname;
+		return dir/".."/"lib"/Application::get_name();
 	else
 		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());
-}
-
 Path path_lookup(const string &name, const list<Path> &paths)
 {
 	for(list<Path>::const_iterator i=paths.begin(); i!=paths.end(); ++i)