# include <config.h>
#endif
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
#if defined(HAVE_FEENABLEEXCEPT)
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
# include <fpu_control.h>
#endif
+#ifndef _WIN32
+# include <unistd.h> // for gethostname()
+#endif
+
#include <errno.h>
#include <signal.h>
#include <stdlib.h>
#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
+char *homedir = NULL;
+char *hostname = NULL;
bool free_hostname = false;
// foreward declaration.
}
#elif defined(__linux__) && defined(__i386__)
+static void handleFPE(int);
static void
initFPE ()
{
// Main entry point; catch any exceptions that have made it this far.
int main ( int argc, char **argv ) {
#if _MSC_VER
+ // 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);
+
// 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?
+ char homepath[256] = "";
homepath[sizeof(homepath)-1] = 0;
strncpy( homepath, ::getenv("APPDATA"), sizeof(homepath)-1 );
strncat( homepath, "\\flightgear.org", sizeof(homepath)-strlen(homepath)-1 );
+
+ homedir = strdup(homepath);
+ hostname = ::getenv( "COMPUTERNAME" );
+#else
+ // Unix(alike) systems
+ char _hostname[256];
+ gethostname(_hostname, 256);
+ hostname = strdup(_hostname);
+ free_hostname = true;
+
+ homedir = ::getenv( "HOME" );
+
+ signal(SIGPIPE, SIG_IGN);
#endif
#ifdef PTW32_STATIC_LIB
}
initFPE();
#endif
-#ifndef _WIN32
- signal(SIGPIPE, SIG_IGN);
-#endif
#if defined(sgi)
flush_fpe();
#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])) {