X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=8447eed669d2b8f58c9b078b547b1543b0bab27f;hp=0ef9507a14275af33fadbd1a73f190528e8f1601;hb=41363aed34382386f915f17c1a961750b4fdcb14;hpb=ce0b610396aa8f760462fa4d7a6bb207a43994d2

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 0ef9507..8447eed 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,9 +1,13 @@
+#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 <msp/strings/utils.h>
 #include "application.h"
 #include "getopt.h"
 
@@ -11,27 +15,26 @@ using namespace std;
 
 namespace Msp {
 
-Application *Application::app_ = 0;
-Application::Starter *Application::starter_ = 0;
-const char *Application::argv0_ = 0;
-string Application::name_;
-void *Application::data_ = 0;
+Application *Application::_app = nullptr;
+Application::Starter *Application::_starter = nullptr;
+const char *Application::_argv0 = nullptr;
+string Application::_name;
+void *Application::_data = nullptr;
 
-Application::Application(const string &n):
-	exit_code(0)
+Application::Application(const string &n)
 {
-	if(app_)
+	if(_app)
 		throw logic_error("instance already exists");
 
 	if(!n.empty())
-		name_ = n;
+		_name = n;
 	else
-		name_ = FS::basename(argv0_);
+		_name = FS::basename(_argv0);
 }
 
 int Application::run(int argc, char **argv, void *data, void (*created_callback)(void *))
 {
-	if(!starter_)
+	if(!_starter)
 	{
 		IO::cerr.write("Application::run called with no RegisteredApplication class!\n");
 		return 126;
@@ -43,7 +46,7 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
 	{
 		try
 		{
-			app_ = starter_->create_app(argc, argv);
+			_app = _starter->create_app(argc, argv);
 		}
 		catch(const usage_error &e)
 		{
@@ -54,9 +57,9 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
 		if(created_callback)
 			created_callback(data);
 
-		int result = app_->main();
-		Application *a = app_;
-		app_ = 0;
+		int result = _app->main();
+		Application *a = _app;
+		_app = nullptr;
 		delete a;
 		return result;
 	}
@@ -70,11 +73,19 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
 		{
 			IO::print(IO::cerr, "An uncaught exception occurred.\n");
 			IO::print(IO::cerr, "  type:   %s\n", Debug::demangle(typeid(e).name()));
-			IO::print(IO::cerr, "  what(): %s\n", e.what());
+			vector<string> lines = split(e.what(), '\n');
+			if(lines.size()<2)
+				IO::print(IO::cerr, "  what(): %s\n", e.what());
+			else
+			{
+				IO::print(IO::cerr, "  what(): %s\n", lines.front());
+				for(auto i=lines.begin(); ++i!=lines.end(); )
+					IO::print(IO::cerr, "          %s\n", *i);
+			}
 		}
 
-		delete app_;
-		app_ = 0;
+		delete _app;
+		_app = nullptr;
 
 		return 124;
 	}
@@ -82,11 +93,28 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
 
 void Application::set_startup_info(const char *argv0, void *data)
 {
-	if(argv0_)
+	if(_argv0)
 		throw logic_error("startup info already set");
 
-	argv0_ = argv0;
-	data_ = data;
+	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()
@@ -100,7 +128,7 @@ int Application::main()
 
 void Application::catch_signal(int s)
 {
-	signal(s, &sighandler_);
+	signal(s, &_sighandler);
 }
 
 void Application::exit(int c)
@@ -109,18 +137,18 @@ void Application::exit(int c)
 	exit_code = c;
 }
 
-void Application::sighandler_(int s)
+void Application::_sighandler(int s)
 {
-	app_->sighandler(s);
+	_app->sighandler(s);
 }
 
 
 Application::Starter::Starter()
 {
-	if(starter_)
+	if(_starter)
 		throw logic_error("Can't create more than one Starter instance");
 
-	starter_ = this;
+	_starter = this;
 }
 
 } // namespace Msp