X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fbootstrap.cxx;h=73fb6fd5e162f3a67862a8b88feafdd94c447986;hb=52e5a9abe83882ca946429f7d8e71894d5852d8f;hp=fb95b8f194a0acfb03a386e45b247ec3131f39a2;hpb=02fb83c774020633cb62e3b8154337510bed1de3;p=flightgear.git

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index fb95b8f19..73fb6fd5e 100644
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -25,6 +25,10 @@
 #  include <config.h>
 #endif
 
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
 #if defined(HAVE_FEENABLEEXCEPT)
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
@@ -34,6 +38,10 @@
 #  include <fpu_control.h>
 #endif
 
+#ifndef _WIN32
+#  include <unistd.h> // for gethostname()
+#endif
+
 #include <errno.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -41,40 +49,31 @@
 
 #include <simgear/compiler.h>
 #include <simgear/structure/exception.hxx>
-#include <simgear/debug/logstream.hxx>
-#include <simgear/math/SGMath.hxx>
 
 #include <cstring>
 #include <iostream>
 using std::cerr;
 using std::endl;
 
+#include <Viewer/fgviewer.hxx>
 #include "main.hxx"
 #include "globals.hxx"
 #include "fg_props.hxx"
-#include "fgviewer.hxx"
 
 
 #include "fg_os.hxx"
 
-#ifdef _MSC_VER
-char homepath[256] = "";
-char * homedir = homepath;
-char *hostname = ::getenv( "COMPUTERNAME" );
-#else
-char *homedir = ::getenv( "HOME" );
-char *hostname = ::getenv( "HOSTNAME" );
-#endif
-bool free_hostname = false;
+std::string homedir;
+std::string hostname;
 
-// foreward declaration.
+// forward declaration.
 void fgExitCleanup();
 
 static bool fpeAbort = false;
-static void handleFPE(int);
 static void initFPE();
 
 #if defined(HAVE_FEENABLEEXCEPT)
+static void handleFPE(int);
 static void
 initFPE ()
 {
@@ -93,6 +92,7 @@ static void handleFPE(int)
 }
 #elif defined(__linux__) && defined(__i386__)
 
+static void handleFPE(int);
 static void
 initFPE ()
 {
@@ -115,21 +115,16 @@ handleFPE (int num)
   SG_LOG(SG_GENERAL, SG_ALERT, "Floating point interrupt (SIGFPE)");
 }
 #else
-static void handleFPE(int)
-{
-}
-
 static void initFPE()
 {
 }
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(_WIN32)
 int main ( int argc, char **argv );
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
                              LPSTR lpCmdLine, int nCmdShow) {
 
-  logbuf::has_no_console();
   main( __argc, __argv );
 }
 #endif
@@ -168,14 +163,22 @@ static void fg_terminate() {
 int _bootstrap_OSInit;
 
 // Main entry point; catch any exceptions that have made it this far.
-int main ( int argc, char **argv ) {
-#if _MSC_VER
-  // Windows has no $HOME aka %HOME%, so we have to construct the full path.
-  // make sure it fits into the buffer. Max. path length is 255, but who knows
-  // what's in these environment variables?
-  homepath[sizeof(homepath)-1] = 0;
-  strncpy( homepath, ::getenv("APPDATA"), sizeof(homepath)-1 );
-  strncat( homepath, "\\flightgear.org", sizeof(homepath)-strlen(homepath)-1 );
+int main ( int argc, char **argv )
+{
+#if defined(_MSC_VER) || defined(_WIN32) 
+  // Don't show blocking "no disk in drive" error messages on Windows 7,
+  // silently return errors to application instead.
+  // See Microsoft MSDN #ms680621: "GUI apps should specify SEM_NOOPENFILEERRORBOX"
+  SetErrorMode(SEM_NOOPENFILEERRORBOX);
+
+  hostname = ::getenv( "COMPUTERNAME" );
+#else
+  // Unix(alike) systems
+  char _hostname[256];
+  gethostname(_hostname, 256);
+  hostname = _hostname;
+    
+  signal(SIGPIPE, SIG_IGN);
 #endif
 
 #ifdef PTW32_STATIC_LIB
@@ -197,9 +200,6 @@ int main ( int argc, char **argv ) {
     }
     initFPE();
 #endif
-#ifndef _WIN32
-    signal(SIGPIPE, SIG_IGN);
-#endif
 
 #if defined(sgi)
     flush_fpe();
@@ -224,6 +224,7 @@ int main ( int argc, char **argv ) {
 #if defined( HAVE_BC5PLUS )
     _control87(MCW_EM, MCW_EM);  /* defined in float.h */
 #endif
+  
     bool fgviewer = false;
     for (int i = 0; i < argc; ++i) {
         if (!strcmp("--fgviewer", argv[i])) {
@@ -251,11 +252,14 @@ int main ( int argc, char **argv ) {
         if (std::strlen(t.getOrigin()) != 0)
             cerr << " (received from " << t.getOrigin() << ')' << endl;
 
-    } catch (const string &s) {
-        cerr << "Fatal error: " << s << endl;
+    } catch (const std::exception &e ) {
+        cerr << "Fatal error (std::exception): " << e.what() << endl;
+
+    } catch (const std::string &s) {
+        cerr << "Fatal error (std::string): " << s << endl;
 
     } catch (const char *s) {
-        cerr << "Fatal error: " << s << endl;
+        cerr << "Fatal error (const char*): " << s << endl;
 
     } catch (...) {
         cerr << "Unknown exception in the main loop. Aborting..." << endl;
@@ -266,16 +270,13 @@ int main ( int argc, char **argv ) {
     return 0;
 }
 
-// do some clean up on exit.  Specifically we want to call alutExit()
-// which happens in the sound manager destructor.
+// do some clean up on exit.  Specifically we want to delete the sound-manager,
+// so OpenAL device and context are released cleanly
 void fgExitCleanup() {
 
     if (_bootstrap_OSInit != 0)
         fgSetMouseCursor(MOUSE_CURSOR_POINTER);
 
     delete globals;
-
-    if (free_hostname && hostname != NULL)
-        free(hostname);
 }