fly/flightgear
1
0
Fork 0
Code Activity

Updated to handle scenery files with a .tgz extension.

Browse source
This commit is contained in:
curt 2005-01-21 23:23:29 +00:00
parent e2a170c7d4
commit 453e3963d9
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
utils/fgadmin/src/fgadmin_funcs.cxx
View file

@ -151,7 +151,7 @@ void FGAdminUI::update_install_box() {
char base[FL_PATH_MAX]; char base[FL_PATH_MAX];
strncpy( base, ent->d_name, FL_PATH_MAX ); strncpy( base, ent->d_name, FL_PATH_MAX );
const char *p = fl_filename_ext( base ); const char *p = fl_filename_ext( base );
int offset; int offset, expected_length = 0;
if ( strcmp( p, ".gz" ) == 0 ) { if ( strcmp( p, ".gz" ) == 0 ) {
offset = p - base; offset = p - base;
base[offset] = '\0'; base[offset] = '\0';
@ -159,13 +159,19 @@ void FGAdminUI::update_install_box() {
if ( strcmp( p, ".tar" ) == 0 ) { if ( strcmp( p, ".tar" ) == 0 ) {
offset = p - base; offset = p - base;
base[offset] = '\0'; base[offset] = '\0';
expected_length = 14;
} }
} else if ( strcmp( p, ".tgz" ) == 0 ) {
offset = p - base;
base[offset] = '\0';
expected_length = 11;
} else if ( strcmp( p, ".zip" ) == 0 ) { } else if ( strcmp( p, ".zip" ) == 0 ) {
offset = p - base; offset = p - base;
base[offset] = '\0'; base[offset] = '\0';
expected_length = 11;
} }
if ( strlen(ent->d_name) != 14 ) { if ( strlen(ent->d_name) != expected_length ) {
// simple heuristic to ignore non-scenery files // simple heuristic to ignore non-scenery files
} else if ( ent->d_name[0] != 'e' && ent->d_name[0] != 'w' ) { } else if ( ent->d_name[0] != 'e' && ent->d_name[0] != 'w' ) {
// further sanity checks on name // further sanity checks on name