fly/flightgear
1
0
Fork 0
Code Activity

Some small fixes and security updates.

Browse source
This commit is contained in:
ehofman 2005-05-30 08:47:00 +00:00
parent a383d6285b
commit 8ff709439b
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/Airports/apt_loader.cxx
View file

@ -29,7 +29,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <stdlib.h> // atof(), atoi() #include <stdlib.h> // atof(), atoi()
#include <strings.h> // memchr() #include <string.h> // memchr()
#include <ctype.h> // isspace() #include <ctype.h> // isspace()
#include <simgear/constants.h> #include <simgear/constants.h>
@ -68,10 +68,11 @@ bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
string last_apt_info = ""; string last_apt_info = "";
string last_apt_type = ""; string last_apt_type = "";
string line; string line;
char tmp[2048]; char tmp[2049];
tmp[2048] = 0;
char sp_pos = 0, lid = 0;
unsigned int line_id = 0;
unsigned int line_num = 0;
double rwy_lon_accum = 0.0; double rwy_lon_accum = 0.0;
double rwy_lat_accum = 0.0; double rwy_lat_accum = 0.0;
int rwy_count = 0; int rwy_count = 0;
@ -79,21 +80,20 @@ bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
while ( ! in.eof() ) { while ( ! in.eof() ) {
in.getline(tmp, 2048); in.getline(tmp, 2048);
line = tmp; line = tmp;
line_num++;
SG_LOG( SG_GENERAL, SG_BULK, "-> '" << line << "'" ); SG_LOG( SG_GENERAL, SG_BULK, "#" << line_num << " '" << line << "'" );
if ( !line.size() || isspace(tmp[0])) if ( !line.size() || isspace(tmp[0]))
continue; continue;
if (line.size() > 3) { if (line.size() >= 3) {
char *p = (char *)memchr(tmp, ' ', 3); char *p = (char *)memchr(tmp, ' ', 3);
if ( p ) if ( p )
*p = 0; *p = 0;
} }
lid = atoi(tmp); line_id = atoi(tmp);
if ( tmp[0] == '#' || (tmp[0] == '/' && tmp[1] == '/') ) { if ( tmp[0] == 'I' ) {
// comment, skip
} else if ( tmp[0] == 'I' ) {
// First line, indicates IBM (i.e. DOS line endings I // First line, indicates IBM (i.e. DOS line endings I
// believe.) // believe.)
@ -108,9 +108,9 @@ bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
} }
SG_LOG( SG_GENERAL, SG_INFO, "Data file version = " SG_LOG( SG_GENERAL, SG_INFO, "Data file version = "
<< tmp ); << tmp );
} else if ( lid == 1 /* Airport */ || } else if ( line_id == 1 /* Airport */ ||
lid == 16 /* Seaplane base */ || line_id == 16 /* Seaplane base */ ||
lid == 17 /* Heliport */ ) { line_id == 17 /* Heliport */ ) {
token.clear(); token.clear();
token = simgear::strutils::split(line); token = simgear::strutils::split(line);
@ -152,7 +152,7 @@ bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
rwy_lon_accum = 0.0; rwy_lon_accum = 0.0;
rwy_lat_accum = 0.0; rwy_lat_accum = 0.0;
rwy_count = 0; rwy_count = 0;
} else if ( lid == 10 ) { } else if ( line_id == 10 ) {
token.clear(); token.clear();
token = simgear::strutils::split(line); token = simgear::strutils::split(line);
@ -193,21 +193,21 @@ bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
stopway1, stopway2, lighting_flags, surface_code, stopway1, stopway2, lighting_flags, surface_code,
shoulder_code, marking_code, smoothness, shoulder_code, marking_code, smoothness,
dist_remaining ); dist_remaining );
} else if ( lid == 18 ) { } else if ( line_id == 18 ) {
// beacon entry (ignore) // beacon entry (ignore)
} else if ( lid == 14 ) { } else if ( line_id == 14 ) {
// control tower entry (ignore) // control tower entry (ignore)
} else if ( lid == 19 ) { } else if ( line_id == 19 ) {
// windsock entry (ignore) // windsock entry (ignore)
} else if ( lid == 15 ) { } else if ( line_id == 15 ) {
// custom startup locations (ignore) // custom startup locations (ignore)
} else if ( lid >= 50 && lid <= 56 ) { } else if ( line_id >= 50 && line_id <= 56 ) {
// frequency entries (ignore) // frequency entries (ignore)
} else if ( lid == 99 ) { } else if ( line_id == 99 ) {
SG_LOG( SG_GENERAL, SG_DEBUG, "End of file reached" ); SG_LOG( SG_GENERAL, SG_DEBUG, "End of file reached" );
} else { } else {
SG_LOG( SG_GENERAL, SG_ALERT, SG_LOG( SG_GENERAL, SG_ALERT,
"Unknown line in file: " << line ); "Unknown line(#" << line_num << ") in file: " << line );
exit(-1); exit(-1);
} }
} }