SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-08 18:06:41 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Take directory into account for IS-CAB

Browse Source
This commit is contained in:
Matt Nadareski
2026-05-18 13:35:59 -04:00
parent 78d7bc310f
commit a777df13db
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SabreTools.Wrappers/InstallShieldCabinet.Extraction.cs
View File

@@ -55,6 +55,11 @@ namespace SabreTools.Wrappers
/// </summary>
private const int MAX_WBITS = 15;
/// <summary>
/// Characters that should be replaced by an underscore for filenames
/// </summary>
private static readonly char[] PathReplacementCharacters = [' ', '<', '>', '[', ']'];
#endregion
#region Cabinet Set
@@ -236,13 +241,24 @@ namespace SabreTools.Wrappers
if (!cabinet.FileIsValid(i))
continue;
// Ensure directory separators are consistent
// Build the full path from the cabinet
string filename = cabinet.GetFileName(i) ?? $"BAD_FILENAME{i}";
uint dirIndex = cabinet.GetDirectoryIndexFromFile(i);
string dir = cabinet.GetDirectoryName((int)dirIndex) ?? $"BAD_DIRNAME{dirIndex}";
filename = Path.Combine(dir, filename);
// Ensure directory separators are consistent
if (Path.DirectorySeparatorChar == '\\')
filename = filename.Replace('/', '\\');
else if (Path.DirectorySeparatorChar == '/')
filename = filename.Replace('\\', '/');
// Consistently replace problematic path characters
foreach (char c in PathReplacementCharacters)
{
filename = filename.Replace(c, '_');
}
// Ensure the full output directory exists
filename = Path.Combine(outputDirectory, filename);
var directoryName = Path.GetDirectoryName(filename);