gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-11 08:49:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r22834) -Codechange: unify some code, and extend it to work for other filenames that should end in a particular way

Browse Source
This commit is contained in:
rubidium 2011-08-25 10:24:49 +00:00
parent 09c3cabc1e
commit 41169291e3
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/fileio.cpp
View File

@ -1231,6 +1231,19 @@ void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize)
return mem;
}
/**
* Helper to see whether a given filename matches the extension.
* @param extension The extension to look for.
* @param filename The filename to look in for the extension.
* @return True iff the extension is NULL, or the filename ends with it.
*/
static bool MatchesExtension(const char *extension, const char *filename)
{
if (extension == NULL) return true;
const char *ext = strrchr(filename, extension[0]);
return ext != NULL && strcasecmp(ext, extension) == 0;
}
/**
* Scan a single directory (and recursively its children) and add
@ -1268,15 +1281,7 @@ static uint ScanPath(FileScanner *fs, const char *extension, const char *path, s
num += ScanPath(fs, extension, filename, basepath_length, recursive);
} else if (S_ISREG(sb.st_mode)) {
/* File */
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 (fs->AddFile(filename, basepath_length)) num++;
if (MatchesExtension(extension, filename) && fs->AddFile(filename, basepath_length)) num++;
}
}
@ -1296,15 +1301,7 @@ static uint ScanTar(FileScanner *fs, const char *extension, TarFileList::iterato
uint num = 0;
const char *filename = (*tar).first.c_str();
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 (fs->AddFile(filename, 0)) num++;
if (MatchesExtension(extension, filename) && fs->AddFile(filename, 0)) num++;
return num;
}