Skip to content

Fix Path.GetPathRoot wrong check in Unix #35734

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
carlossanlop merged 4 commits into from
May 13, 2020
Merged

Fix Path.GetPathRoot wrong check in Unix #35734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7393aee
Fix Path.GetPathRoot wrong check in Unix
carlossanlop May 2, 2020
9957f89
Return .Empty instead of null
carlossanlop May 2, 2020
57b9529
Update src/libraries/System.Private.CoreLib/src/System/IO/Path.Unix.cs
carlossanlop May 2, 2020
f6f3f72
Address unit test comments
carlossanlop May 12, 2020
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
3 changes: 1 addition & 2 deletions src/libraries/System.Private.CoreLib/src/System/IO/Path.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,12 @@ public static bool IsPathRooted(ReadOnlySpan<char> path)
public static string? GetPathRoot(string? path)
{
if (PathInternal.IsEffectivelyEmpty(path)) return null;

return IsPathRooted(path) ? PathInternal.DirectorySeparatorCharAsString : string.Empty;
}

public static ReadOnlySpan<char> GetPathRoot(ReadOnlySpan<char> path)
{
return PathInternal.IsEffectivelyEmpty(path) && IsPathRooted(path) ? PathInternal.DirectorySeparatorCharAsString.AsSpan() : ReadOnlySpan<char>.Empty;
return IsPathRooted(path) ? PathInternal.DirectorySeparatorCharAsString.AsSpan() : ReadOnlySpan<char>.Empty;
}

/// <summary>Gets whether the system is case-sensitive.</summary>
Expand Down
12 changes: 10 additions & 2 deletions src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public void GetDirectoryName_CurrentDirectory()
Assert.Equal(curDir, Path.GetDirectoryName(Path.Combine(curDir, "baz")));

Assert.Null(Path.GetDirectoryName(Path.GetPathRoot(curDir)));
Assert.True(Path.GetDirectoryName(Path.GetPathRoot(curDir.AsSpan())).IsEmpty);
}

[Fact]
Expand Down Expand Up @@ -108,10 +109,16 @@ public void GetPathRoot_Null()
public void GetPathRoot_Basic()
{
string cwd = Directory.GetCurrentDirectory();
Assert.Equal(cwd.Substring(0, cwd.IndexOf(Path.DirectorySeparatorChar) + 1), Path.GetPathRoot(cwd));
string substring = cwd.Substring(0, cwd.IndexOf(Path.DirectorySeparatorChar) + 1);

Assert.Equal(substring, Path.GetPathRoot(cwd));
PathAssert.Equal(substring.AsSpan(), Path.GetPathRoot(cwd.AsSpan()));

Assert.True(Path.IsPathRooted(cwd));

Assert.Equal(string.Empty, Path.GetPathRoot(@"file.exe"));
Assert.True(Path.GetPathRoot(@"file.exe".AsSpan()).IsEmpty);

Assert.False(Path.IsPathRooted("file.exe"));
}

Expand Down Expand Up @@ -417,6 +424,7 @@ public void GetInvalidPathChars()
Assert.EndsWith(bad, Path.GetFullPath(bad));
}
Assert.Equal(string.Empty, Path.GetPathRoot(bad));
Assert.True(Path.GetPathRoot(bad.AsSpan()).IsEmpty);
Assert.False(Path.IsPathRooted(bad));
});
}
Expand All @@ -431,7 +439,7 @@ public void GetInvalidPathChars_Span()
Assert.Equal(string.Empty, new string(Path.GetExtension(bad.AsSpan())));
Assert.Equal(bad, new string(Path.GetFileName(bad.AsSpan())));
Assert.Equal(bad, new string(Path.GetFileNameWithoutExtension(bad.AsSpan())));
Assert.Equal(string.Empty, new string(Path.GetPathRoot(bad.AsSpan())));
Assert.True(Path.GetPathRoot(bad.AsSpan()).IsEmpty);
Assert.False(Path.IsPathRooted(bad.AsSpan()));
});
}
Expand Down
34 changes: 33 additions & 1 deletion src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests_Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public static void GetPathRoot(string value, string expected)
// UNCs and device paths have no special meaning in Unix
_ = expected;
Assert.Empty(Path.GetPathRoot(value));
Assert.True(Path.GetPathRoot(value.AsSpan()).IsEmpty);
}

[Theory,
Expand Down Expand Up @@ -115,13 +116,44 @@ public void GetFullPath_Unix_Whitespace()
{ @"../../../tmp/bar/..", @"/home/git", @"/tmp" },
{ @"../../././tmp/..", @"/home/git", @"/" },
{ @"././../../../", @"/home/git", @"/" },
{ @"../tmp/../..", @"/home", @"/" }
};

[Theory,
MemberData(nameof(GetFullPath_BasePath_BasicExpansions_TestData_Unix))]
public static void GetFullPath_BasicExpansions_Unix(string path, string basePath, string expected)
{
Assert.Equal(expected, Path.GetFullPath(path, basePath));
string fullPath = Path.GetFullPath(path, basePath);
Assert.Equal(expected, fullPath);
}

[Theory]
[InlineData(@"/../../.././tmp/..")]
[InlineData(@"/../../../")]
[InlineData(@"/../../../tmp/bar/..")]
[InlineData(@"/../.././././bar/../../../")]
[InlineData(@"/../../././tmp/..")]
[InlineData(@"/../../tmp/../../")]
[InlineData(@"/../../tmp/bar/..")]
[InlineData(@"/../tmp/../..")]
[InlineData(@"/././../../../../")]
[InlineData(@"/././../../../")]
[InlineData(@"/./././bar/../../../")]
[InlineData(@"/")]
[InlineData(@"/bar")]
[InlineData(@"/bar/././././../../..")]
[InlineData(@"/bar/tmp")]
[InlineData(@"/tmp/..")]
[InlineData(@"/tmp/../../../../../bar")]
[InlineData(@"/tmp/../../../bar")]
[InlineData(@"/tmp/../bar/../..")]
[InlineData(@"/tmp/bar")]
[InlineData(@"/tmp/bar/..")]
public static void GePathRoot_Unix(string path)
{
string expected = @"/";
Assert.Equal(expected, Path.GetPathRoot(path));
PathAssert.Equal(expected.AsSpan(), Path.GetPathRoot(path.AsSpan()));
}

[Fact]
Expand Down