Move crash catcher wrapper to separate file

apps/opencs/main.cpp

@@ -13,8 +13,6 @@
 #include "model/doc/messages.hpp"
 #include "model/world/universalid.hpp"
 
-#include <SDL_messagebox.h>
-
 #ifdef Q_OS_MAC
 #include <QDir>
 #endif
@@ -44,47 +42,10 @@ class Application : public QApplication
         Application (int& argc, char *argv[]) : QApplication (argc, argv) {}
 };
 
-int main(int argc, char *argv[])
+int runApplication(int argc, char *argv[])
 {
-    #ifdef Q_OS_MAC
+#ifdef Q_OS_MAC
     setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
-    #endif
-
-    // Some objects used to redirect cout and cerr
-    // Scope must be here, so this still works inside the catch block for logging exceptions
-    std::streambuf* cout_rdbuf = std::cout.rdbuf ();
-    std::streambuf* cerr_rdbuf = std::cerr.rdbuf ();
-
-#if !(defined(_WIN32) && defined(_DEBUG))
-    boost::iostreams::stream_buffer<Misc::Tee> coutsb;
-    boost::iostreams::stream_buffer<Misc::Tee> cerrsb;
-#endif
-
-    std::ostream oldcout(cout_rdbuf);
-    std::ostream oldcerr(cerr_rdbuf);
-
-    boost::filesystem::ofstream logfile;
-
-    int ret = 0;
-    try
-    {
-        Files::ConfigurationManager cfgMgr;
-
-#if defined(_WIN32) && defined(_DEBUG)
-        // Redirect cout and cerr to VS debug output when running in debug mode
-        boost::iostreams::stream_buffer<Misc::DebugOutput> sb;
-        sb.open(Misc::DebugOutput());
-        std::cout.rdbuf (&sb);
-        std::cerr.rdbuf (&sb);
-#else
-        // Redirect cout and cerr to openmw.log
-        logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / "/openmw-cs.log"));
-
-        coutsb.open (Misc::Tee(logfile, oldcout));
-        cerrsb.open (Misc::Tee(logfile, oldcerr));
-
-        std::cout.rdbuf (&coutsb);
-        std::cerr.rdbuf (&cerrsb);
 #endif
 
     // To allow background thread drawing in OSG
@@ -98,10 +59,10 @@ int main(int argc, char *argv[])
 
     Application application (argc, argv);
 
-    #ifdef Q_OS_MAC
+#ifdef Q_OS_MAC
     QDir dir(QCoreApplication::applicationDirPath());
     QDir::setCurrent(dir.absolutePath());
-    #endif
+#endif
 
     application.setWindowIcon (QIcon (":./openmw-cs.png"));
 
@@ -112,23 +73,12 @@ int main(int argc, char *argv[])
         editor.connectToIPCServer();
         return 0;
     }
-        ret = editor.run();
-    }
-    catch (std::exception& e)
-    {
-#if (defined(__APPLE__) || defined(__linux) || defined(__unix) || defined(__posix))
-        if (!isatty(fileno(stdin)))
-#endif
-            SDL_ShowSimpleMessageBox(0, "OpenMW-CS: Fatal error", e.what(), NULL);
 
-        std::cerr << "\nERROR: " << e.what() << std::endl;
+    return editor.run();
-
+}
-        ret = 1;
-    }
 
-    // Restore cout and cerr
-    std::cout.rdbuf(cout_rdbuf);
-    std::cerr.rdbuf(cerr_rdbuf);
 
-    return ret;
+int main(int argc, char *argv[])
+{
+    return wrapApplication(&runApplication, argc, argv, "/openmw-cs.log");
 }

apps/openmw/main.cpp

@@ -7,7 +7,6 @@
 #include <components/fallback/validate.hpp>
 #include <components/misc/debugging.hpp>
 
-#include <SDL_messagebox.h>
 #include "engine.hpp"
 
 #include <boost/filesystem/fstream.hpp>
@@ -242,86 +241,33 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     return true;
 }
 
-#ifdef ANDROID
+int runApplication(int argc, char *argv[])
-extern "C" int SDL_main(int argc, char**argv)
-#else
-int main(int argc, char**argv)
-#endif
 {
-#if defined(__APPLE__)
-    setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
-#endif
-
-    // Some objects used to redirect cout and cerr
-    // Scope must be here, so this still works inside the catch block for logging exceptions
-    std::streambuf* cout_rdbuf = std::cout.rdbuf ();
-    std::streambuf* cerr_rdbuf = std::cerr.rdbuf ();
-
-#if !(defined(_WIN32) && defined(_DEBUG))
-    boost::iostreams::stream_buffer<Misc::Tee> coutsb;
-    boost::iostreams::stream_buffer<Misc::Tee> cerrsb;
-#endif
-
-    std::ostream oldcout(cout_rdbuf);
-    std::ostream oldcerr(cerr_rdbuf);
-
-    boost::filesystem::ofstream logfile;
-
-    std::unique_ptr<OMW::Engine> engine;
-
-    int ret = 0;
-    try
-    {
-        Files::ConfigurationManager cfgMgr;
-
-#if defined(_WIN32) && defined(_DEBUG)
-        // Redirect cout and cerr to VS debug output when running in debug mode
-        boost::iostreams::stream_buffer<Misc::DebugOutput> sb;
-        sb.open(Misc::DebugOutput());
-        std::cout.rdbuf (&sb);
-        std::cerr.rdbuf (&sb);
-#else
-        // Redirect cout and cerr to openmw.log
-        logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / "/openmw.log"));
-
-        coutsb.open (Misc::Tee(logfile, oldcout));
-        cerrsb.open (Misc::Tee(logfile, oldcerr));
-
-        std::cout.rdbuf (&coutsb);
-        std::cerr.rdbuf (&cerrsb);
-#endif
-
-        crashCatcherInstall(argc, argv, (cfgMgr.getLogPath() / "crash.log").string());
-
 #ifdef __APPLE__
     boost::filesystem::path binary_path = boost::filesystem::system_complete(boost::filesystem::path(argv[0]));
     boost::filesystem::current_path(binary_path.parent_path());
