fix 3 minor bugs in joinPath (see nim-lang#13455)

a-mr · Feb 21, 2020 · 6c5531b · 6c5531b
1 parent 4cbeddd
commit 6c5531b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/lib/pure/os.nim b/lib/pure/os.nim
@@ -147,7 +147,7 @@ proc joinPath*(head, tail: string): string {.
   result = newStringOfCap(head.len + tail.len)
   var state = 0
   addNormalizePath(head, result, state, DirSep)
-  if tail.len == 0:
+  if head.len != 0 and head[^1] notin {DirSep, AltSep} and tail.len == 0:
     result.add DirSep
   else:
     addNormalizePath(tail, result, state, DirSep)

diff --git a/lib/pure/pathnorm.nim b/lib/pure/pathnorm.nim
@@ -69,7 +69,8 @@ proc addNormalizePath*(x: string; result: var string; state: var int;
   while hasNext(it, x):
     let b = next(it, x)
     if (state shr 1 == 0) and isSlash(x, b):
-      result.add dirSep
+      if result.len == 0 or result[^1] notin {DirSep, AltSep}:
+        result.add dirSep
       state = state or 1
     elif isDotDot(x, b):
       if (state shr 1) >= 1:

diff --git a/tests/stdlib/tos.nim b/tests/stdlib/tos.nim
@@ -357,6 +357,9 @@ block ospaths:
   doAssert joinPath("", "lib") == "lib"
   doAssert joinPath("", "/lib") == unixToNativePath"/lib"
   doAssert joinPath("usr/", "/lib") == unixToNativePath"usr/lib"
+  doAssert joinPath("", "") == unixToNativePath""
+  doAssert joinPath("/" / "") == unixToNativePath"/"
+  doAssert joinPath("/", "/a/b/c") == unixToNativePath"/a/b/c"
 
 block getTempDir:
   block TMPDIR: