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

Fix how relativePath handle case sensitiviy (#12312) [backport]

Browse source
This commit is contained in:
Tomohiro 2019-10-01 16:09:59 +09:00 • committed by Andreas Rumpf
commit 64d5e25821
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pure/os.nim
View file

@ -232,9 +232,9 @@ proc splitPath*(path: string): tuple[head, tail: string] {.
result.tail = path result.tail = path
when FileSystemCaseSensitive: when FileSystemCaseSensitive:
template `!=?`(a, b: char): bool = toLowerAscii(a) != toLowerAscii(b)
else:
template `!=?`(a, b: char): bool = a != b template `!=?`(a, b: char): bool = a != b
else:
template `!=?`(a, b: char): bool = toLowerAscii(a) != toLowerAscii(b)
proc relativePath*(path, base: string; sep = DirSep): string {. proc relativePath*(path, base: string; sep = DirSep): string {.
noSideEffect, rtl, extern: "nos$1", raises: [].} = noSideEffect, rtl, extern: "nos$1", raises: [].} =

4
tests/stdlib/tos.nim
View file

@ -329,6 +329,10 @@ block ospaths:
doAssert relativePath("/Users/me/bar/z.nim", "/Users/me", '/') == "bar/z.nim" doAssert relativePath("/Users/me/bar/z.nim", "/Users/me", '/') == "bar/z.nim"
doAssert relativePath("", "/users/moo", '/') == "" doAssert relativePath("", "/users/moo", '/') == ""
doAssert relativePath("foo", "", '/') == "foo" doAssert relativePath("foo", "", '/') == "foo"
doAssert relativePath("/foo", "/Foo", '/') == (when FileSystemCaseSensitive: "../foo" else: "")
doAssert relativePath("/Foo", "/foo", '/') == (when FileSystemCaseSensitive: "../Foo" else: "")
doAssert relativePath("/foo", "/fOO", '/') == (when FileSystemCaseSensitive: "../foo" else: "")
doAssert relativePath("/foO", "/foo", '/') == (when FileSystemCaseSensitive: "../foO" else: "")
doAssert joinPath("usr", "") == unixToNativePath"usr/" doAssert joinPath("usr", "") == unixToNativePath"usr/"
doAssert joinPath("", "lib") == "lib" doAssert joinPath("", "lib") == "lib"