fix 3 minor bugs in joinPath (see #13455) (#13462) [backport]

2020-02-23 22:22:46 +03:00 · 2020-02-23 22:22:46 +03:00 · 3dad130034
commit 3dad130034
parent 13d292786e
4 changed files with 10 additions and 2 deletions
--- 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: