zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

move relative path resolution earlier, to prevent problems with include deduplication

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2022-06-07 13:54:21 -03:00 committed by Christoph Oelckers
parent 6f6942609c
commit 121045e48d
1 changed files with 47 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
src/common/scripting/frontend/zcc_parser.cpp
View file

@ -45,14 +45,58 @@
TArray<FString> Includes; TArray<FString> Includes;
TArray<FScriptPosition> IncludeLocs; TArray<FScriptPosition> IncludeLocs;
static FString ResolveIncludePath(const FString &path,const FString &lumpname){
if (path.IndexOf("./") == 0 || path.IndexOf("../") == 0) // relative path resolving
{
auto start = lumpname.LastIndexOf(":"); // find find separator between wad and path
auto end = lumpname.LastIndexOf("/"); // find last '/'
FString fullPath = lumpname.Mid(start + 1, end - start - 1); // get path from lumpname (format 'wad:filepath/filename')
if (start != -1 && end != -1)
{
FString relativePath = path;
if ( relativePath.IndexOf("./") == 0 ) // strip initial marker
{
relativePath = relativePath.Mid(2);
}
bool pathOk = true;
while (relativePath.IndexOf("../") == 0) // go back one folder for each '..'
{
relativePath = relativePath.Mid(3);
auto slash_index = fullPath.LastIndexOf("/");
if (slash_index != -1) {
fullPath = fullPath.Mid(0, slash_index);
} else {
pathOk = false;
break;
}
}
if (pathOk) // if '..' parsing was successful
{
return fullPath + "/" + relativePath;
}
}
}
return path;
}
static FString ZCCTokenName(int terminal); static FString ZCCTokenName(int terminal);
void AddInclude(ZCC_ExprConstant *node) void AddInclude(ZCC_ExprConstant *node)
{ {
assert(node->Type == TypeString); assert(node->Type == TypeString);
if (Includes.Find(*node->StringVal) >= Includes.Size())
FScriptPosition pos(*node);
FString path = ResolveIncludePath(*node->StringVal, pos.FileName.GetChars());
if (Includes.Find(path) >= Includes.Size())
{ {
Includes.Push(*node->StringVal); Includes.Push(path);
IncludeLocs.Push(*node); IncludeLocs.Push(pos);
} }
} }
@ -421,45 +465,6 @@ PNamespace *ParseOneScript(const int baselump, ZCCParseState &state)
for (unsigned i = 0; i < Includes.Size(); i++) for (unsigned i = 0; i < Includes.Size(); i++)
{ {
lumpnum = fileSystem.CheckNumForFullName(Includes[i], true); lumpnum = fileSystem.CheckNumForFullName(Includes[i], true);
if (lumpnum == -1 && ( Includes[i].IndexOf("./") == 0 || Includes[i].IndexOf("../") == 0 ) ) // relative path resolving
{
FString fullPath = IncludeLocs[i].FileName.GetChars(); // get full path, format 'wad:filepath/filename'
auto start = fullPath.LastIndexOf(":"); // find find separator between wad and path
auto end = fullPath.LastIndexOf("/"); // find last '/'
if (start!=-1&&end!=-1)
{
FString resolvedPath = fullPath.Mid(start + 1, end - start - 1); // extract filepath from string
FString relativePath = Includes[i];
if ( relativePath.IndexOf("./") == 0 ) // strip initial marker
{
relativePath = relativePath.Mid(2);
}
bool pathOk = true;
while (relativePath.IndexOf("../") == 0) // go back one folder for each '..'
{
relativePath = relativePath.Mid(3);
auto slash_index = resolvedPath.LastIndexOf("/");
if (slash_index != -1) {
resolvedPath = resolvedPath.Mid(0,slash_index);
} else {
pathOk = false;
break;
}
}
if ( pathOk ) // if '..' parsing was successful
{
resolvedPath += "/" + relativePath; // add relative path
lumpnum = fileSystem.CheckNumForFullName(resolvedPath, true); // check for relative include
}
}
}
if (lumpnum == -1) if (lumpnum == -1)
{ {
IncludeLocs[i].Message(MSG_ERROR, "Include script lump %s not found", Includes[i].GetChars()); IncludeLocs[i].Message(MSG_ERROR, "Include script lump %s not found", Includes[i].GetChars());