Store argv0 and application name in the Application class

[libs/core.git] / source / core / application.cpp

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 43bb023143679e7fdf5e64d893208f859222d973..f4887e756ff2ca64811b37bb7093c06157ff59b8 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -2,6 +2,7 @@
 #include <signal.h>
 #include <msp/debug/demangle.h>
 #include <msp/debug/errorreporter.h>
+#include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include "application.h"
 #include "getopt.h"
@@ -12,28 +13,31 @@ 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():
+Application::Application(const string &n):
        exit_code(0)
-{ }
-
-int Application::run(int argc, char **argv, void *data)
 {
-       static bool called = false;
-       if(called)
-       {
-               IO::cerr.write("Trying to call Application::run_app twice!\n");
-               return 125;
-       }
-       called = true;
+       if(app_)
+               throw logic_error("instance already exists");
+
+       if(!n.empty())
+               name_ = n;
+       else
+               name_ = FS::basename(argv0_);
+}
 
+int Application::run(int argc, char **argv, void *data, void (*created_callback)(void *))
+{
        if(!starter_)
        {
-               IO::cerr.write("Trying to run with no RegisteredApplication class!\n");
+               IO::cerr.write("Application::run called with no RegisteredApplication class!\n");
                return 126;
        }
 
+       argv0_ = argv[0];
        data_ = data;
 
        try
@@ -48,6 +52,9 @@ int Application::run(int argc, char **argv, void *data)
                        return 1;
                }
 
+               if(created_callback)
+                       created_callback(data);
+
                int result = app_->main();
                Application *a = app_;
                app_ = 0;
@@ -68,6 +75,7 @@ int Application::run(int argc, char **argv, void *data)
                }
 
                delete app_;
+               app_ = 0;
 
                return 124;
        }