stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-17 01:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added parsing of relative includes in ZScript (PR#787 by JaedenDuhreis)

Browse source
This commit is contained in:
JaedenDuhreis 2022-09-15 18:04:07 +02:00 committed by GitHub
parent aee47aacb0
commit 82f1ee09bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Source/Core/ZDoom/ZScriptParser.cs
View file

@ -284,13 +284,33 @@ namespace CodeImp.DoomBuilder.ZDoom
return false; return false;
} }
//mxd. Relative paths are not supported // [JD] Relative paths are supported by GZDoom since 4.8.0
if (filename.StartsWith(RELATIVE_PATH_MARKER) || filename.StartsWith(CURRENT_FOLDER_PATH_MARKER) || if (filename.StartsWith(RELATIVE_PATH_MARKER) || filename.StartsWith(CURRENT_FOLDER_PATH_MARKER) ||
filename.StartsWith(ALT_RELATIVE_PATH_MARKER) || filename.StartsWith(ALT_CURRENT_FOLDER_PATH_MARKER)) filename.StartsWith(ALT_RELATIVE_PATH_MARKER) || filename.StartsWith(ALT_CURRENT_FOLDER_PATH_MARKER))
{ {
ReportError("Relative include paths are not supported by ZDoom"); List<string> pathTokens = localsourcename.Split('\\', '/').ToList(); // take full path of current source file, split to individual folders
return false; pathTokens.RemoveAt(pathTokens.Count - 1); // remove filename itself
} pathTokens.AddRange(filename.Split('\\', '/')); // add relative path
pathTokens.RemoveAll(token => token.Equals(".", StringComparison.InvariantCulture)); // remove all "." folders from the path
for (int i = 0; i < pathTokens.Count; i++)
{
if (pathTokens[i].Equals("..", StringComparison.InvariantCulture)) // for each "..": remove them and previous folder from the path
{
if (i == 0) // cannot have ".." at start of full path
{
ReportError("Relative path escaping archive");
return false;
}
pathTokens.RemoveAt(i);
pathTokens.RemoveAt(i - 1);
i -= 2;
}
}
filename = string.Join("/", pathTokens); // combine the included file path
}
//mxd. Backward slashes are not supported //mxd. Backward slashes are not supported
if (filename.Contains("\\")) if (filename.Contains("\\"))