Merge pull request #96 from Facepunch/fix/path-without-volume

Fix rooted path without volume label regression on Windows
xoofx · Aug 1, 2024 · ba7197e · ba7197e
2 parents 083b29d + 86b2af6
commit ba7197e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/Zio.Tests/FileSystems/TestPhysicalFileSystem.cs b/src/Zio.Tests/FileSystems/TestPhysicalFileSystem.cs
@@ -31,6 +31,19 @@ public void TestFileSystemInvalidDriveLetterOnWindows()
         }
     }
 
+    [SkippableFact]
+    public void TestRootedPathWithoutDriveOnWindows()
+    {
+        Skip.IfNot(IsWindows, "Testing Windows-specific behavior");
+
+        var driveLetter = Directory.GetCurrentDirectory()[0];
+        var fs = new PhysicalFileSystem();
+
+        var resolvedPath = fs.ConvertPathFromInternal("/test");
+
+        Assert.Equal($"/mnt/{driveLetter}/test", resolvedPath.ToString(), StringComparer.OrdinalIgnoreCase);
+    }
+
     [Fact]
     public void TestWatcher()
     {

diff --git a/src/Zio/FileSystems/PhysicalFileSystem.cs b/src/Zio/FileSystems/PhysicalFileSystem.cs
@@ -977,9 +977,12 @@ protected override UPath ConvertPathFromInternalImpl(string innerPath)
             if (innerPath.StartsWith(@"\\", StringComparison.Ordinal) || innerPath.StartsWith(@"\?", StringComparison.Ordinal))
                 throw new NotSupportedException($"Path starting with `\\\\` or `\\?` are not supported -> `{innerPath}` ");
 
-            var absolutePath = Path.IsPathRooted(innerPath) ? innerPath : Path.GetFullPath(innerPath);
-            var driveIndex = absolutePath.IndexOf(":\\", StringComparison.Ordinal);
-            if (driveIndex != 1)
+            // We want to avoid using Path.GetFullPath unless absolutely necessary,
+            // because it can change the case of already rooted paths that contain a ~
+            var absolutePath = HasWindowsVolumeLabel(innerPath) ? innerPath : Path.GetFullPath(innerPath);
+
+            // Assert that Path.GetFullPath returned the format we expect
+            if (!HasWindowsVolumeLabel(absolutePath))
                 throw new ArgumentException($"Expecting a drive for the path `{absolutePath}`");
 
             var builder = UPath.GetSharedStringBuilder();
@@ -1032,4 +1035,12 @@ private static bool IsDriveLetter(char c)
     {
         return c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z';
     }
+
+    private static bool HasWindowsVolumeLabel( string path )
+    {
+        if ( !IsOnWindows )
+            throw new NotSupportedException( $"{nameof( HasWindowsVolumeLabel )} is only supported on Windows platforms." );
+
+        return path.Length >= 3 && path[1] == ':' && path[2] is '\\' or '/';
+    }
 }