fly/flightgear
1
0
Fork 0
Code Activity

Put the user configuration file sequence into it's own function. This will slightly tidy up the code but more importantly will make it consistant across the program.

Browse source
This commit is contained in:
ehofman 2005-12-22 10:25:07 +00:00
parent 653f063bcf
commit ffa92dfe4b
1 changed files with 33 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/Main/fg_init.cxx
View file

@ -207,15 +207,10 @@ static string fgScanForOption( const string& option, const string& path ) {
return ""; return "";
} }
// Scan the user config files for the specified option and return
// Read in configuration (files and command line options) but only set // the value.
// fg_root static string fgScanForOption( const string& option ) {
bool fgInitFGRoot ( int argc, char **argv ) { string arg("");
string root;
// First parse command line options looking for --fg-root=, this
// will override anything specified in a config file
root = fgScanForOption( "--fg-root=", argc, argv);
if (hostname == NULL) if (hostname == NULL)
{ {
@ -227,25 +222,48 @@ bool fgInitFGRoot ( int argc, char **argv ) {
#if defined( unix ) || defined( __CYGWIN__ ) #if defined( unix ) || defined( __CYGWIN__ )
// Next check home directory for .fgfsrc.hostname file // Next check home directory for .fgfsrc.hostname file
if ( root.empty() ) { if ( arg.empty() ) {
if ( homedir != NULL ) { if ( homedir != NULL ) {
SGPath config( homedir ); SGPath config( homedir );
config.append( ".fgfsrc" ); config.append( ".fgfsrc" );
config.concat( "." ); config.concat( "." );
config.concat( hostname ); config.concat( hostname );
root = fgScanForOption( "--fg-root=", config.str() ); arg = fgScanForOption( option, config.str() );
} }
} }
#endif #endif
// Next check home directory for .fgfsrc file // Next check home directory for .fgfsrc file
if ( root.empty() ) { if ( arg.empty() ) {
if ( homedir != NULL ) { if ( homedir != NULL ) {
SGPath config( homedir ); SGPath config( homedir );
config.append( ".fgfsrc" ); config.append( ".fgfsrc" );
root = fgScanForOption( "--fg-root=", config.str() ); arg = fgScanForOption( option, config.str() );
} }
} }
if ( arg.empty() ) {
// Check for $fg_root/system.fgfsrc
SGPath config( globals->get_fg_root() );
config.append( "system.fgfsrc" );
arg = fgScanForOption( option, config.str() );
}
return arg;
}
// Read in configuration (files and command line options) but only set
// fg_root
bool fgInitFGRoot ( int argc, char **argv ) {
string root;
// First parse command line options looking for --fg-root=, this
// will override anything specified in a config file
root = fgScanForOption( "--fg-root=", argc, argv);
// Check in one of the user configuration files.
root = fgScanForOption( "--fg-root=" );
// Next check if fg-root is set as an env variable // Next check if fg-root is set as an env variable
if ( root.empty() ) { if ( root.empty() ) {
@ -299,40 +317,14 @@ bool fgInitFGRoot ( int argc, char **argv ) {
// aircraft // aircraft
bool fgInitFGAircraft ( int argc, char **argv ) { bool fgInitFGAircraft ( int argc, char **argv ) {
string aircraft; string aircraft;
char* homedir = NULL;
// First parse command line options looking for --aircraft=, this // First parse command line options looking for --aircraft=, this
// will override anything specified in a config file // will override anything specified in a config file
aircraft = fgScanForOption( "--aircraft=", argc, argv ); aircraft = fgScanForOption( "--aircraft=", argc, argv );
#if defined( unix ) || defined( __CYGWIN__ ) // Check in one of the user configuration files.
// Next check home directory for .fgfsrc.hostname file aircraft = fgScanForOption( "--aircraft=" );
if ( aircraft.empty() ) {
if ( homedir != NULL ) {
SGPath config( homedir );
config.append( ".fgfsrc" );
config.concat( "." );
config.concat( hostname );
aircraft = fgScanForOption( "--aircraft=", config.str() );
}
}
#endif
// Next check home directory for .fgfsrc file
if ( aircraft.empty() ) {
if ( homedir != NULL ) {
SGPath config( homedir );
config.append( ".fgfsrc" );
aircraft = fgScanForOption( "--aircraft=", config.str() );
}
}
if ( aircraft.empty() ) {
// Check for $fg_root/system.fgfsrc
SGPath sysconf( globals->get_fg_root() );
sysconf.append( "system.fgfsrc" );
aircraft = fgScanForOption( "--aircraft=", sysconf.str() );
}
// if an aircraft was specified, set the property name // if an aircraft was specified, set the property name
if ( !aircraft.empty() ) { if ( !aircraft.empty() ) {
SG_LOG(SG_INPUT, SG_INFO, "aircraft = " << aircraft ); SG_LOG(SG_INPUT, SG_INFO, "aircraft = " << aircraft );