icsharpcode/ILSpy
1
0
Fork 0
mirror of https://github.com/icsharpcode/ILSpy.git synced 2026-10-12 02:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix second issue mentioned in #2565: resource names such as path/to/file.ext are now properly handled as relative paths.

Browse Source
This commit is contained in:
Siegfried Pammer
2021-12-03 15:50:06 +01:00
parent 849161e362
commit bf336d85cf
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ICSharpCode.Decompiler/CSharp/ProjectDecompiler/WholeProjectDecompiler.cs
+8 -2
View File
@@ -279,7 +279,7 @@ namespace ICSharpCode.Decompiler.CSharp.ProjectDecompiler
Stream entryStream = (Stream)value;
entryStream.Position = 0;
individualResources.AddRange(
WriteResourceToFile(fileName, (string)name, entryStream));
WriteResourceToFile(fileName, name, entryStream));
}
decodedIntoIndividualFiles = true;
}
@@ -576,7 +576,7 @@ namespace ICSharpCode.Decompiler.CSharp.ProjectDecompiler
/// <summary>
/// Removes invalid characters from file names and reduces their length,
/// but keeps file extensions intact.
/// but keeps file extensions and path structure intact.
/// </summary>
public static string SanitizeFileName(string fileName)
{
@@ -649,6 +649,12 @@ namespace ICSharpCode.Decompiler.CSharp.ProjectDecompiler
if (separateAtDots)
currentSegmentLength = 0;
}
else if (treatAsFileName && (c == '/' || c == '\\') && currentSegmentLength > 0)
{
// if we treat this as a file name, we've started a new segment
b.Append(c);
currentSegmentLength = 0;
}
else
{
// if the current segment exceeds maxSegmentLength characters,