Fst filename parsed with Shift-JIS string encoding.

Nanook · Oct 16, 2019 · 8ef3750 · 8ef3750
1 parent 47369eb
commit 8ef3750
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/NKit/DiscImage/BaseSection.cs b/NKit/DiscImage/BaseSection.cs
@@ -33,8 +33,9 @@ internal BaseSection(NStream stream, long discOffset, byte[] data, long size)
         public uint ReadUInt32L(int offset) { return littleEndian(BitConverter.ToUInt32(Data, offset)); }
         public ulong ReadUInt64L(int offset) { return littleEndian(BitConverter.ToUInt64(Data, offset)); }
         public string ReadString(int offset, int length) { return Encoding.ASCII.GetString(Data, offset, length); }
-        public string ReadStringToNull(int offset) { return readStringToNull(offset, -1); }
-        public string ReadStringToNull(int offset, int maxLength) { return readStringToNull(offset, maxLength); }
+        public string ReadStringToNull(int offset, Encoding encoding) { return readStringToNull(encoding, offset, -1); }
+        public string ReadStringToNull(int offset) { return readStringToNull(Encoding.ASCII, offset, -1); }
+        public string ReadStringToNull(int offset, int maxLength) { return readStringToNull(Encoding.ASCII, offset, maxLength); }
         public byte[] Read(int offset, int length)
         {
             byte[] buffer = new byte[length];
@@ -98,17 +99,18 @@ private ulong littleEndian(ulong x)
         private ushort bigEndian(ushort x) { return !BitConverter.IsLittleEndian ? x : (ushort)((x >> 8) | (x << 8)); }
         private ushort littleEndian(ushort x) { return BitConverter.IsLittleEndian ? x : (ushort)((x >> 8) | (x << 8)); }
 
-        private string readStringToNull(int offset, int maxLength)
+        private string readStringToNull(Encoding encoding, int offset, int maxLength)
         {
             try
             {
-                StringBuilder sb = new StringBuilder();
                 byte b;
                 int i = offset;
-                while ((maxLength == -1 || sb.Length <= maxLength) && (b = Data[i++]) != '\0')
-                    sb.Append((char)b);
+                int l = 0;
 
-                return sb.ToString();
+                while ((maxLength == -1 || l <= maxLength) && (b = Data[i++]) != '\0')
+                    l++;
+
+                return encoding.GetString(Data, offset, l);
             }
             catch (Exception ex)
             {

diff --git a/NKit/FilesAndStreams/FileSystem.cs b/NKit/FilesAndStreams/FileSystem.cs
@@ -163,7 +163,7 @@ private static uint recurseFst(MemorySection ms, FstFolder folder, long names, u
             uint hdr = ms.ReadUInt32B((int)(12 * i));
             long name = names + hdr & 0x00ffffffL;
             int type = (int)(hdr >> 24);
-            string nm = ms.ReadStringToNull((int)name);
+            string nm = ms.ReadStringToNull((int)name, Encoding.GetEncoding("shift-jis"));
             uint size = ms.ReadUInt32B((int)(12 * i + 8));
 
             if (type == 1)