Skip to content

Cleanup FileSystemProvider from runtime checks #7655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 8 commits into from
Sep 8, 2018
Merged

Cleanup FileSystemProvider from runtime checks #7655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
34399f0
Cleanup FileSystemProvider from runtime checks
iSazonov Aug 29, 2018
651e1b5
Revert "Cleanup FileSystemProvider from runtime checks"
iSazonov Aug 29, 2018
125e4be
Step 1
iSazonov Aug 29, 2018
6a06f1c
Step 2
iSazonov Aug 29, 2018
10e81eb
Step 3
iSazonov Aug 29, 2018
8b881d2
Step 4
iSazonov Aug 29, 2018
b8e5322
Step 5
iSazonov Aug 29, 2018
08e3d7f
[Feature]
iSazonov Sep 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,12 +497,6 @@ internal static bool NonWindowsIsSymLink(FileSystemInfo fileInfo)
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);
Expand Down
34 changes: 10 additions & 24 deletions src/System.Management.Automation/namespaces/FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7618,25 +7618,23 @@ internal static extern IntPtr CreateFile(
/// <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);
Copy link
Collaborator

@rjmholt rjmholt Aug 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the definition for this method is gone but a call remains. Is there another definition somewhere?

Copy link
Collaborator Author

@iSazonov iSazonov Aug 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, one - wih handle parameter, second with string parameter. First one was removed.

Copy link
Collaborator

@rjmholt rjmholt Aug 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checking 😄

}
else
return null;

return null;
}

/// <summary>
Expand Down Expand Up @@ -7964,18 +7962,6 @@ internal static bool WinIsHardLink(ref IntPtr handle)
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)
{
Expand Down