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

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index 0b68732..be47162 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>
@@ -19,7 +20,7 @@ namespace
 
 enum
 {
-#ifdef WIN32
+#ifdef _WIN32
 	ITEMSEP = ';'
 #else
 	ITEMSEP = ':'
@@ -36,7 +37,7 @@ const Path &get_bin_dir(const string &argv0)
 	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);
@@ -47,7 +48,8 @@ const Path &get_bin_dir(const string &argv0)
 					break;
 				}
 		}
-		else
+
+		if(exe.empty())
 			exe = realpath(argv0);
 
 		last_argv0 = argv0;
@@ -71,7 +73,7 @@ void mkpath(const Path &path, int mode)
 	for(Path::Iterator i=path.begin(); i!=path.end(); ++i)
 	{
 		p /= *i;
-#ifdef WIN32
+#ifdef _WIN32
 		if(p.size()==1 && p.is_absolute())
 			continue;
 #endif
@@ -128,14 +130,17 @@ list<string> list_filtered(const Path &path, const string &filter)
 	return result;
 }
 
-Path getcwd()
+Path get_sys_conf_dir(const string &)
 {
-	char buf[1024];
-	return ::getcwd(buf, sizeof(buf));
+	return get_sys_conf_dir();
 }
 
-Path get_sys_conf_dir(const string &argv0)
+Path get_sys_conf_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")
@@ -149,32 +154,63 @@ Path get_sys_conf_dir(const string &argv0)
 		return dir;
 }
 
-Path get_sys_data_dir(const string &argv0, const string &appname)
+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");
+
 	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_lib_dir(const string &argv0, const string &appname)
+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");
+
 	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;
 }
 
-void chdir(const Path &path)
+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