fix for relativeTo with paths containing dots

square · Apr 15, 2024 · dcb0fea · dcb0fea
1 parent a647246
commit dcb0fea
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/okio/src/commonMain/kotlin/okio/internal/Path.kt b/okio/src/commonMain/kotlin/okio/internal/Path.kt
@@ -250,6 +250,11 @@ internal inline fun Path.commonRelativeTo(other: Path): Path {
     "Impossible relative path to resolve: $this and $other"
   }
 
+  if (other.segmentsBytes.size == 1 && other.segmentsBytes.first() == DOT) {
+    // Anything relative to "." is itself!
+    return this
+  }
+
   val buffer = Buffer()
   val slash = other.slash ?: slash ?: Path.DIRECTORY_SEPARATOR.toSlash()
   for (i in firstNewSegmentIndex until otherSegments.size) {

diff --git a/okio/src/commonTest/kotlin/okio/PathTest.kt b/okio/src/commonTest/kotlin/okio/PathTest.kt
@@ -645,6 +645,19 @@ class PathTest {
     assertRelativeTo(b, a, "../a...n".toPath())
   }
 
+  @Test
+  fun relativeToRelativeWithDot() {
+    val a = "Desktop/documents/a".toPath()
+    val b = ".".toPath()
+    assertRelativeTo(a, b, "../../..".toPath())
+    assertRelativeTo(b, a, "Desktop/documents/a".toPath())
+
+    val c = "Desktop/documents/c".toPath()
+    val d = "Desktop/documents/./d".toPath()
+    assertRelativeTo(c, d, "../d".toPath())
+    assertRelativeTo(d, c, "../c".toPath())
+  }
+
   @Test
   fun relativeToRelativeWithMiddleDotsInCommonPrefix() {
     val a = "Desktop/documents/a...n/red".toPath()