Skip to content

[patch] Strip every trailing separator when canonicalizing a path #404

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matt-edmondson merged 1 commit into from
Oct 9, 2026
Merged

[patch] Strip every trailing separator when canonicalizing a path #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions Semantics.Paths/SemanticPath.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ protected override string MakeCanonical(string input)
// Normalize directory separators to the current platform's preferred separator
canonical = canonical.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);

// Remove trailing directory separator (except for root paths)
// Remove every trailing directory separator, so "/a//" is "/a", but stop at a root path
string separator = new([Path.DirectorySeparatorChar]);
if (canonical.EndsWith(separator) && canonical.Length > separator.Length)
while (canonical.EndsWith(separator) && canonical.Length > separator.Length)
{
// Check if this is a Windows root path (e.g., "C:\")
#if NET5_0_OR_GREATER
Expand All @@ -139,14 +139,16 @@ protected override string MakeCanonical(string input)
#endif

// Only remove trailing separator if it's not a root path
if (!isWindowsRoot && !isUnixRoot)
if (isWindowsRoot || isUnixRoot)
{
break;
}

#if NETSTANDARD2_0
canonical = canonical.Substring(0, canonical.Length - separator.Length);
canonical = canonical.Substring(0, canonical.Length - separator.Length);
#else
canonical = canonical[..^separator.Length];
canonical = canonical[..^separator.Length];
#endif
}
}

return canonical;
Expand Down
25 changes: 25 additions & 0 deletions Semantics.Test/Paths/PathContainmentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,29 @@ public void SiblingSharingANamePrefix_IsNotAChild()
Assert.IsFalse(File(TestPaths.Absolute("home2.txt")).IsChildOf(home));
Assert.IsFalse(home.IsParentOf(Dir(TestPaths.Absolute("home2"))));
}

[TestMethod]
[DataRow(2)]
[DataRow(3)]
public void RepeatedTrailingSeparators_CanonicalizeToTheSameDirectory(int separatorCount)
{
string plain = TestPaths.Absolute("home", "user", "a");
AbsoluteDirectoryPath doubled = Dir(plain + new string(TestPaths.Separator, separatorCount));
AbsoluteDirectoryPath single = Dir(plain);

Assert.AreEqual(plain, doubled.WeakString);
Assert.AreEqual(single, doubled);
Assert.IsFalse(doubled.IsChildOf(single));
Assert.IsFalse(single.IsChildOf(doubled));
Assert.IsFalse(single.IsParentOf(doubled));
}

[TestMethod]
public void RootWithRepeatedTrailingSeparators_StaysTheRoot()
{
AbsoluteDirectoryPath root = Dir(TestPaths.Root + TestPaths.Separator + TestPaths.Separator);

Assert.AreEqual(TestPaths.Root, root.WeakString);
Assert.IsFalse(root.IsChildOf(Dir(TestPaths.Root)));
}
}
Loading