A better fix for bug 675:

[lyx.git] / src / main.C

diff --git a/src/main.C b/src/main.C
index 26bbed47641188738b76e3ca2c55a95ac424811f..dc5c978237bf584456fe4ba75547a970dd4b462b 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -1,25 +1,49 @@
 /**
  * \file main.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Lars Gullik Bjønnes
  * \author Jean Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
+#include "debug.h"
 #include "lyx_main.h"
 #include "gettext.h"
+
 #include "support/os.h"
 
+#include <boost/filesystem/path.hpp>
+
+#ifdef HAVE_IOS
+#include <ios>
+#endif
+
+
+namespace fs = boost::filesystem;
+
 int main(int argc, char * argv[])
 {
-       os::init(&argc, &argv);
+#ifdef HAVE_IOS
+       std::ios_base::sync_with_stdio(false);
+#endif
+       fs::path::default_name_check(fs::no_check);
+
+       // To avoid ordering of global object problems with some
+       // stdlibs we do the initialization here, but still as
+       // early as possible.
+       lyx::lyxerr.rdbuf(std::cerr.rdbuf());
+
+       lyx::support::os::init(argc, argv);
 
        // initialize for internationalized version *EK*
-       locale_init();
+       lyx::locale_init();
+
+       lyx::LyX the_lyx_instance;
 
-       LyX lyx(argc, argv);
-       return 0;
+       return the_lyx_instance.exec(argc, argv);
 }