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

Make getEnv case insensitive on Windows (#9722)

Browse source
This commit is contained in:
pgkos 2018-11-16 08:45:50 +01:00 • committed by Andreas Rumpf
commit 4efbde84ee
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pure/includes/osenv.nim
View file

@ -3,6 +3,8 @@
when not declared(os): when not declared(os):
{.error: "This is an include file for os.nim!".} {.error: "This is an include file for os.nim!".}
from parseutils import skipIgnoreCase
proc c_getenv(env: cstring): cstring {. proc c_getenv(env: cstring): cstring {.
importc: "getenv", header: "<stdlib.h>".} importc: "getenv", header: "<stdlib.h>".}
proc c_putenv(env: cstring): cint {. proc c_putenv(env: cstring): cint {.
@ -91,7 +93,10 @@ proc findEnvVar(key: string): int =
getEnvVarsC() getEnvVarsC()
var temp = key & '=' var temp = key & '='
for i in 0..high(environment): for i in 0..high(environment):
if startsWith(environment[i], temp): return i when defined(windows):
if skipIgnoreCase(environment[i], temp) == len(temp): return i
else:
if startsWith(environment[i], temp): return i
return -1 return -1
proc getEnv*(key: string, default = ""): TaintedString {.tags: [ReadEnvEffect].} = proc getEnv*(key: string, default = ""): TaintedString {.tags: [ReadEnvEffect].} =