fly/flightgear
1
0
Fork 0
Code Activity

Detect the hostname as early as possible to prevent a segmentation fault (and an unknown exception in the main loop situation.

Browse source
This commit is contained in:
ehofman 2005-12-27 14:02:38 +00:00
parent a67cb7d6fb
commit 7b1f1d73e6
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Main/fg_init.cxx
View file

@ -145,6 +145,15 @@ float init_volume;
static string fgScanForOption( const string& option, int argc, char **argv ) {
int i = 1;
cout << "The quest for hostname part 1" << endl;
if (hostname == NULL)
{
char _hostname[256];
gethostname(_hostname, 256);
hostname = strdup(_hostname);
free_hostname = true;
}
SG_LOG(SG_GENERAL, SG_INFO, "Scanning command line for: " << option );
int len = option.length();
@ -212,14 +221,6 @@ static string fgScanForOption( const string& option, const string& path ) {
static string fgScanForOption( const string& option ) {
string arg("");
if (hostname == NULL)
{
char _hostname[256];
gethostname(_hostname, 256);
hostname = strdup(_hostname);
free_hostname = true;
}
#if defined( unix ) || defined( __CYGWIN__ )
// Next check home directory for .fgfsrc.hostname file
if ( arg.empty() ) {