From f33d16d3c54bd8ed40720a32b61523a96e453bc4 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 19 Jul 2019 15:48:10 +0100 Subject: [PATCH] Set only supported namespaces in ISO9660 when the requested one is guaranteed to not exist. --- DiscImageChef.Filesystems/ISO9660/Super.cs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/DiscImageChef.Filesystems/ISO9660/Super.cs b/DiscImageChef.Filesystems/ISO9660/Super.cs index ebd6b769a..9bd69802c 100644 --- a/DiscImageChef.Filesystems/ISO9660/Super.cs +++ b/DiscImageChef.Filesystems/ISO9660/Super.cs @@ -179,6 +179,27 @@ namespace DiscImageChef.Filesystems.ISO9660 } else fsFormat = "ISO9660"; + // High Sierra and CD-i do not support Joliet or RRIP + if((highSierra || cdi) && this.@namespace != Namespace.Normal && this.@namespace != Namespace.Vms) + this.@namespace = Namespace.Normal; + + if(jolietvd is null) + { + switch(this.@namespace) + { + case Namespace.Joliet: + case Namespace.JolietNormal: + this.@namespace = Namespace.Normal; + break; + case Namespace.RripJoliet: + this.@namespace = Namespace.Rrip; + break; + case Namespace.RripJolietNormal: + this.@namespace = Namespace.RripNormal; + break; + } + } + uint rootLocation = 0; uint rootSize = 0;