+    setenv("OSG_GL_TEXTURE_STORAGE", "OFF", 0);
 #endif
 
+    Files::ConfigurationManager cfgMgr;
+    std::unique_ptr<OMW::Engine> engine;
     engine.reset(new OMW::Engine(cfgMgr));
 
     if (parseOptions(argc, argv, *engine, cfgMgr))
     {
         engine->go();
     }
-    }
-    catch (std::exception &e)
-    {
-#if (defined(__APPLE__) || defined(__linux) || defined(__unix) || defined(__posix))
-        if (!isatty(fileno(stdin)))
-#endif
-            SDL_ShowSimpleMessageBox(0, "OpenMW: Fatal error", e.what(), NULL);
-
-        std::cerr << "\nERROR: " << e.what() << std::endl;
-
-        ret = 1;
-    }
 
-    // Restore cout and cerr
+    return 0;
-    std::cout.rdbuf(cout_rdbuf);
+}
-    std::cerr.rdbuf(cerr_rdbuf);
 
-    return ret;
+#ifdef ANDROID
+extern "C" int SDL_main(int argc, char**argv)
+#else
+int main(int argc, char**argv)
+#endif
+{
+    return wrapApplication(&runApplication, argc, argv, "/openmw.log");
 }
 
 // Platform specific for Windows when there is no console built into the executable.

components/misc/debugging.hpp

@@ -3,9 +3,11 @@
 
 #include <boost/iostreams/stream.hpp>
 
+#include <SDL_messagebox.h>
+
 namespace Misc
 {
-    #if defined(_WIN32) && defined(_DEBUG)
+#if defined(_WIN32) && defined(_DEBUG)
 
     class DebugOutput : public boost::iostreams::sink
     {
@@ -19,7 +21,7 @@ namespace Misc
             return size;
         }
     };
-    #else
+#else
     class Tee : public boost::iostreams::sink
     {
     public:
@@ -41,7 +43,69 @@ namespace Misc
         std::ostream &out;
         std::ostream &out2;
     };
-    #endif
+#endif
+}
+
+int wrapApplication(int (*innerApplication)(int argc, char *argv[]), int argc, char *argv[], const std::string& logName)
+{
+    // Some objects used to redirect cout and cerr
+    // Scope must be here, so this still works inside the catch block for logging exceptions
+    std::streambuf* cout_rdbuf = std::cout.rdbuf ();
+    std::streambuf* cerr_rdbuf = std::cerr.rdbuf ();
+
+#if !(defined(_WIN32) && defined(_DEBUG))
+    boost::iostreams::stream_buffer<Misc::Tee> coutsb;
+    boost::iostreams::stream_buffer<Misc::Tee> cerrsb;
+#endif
+
+    std::ostream oldcout(cout_rdbuf);
+    std::ostream oldcerr(cerr_rdbuf);
+
+    boost::filesystem::ofstream logfile;
+
+    int ret = 0;
+    try
+    {
+        Files::ConfigurationManager cfgMgr;
+#if defined(_WIN32) && defined(_DEBUG)
+        // Redirect cout and cerr to VS debug output when running in debug mode
+        boost::iostreams::stream_buffer<Misc::DebugOutput> sb;
+        sb.open(Misc::DebugOutput());
+        std::cout.rdbuf (&sb);
+        std::cerr.rdbuf (&sb);
+#else
+        // Redirect cout and cerr to the log file
+        boost::filesystem::ofstream logfile;
+        logfile.open (boost::filesystem::path(cfgMgr.getLogPath() / logName));
+
+        std::ostream oldcout(cout_rdbuf);
+        std::ostream oldcerr(cerr_rdbuf);
+
+        coutsb.open (Misc::Tee(logfile, oldcout));
+        cerrsb.open (Misc::Tee(logfile, oldcerr));
+
+        std::cout.rdbuf (&coutsb);
+        std::cerr.rdbuf (&cerrsb);
+#endif
+        ret = innerApplication(argc, argv);
+    }
+    catch (std::exception& e)
+    {
+#if (defined(__APPLE__) || defined(__linux) || defined(__unix) || defined(__posix))
+        if (!isatty(fileno(stdin)))
+#endif
+            SDL_ShowSimpleMessageBox(0, "OpenMW: Fatal error", e.what(), NULL);
+
+        std::cerr << "\nERROR: " << e.what() << std::endl;
+
+        ret = 1;
+    }
+
+    // Restore cout and cerr
+    std::cout.rdbuf(cout_rdbuf);
+    std::cerr.rdbuf(cerr_rdbuf);
+
+    return ret;
 }
 
 #endif