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

Cleanup FileSystemProvider from runtime checks (#7655)

Browse Source 
Replace runtime checks with compile time checks.
Remove unneeded methods.
This commit is contained in:
Ilya
2018-09-10 11:18:50 -07:00
committed by Travis Plunk
parent e74bd730fe
commit 433ec46efb
2 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
-6
View File
@@ -497,12 +497,6 @@ namespace System.Management.Automation
return Unix.NativeMethods.IsSymLink(fileInfo.FullName);
}
internal static string NonWindowsInternalGetTarget(SafeFileHandle handle)
{
// SafeHandle is a Windows concept. Use the string version instead.
throw new PlatformNotSupportedException();
}
internal static string NonWindowsInternalGetTarget(string path)
{
return Unix.NativeMethods.FollowSymLink(path);
src/System.Management.Automation/namespaces/FileSystemProvider.cs
+10 -24
View File
@@ -7618,25 +7618,23 @@ namespace Microsoft.PowerShell.Commands
/// <returns>The target of the reparse point</returns>
public static IEnumerable<string> GetTarget(PSObject instance)
{
FileSystemInfo fileSysInfo = instance.BaseObject as FileSystemInfo;
if (fileSysInfo != null)
if (instance.BaseObject is FileSystemInfo fileSysInfo)
{
if (Platform.IsWindows)
#if !UNIX
using (SafeFileHandle handle = OpenReparsePoint(fileSysInfo.FullName, FileDesiredAccess.GenericRead))
{
using (SafeFileHandle handle = OpenReparsePoint(fileSysInfo.FullName, FileDesiredAccess.GenericRead))
{
string linkTarget = InternalGetTarget(handle);
string linkTarget = WinInternalGetTarget(handle);
if (linkTarget != null)
return (new string[] { linkTarget });
if (linkTarget != null)
{
return (new string[] { linkTarget });
}
}
#endif
return InternalGetTarget(fileSysInfo.FullName);
}
else
return null;
return null;
}
/// <summary>
@@ -7964,18 +7962,6 @@ namespace Microsoft.PowerShell.Commands
return succeeded && (handleInfo.NumberOfLinks > 1);
}
private static string InternalGetTarget(SafeFileHandle handle)
{
if (Platform.IsWindows)
{
return WinInternalGetTarget(handle);
}
else
{
return Platform.NonWindowsInternalGetTarget(handle);
}
}
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods")]
private static string WinInternalGetTarget(SafeFileHandle handle)
{