Nicer formatting of exceptions with multi-line whats

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

diff --git a/source/core/application.cpp b/source/core/application.cpp
index f4887e756ff2ca64811b37bb7093c06157ff59b8..290f20b05239702c40746f9048aba993aa877b21 100644 (file)
--- 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"
 
@@ -37,8 +41,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
        {
@@ -71,7 +74,15 @@ 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(vector<string>::const_iterator i=lines.begin(); ++i!=lines.end(); )
+                                       IO::print(IO::cerr, "          %s\n", *i);
+                       }
                }
 
                delete app_;
@@ -81,6 +92,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;