# HG changeset patch # User rubidium # Date 2009-03-04 00:19:42 # Node ID 859882bdf5aab7574690ae3d99afb56af5d81bf1 # Parent 706b96dca92b123c86b2a81aa3efe9a10944aaae (svn r15607) -Codechange: support searching files without filtering on extension. diff --git a/src/fileio.cpp b/src/fileio.cpp --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -1049,11 +1049,13 @@ static uint ScanPath(FileScanner *fs, co num += ScanPath(fs, extension, filename, basepath_length, recursive); } else if (S_ISREG(sb.st_mode)) { /* File */ - char *ext = strrchr(filename, '.'); + if (extension != NULL) { + char *ext = strrchr(filename, '.'); - /* If no extension or extension isn't .grf, skip the file */ - if (ext == NULL) continue; - if (strcasecmp(ext, extension) != 0) continue; + /* If no extension or extension isn't .grf, skip the file */ + if (ext == NULL) continue; + if (strcasecmp(ext, extension) != 0) continue; + } if (fs->AddFile(filename, basepath_length)) num++; } @@ -1073,11 +1075,14 @@ static uint ScanTar(FileScanner *fs, con { uint num = 0; const char *filename = (*tar).first.c_str(); - const char *ext = strrchr(filename, '.'); + + if (extension != NULL) { + const char *ext = strrchr(filename, '.'); - /* If no extension or extension isn't .grf, skip the file */ - if (ext == NULL) return false; - if (strcasecmp(ext, extension) != 0) return false; + /* If no extension or extension isn't .grf, skip the file */ + if (ext == NULL) return false; + if (strcasecmp(ext, extension) != 0) return false; + } if (fs->AddFile(filename, 0)) num++;