admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use standard SBCS detection (#18593)

Browse Source
This commit is contained in:
Ilya
2022-11-22 09:13:09 -08:00
committed by GitHub
parent 041f4332e5
commit 0d320ab89a
1 changed files with 1 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/namespaces/FileSystemContentStream.cs
+1 -42
View File
@@ -1173,39 +1173,9 @@ namespace Microsoft.PowerShell.Commands
private int _byteCount = 0;
private int _charCount = 0;
private long _currentPosition = 0;
private bool? _singleByteCharSet = null;
private const byte BothTopBitsSet = 0xC0;
private const byte TopBitUnset = 0x80;
/// <summary>
/// If the given encoding is OEM or Default, check to see if the code page
/// is SBCS(single byte character set).
/// </summary>
/// <returns></returns>
private bool IsSingleByteCharacterSet()
{
if (_singleByteCharSet != null)
return (bool)_singleByteCharSet;
// Porting note: only UTF-8 is supported on Linux, which is not an SBCS
if ((_currentEncoding.Equals(_oemEncoding) ||
_currentEncoding.Equals(_defaultAnsiEncoding))
&& Platform.IsWindows)
{
NativeMethods.CPINFO cpInfo;
if (NativeMethods.GetCPInfo((uint)_currentEncoding.CodePage, out cpInfo) &&
cpInfo.MaxCharSize == 1)
{
_singleByteCharSet = true;
return true;
}
}
_singleByteCharSet = false;
return false;
}
/// <summary>
/// We don't support this method because it is not used by the ReadBackward method in FileStreamContentReaderWriter.
/// </summary>
@@ -1474,8 +1444,7 @@ namespace Microsoft.PowerShell.Commands
}
else if (_currentEncoding is UnicodeEncoding ||
_currentEncoding is UTF32Encoding ||
_currentEncoding is ASCIIEncoding ||
IsSingleByteCharacterSet())
_currentEncoding.IsSingleByte)
{
// Unicode -- two bytes per character
// UTF-32 -- four bytes per character
@@ -1525,16 +1494,6 @@ namespace Microsoft.PowerShell.Commands
[MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_LEADBYTES)]
public byte[] LeadBytes;
}
/// <summary>
/// Get information on a named code page.
/// </summary>
/// <param name="codePage"></param>
/// <param name="lpCpInfo"></param>
/// <returns></returns>
[DllImport(PinvokeDllNames.GetCPInfoDllName, CharSet = CharSet.Unicode, SetLastError = true)]
[return: MarshalAs(UnmanagedType.Bool)]
internal static extern bool GetCPInfo(uint codePage, out CPINFO lpCpInfo);
}
}