aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for UTF-16 and other two-byte encodings.

Browse Source
This commit is contained in:
Natalia Portillo
2017-07-11 02:32:40 +01:00
parent 7f776a1940
commit 8c9939e0b7
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
StringHandlers.cs
View File

@@ -53,7 +53,7 @@ namespace DiscImageChef
/// <returns>The corresponding C# string</returns> /// <returns>The corresponding C# string</returns>
/// <param name="CString">A null-terminated (aka C string) byte array in the specified encoding</param> /// <param name="CString">A null-terminated (aka C string) byte array in the specified encoding</param>
/// <param name="encoding">Encoding.</param> /// <param name="encoding">Encoding.</param>
public static string CToString(byte[] CString, Encoding encoding) public static string CToString(byte[] CString, Encoding encoding, bool twoBytes = false)
{ {
if(CString == null) if(CString == null)
return null; return null;
@@ -63,7 +63,20 @@ namespace DiscImageChef
for(int i = 0; i < CString.Length; i++) for(int i = 0; i < CString.Length; i++)
{ {
if(CString[i] == 0) if(CString[i] == 0)
break; {
if(twoBytes)
{
if((i + 1) < CString.Length && CString[i + 1] == 0)
{
len++;
break;
}
// if((i + 1) == CString.Length)
// break;
}
else
break;
}
len++; len++;
} }