[os] fix #10017 regression

nim-lang · Dec 16, 2018 · 14c8d31 · 14c8d31
1 parent 0409f23
commit 14c8d31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/pure/pathnorm.nim b/lib/pure/pathnorm.nim
@@ -100,3 +100,4 @@ proc normalizePath*(path: string; dirSep = DirSep): string =
   result = newStringOfCap(path.len)
   var state = 0
   addNormalizePath(path, result, state, dirSep)
+  if result == "" and path != "": result = "."
diff --git a/tests/stdlib/tos.nim b/tests/stdlib/tos.nim
@@ -190,14 +190,17 @@ block walkDirRec:
   removeDir("walkdir_test")
 
 block normalizedPath:
+  doAssert normalizedPath("") == ""
   block relative:
-    doAssert normalizedPath(".") == ""
+    doAssert normalizedPath(".") == "."
+    doAssert normalizedPath("foo/..") == "."
+    doAssert normalizedPath("foo//../bar/.") == "bar"
     doAssert normalizedPath("..") == ".."
     doAssert normalizedPath("../") == ".."
     doAssert normalizedPath("../..") == unixToNativePath"../.."
     doAssert normalizedPath("../a/..") == ".."
     doAssert normalizedPath("../a/../") == ".."
-    doAssert normalizedPath("./") == ""
+    doAssert normalizedPath("./") == "."
 
   block absolute:
     doAssert normalizedPath("/") == unixToNativePath"/"