fly/flightgear
1
0
Fork 0
Code Activity

fgFindAircraftPath(): put the MAX_DEPTH check at a place where it makes sense

Browse source
This commit is contained in:
mfranz 2007-04-02 23:19:36 +00:00
parent 3cb5b0159d
commit 1eb5de245b
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Main/fg_init.cxx
View file

@ -517,10 +517,14 @@ static string fgFindAircraftPath( const SGPath &path, const string &aircraft, in
string result; string result;
while ((dire = ulReadDir(dirp)) != NULL) { while ((dire = ulReadDir(dirp)) != NULL) {
if (dire->d_isdir && depth < MAXDEPTH) { if (dire->d_isdir) {
if ( strcmp("CVS", dire->d_name) && strcmp(".", dire->d_name) if (depth > MAXDEPTH)
&& strcmp("..", dire->d_name) && strcmp("AI", dire->d_name)) continue;
{
if (!strcmp("CVS", dire->d_name) || !strcmp(".", dire->d_name)
|| !strcmp("..", dire->d_name) || !strcmp("AI", dire->d_name))
continue;
SGPath next = path; SGPath next = path;
next.append(dire->d_name); next.append(dire->d_name);
@ -528,7 +532,7 @@ static string fgFindAircraftPath( const SGPath &path, const string &aircraft, in
if ( ! result.empty() ) { if ( ! result.empty() ) {
break; break;
} }
}
} else if ( !strcmp(dire->d_name, aircraft.c_str()) ) { } else if ( !strcmp(dire->d_name, aircraft.c_str()) ) {
result = path.str(); result = path.str();
break; break;