lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'folder-blacklist' into 'public_next'

Browse source 
Implement folder blacklisting

See merge request STJr/SRB2Internal!626
This commit is contained in:
James R 2020-02-02 20:35:51 -05:00
parent 4238003887 1794949696
commit f8310236e0
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/w_wad.c
View file

@ -1691,7 +1691,7 @@ W_VerifyName (const char *name, lumpchecklist_t *checklist, boolean status)
size_t j; size_t j;
for (j = 0; checklist[j].len && checklist[j].name; ++j) for (j = 0; checklist[j].len && checklist[j].name; ++j)
{ {
if (( strncmp(name, checklist[j].name, if (( strncasecmp(name, checklist[j].name,
checklist[j].len) != false ) == status) checklist[j].len) != false ) == status)
{ {
return true; return true;
@ -1746,6 +1746,19 @@ W_VerifyWAD (FILE *fp, lumpchecklist_t *checklist, boolean status)
return true; return true;
} }
// List of blacklisted folders to use when checking the PK3
static lumpchecklist_t folderblacklist[] =
{
{"Lua/", 4},
{"SOC/", 4},
{"Sprites/", 8},
{"Textures/", 9},
{"Patches/", 8},
{"Flats/", 6},
{"Fades/", 6},
{NULL, 0},
};
static int static int
W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status) W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
{ {
@ -1797,7 +1810,7 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
else else
trimname = fullname; // Care taken for root files. trimname = fullname; // Care taken for root files.
if (*trimname) // Ignore directories if (*trimname) // Ignore directories, well kinda
{ {
if ((dotpos = strrchr(trimname, '.')) == 0) if ((dotpos = strrchr(trimname, '.')) == 0)
dotpos = fullname + strlen(fullname); // Watch for files without extension. dotpos = fullname + strlen(fullname); // Watch for files without extension.
@ -1807,6 +1820,10 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
if (! W_VerifyName(lumpname, checklist, status)) if (! W_VerifyName(lumpname, checklist, status))
return false; return false;
// Check for directories next, if it's blacklisted it will return false
if (W_VerifyName(fullname, folderblacklist, status))
return false;
} }
free(fullname); free(fullname);