Skip to content

Address Windows recommendations for Link APIs #58592

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
jozkee merged 6 commits into from
Sep 10, 2021
Merged

Address Windows recommendations for Link APIs #58592

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ce2f30
NT prefix shall not be treated as a relative path
jozkee Sep 2, 2021
2a5cda1
Remove file-folder-match validation
jozkee Sep 2, 2021
fbcfe3e
Use SubstituteName instead of PrintName since the latter is just for …
jozkee Sep 9, 2021
83a82bd
Fix MS.IO.Redist
jozkee Sep 9, 2021
b69d8c6
Fix whitespace in Strings.resx
jozkee Sep 9, 2021
4e73c72
Address suggestions
jozkee Sep 10, 2021
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
Prev Previous commit
Address suggestions
  • Loading branch information
@jozkee
jozkee committed Sep 10, 2021
commit 4e73c72d2b64adca76fdfff64905fdac6dfe9ee0
18 changes: 12 additions & 6 deletions src/libraries/System.Private.CoreLib/src/System/IO/FileSystem.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,15 +509,14 @@ internal static void CreateSymbolicLink(string path, string pathToTarget, bool i
if (targetPath.StartsWith(PathInternal.UncNTPathPrefix.AsSpan()))
{
// We need to prepend the Win32 equivalent of UNC NT prefix.
return Path.Join(PathInternal.UncPathPrefix.AsSpan(), targetPath.Slice(PathInternal.UncNTPathPrefix.Length)).ToString();
return Path.Join(PathInternal.UncPathPrefix.AsSpan(), targetPath.Slice(PathInternal.UncNTPathPrefix.Length));
}

Debug.Assert(targetPath.StartsWith(PathInternal.NTPathPrefix.AsSpan()));
return targetPath.Slice(PathInternal.NTPathPrefix.Length).ToString();
return GetTargetPathWithoutNTPrefix(targetPath);
}
else if (returnFullPath)
{
return Path.Join(Path.GetDirectoryName(linkPath.AsSpan()), targetPath).ToString();
return Path.Join(Path.GetDirectoryName(linkPath.AsSpan()), targetPath);
}
else
{
Expand All @@ -536,8 +535,9 @@ internal static void CreateSymbolicLink(string path, string pathToTarget, bool i

// Unlike symbolic links, mount point paths cannot be relative.
Debug.Assert(!PathInternal.IsPartiallyQualified(targetPath));
Debug.Assert(targetPath.StartsWith(PathInternal.NTPathPrefix.AsSpan()));
return targetPath.Slice(PathInternal.NTPathPrefix.Length).ToString();
// Mount points cannot point to a remote location.
Debug.Assert(!targetPath.StartsWith(PathInternal.UncNTPathPrefix.AsSpan()));
return GetTargetPathWithoutNTPrefix(targetPath);
}

return null;
Expand All @@ -546,6 +546,12 @@ internal static void CreateSymbolicLink(string path, string pathToTarget, bool i
{
ArrayPool<byte>.Shared.Return(buffer);
}

static string GetTargetPathWithoutNTPrefix(ReadOnlySpan<char> targetPath)
{
Debug.Assert(targetPath.StartsWith(PathInternal.NTPathPrefix.AsSpan()));
return targetPath.Slice(PathInternal.NTPathPrefix.Length).ToString();
}
}

private static unsafe string? GetFinalLinkTarget(string linkPath, bool isDirectory)
Expand Down