dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r22904) -Codechange: add tar filename to file scanning

Browse Source
This commit is contained in:
rubidium
2011-09-08 09:48:52 +00:00
parent 86d94de76b
commit 661e5c6655
9 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/fileio.cpp
View File

@@ -647,8 +647,11 @@ static void SimplifyFileName(char *name)
return num;
}
bool TarScanner::AddFile(const char *filename, size_t basepath_length)
bool TarScanner::AddFile(const char *filename, size_t basepath_length, const char *tar_filename)
{
/* No tar within tar. */
assert(tar_filename == NULL);
/* The TAR-header, repeated for every file */
typedef struct TarHeader {
char name[100]; ///< Name of the file
@@ -1281,7 +1284,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 (MatchesExtension(extension, filename) && fs->AddFile(filename, basepath_length)) num++;
if (MatchesExtension(extension, filename) && fs->AddFile(filename, basepath_length, NULL)) num++;
}
}
@@ -1301,7 +1304,7 @@ static uint ScanTar(FileScanner *fs, const char *extension, TarFileList::iterato
uint num = 0;
const char *filename = (*tar).first.c_str();
if (MatchesExtension(extension, filename) && fs->AddFile(filename, 0)) num++;
if (MatchesExtension(extension, filename) && fs->AddFile(filename, 0, (*tar).second.tar_filename)) num++;
return num;
}