X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=aedaa4b6f25c027429f8bff1a5c069078206e7df;hp=f4887e756ff2ca64811b37bb7093c06157ff59b8;hb=d2795b92b02253a36cb7406fbaeabdef6d7caa19;hpb=231482c618cb2b30e1f7194d8d1d3ea30bc94512

diff --git a/source/core/application.cpp b/source/core/application.cpp
index f4887e7..aedaa4b 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,7 +1,10 @@
+#include <cstring>
 #include <typeinfo>
 #include <signal.h>
 #include <msp/debug/demangle.h>
 #include <msp/debug/errorreporter.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/path.h>
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include "application.h"
@@ -37,8 +40,7 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
 		return 126;
 	}
 
-	argv0_ = argv[0];
-	data_ = data;
+	set_startup_info(argv[0], data);
 
 	try
 	{
@@ -81,6 +83,32 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
 	}
 }
 
+void Application::set_startup_info(const char *argv0, void *data)
+{
+	if(argv0_)
+		throw logic_error("startup info already set");
+
+	static FS::Path exe;
+
+	if(!argv0 || !*argv0)
+	{
+#ifdef _WIN32
+		argv0 = "application.exe";
+#else
+		argv0 = "./application";
+#endif
+	}
+
+	bool has_slash = strchr(argv0, FS::DIRSEP);
+	if(!has_slash)
+		exe = FS::path_lookup(argv0);
+	if(exe.empty())
+		exe = FS::realpath(argv0);
+
+	argv0_ = exe.c_str();
+	data_ = data;
+}
+
 int Application::main()
 {
 	done = false;