jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #13211 relativePath("foo", ".") (#13213)

Browse source
This commit is contained in:
Timothee Cour 2020-01-21 06:48:19 -08:00 • committed by Andreas Rumpf
commit b355ef2a72
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pure/os.nim
View file

@ -353,8 +353,10 @@ proc relativePath*(path, base: string; sep = DirSep): string {.
assert relativePath("/Users///me/bar//z.nim", "//Users/", '/') == "me/bar/z.nim"
assert relativePath("/Users/me/bar/z.nim", "/Users/me", '/') == "bar/z.nim"
assert relativePath("", "/users/moo", '/') == ""
assert relativePath("foo", ".", '/') == "foo"
if path.len == 0: return ""
let base = if base == ".": "" else: base
when doslikeFileSystem:
if isAbsolute(path) and isAbsolute(base):