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

On Mac OS X 10.5, realpath does not allocate the buffer on its own

Browse source
This commit is contained in:
Eric Doughty-Papassideris 2012-01-21 16:49:45 +01:00
commit 374a4cdb8a
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pure/os.nim
View file

@ -151,6 +151,10 @@ else: # UNIX-like operating system
ScriptExt* = "" ScriptExt* = ""
DynlibFormat* = "lib$1.so" DynlibFormat* = "lib$1.so"
when defined(macosx):
var
pathMax {.importc: "PATH_MAX", header: "<stdlib.h>".}: cint
const const
ExtSep* = '.' ExtSep* = '.'
## The character which separates the base filename from the extension; ## The character which separates the base filename from the extension;
@ -505,6 +509,12 @@ proc expandFilename*(filename: string): string {.rtl, extern: "nos$1".} =
var L = GetFullPathNameA(filename, 3072'i32, result, unused) var L = GetFullPathNameA(filename, 3072'i32, result, unused)
if L <= 0'i32 or L >= 3072'i32: OSError() if L <= 0'i32 or L >= 3072'i32: OSError()
setLen(result, L) setLen(result, L)
when defined(macosx):
# On Mac OS X 10.5, realpath does not allocate the buffer on its own
var pathBuffer: cstring = newString(pathMax)
var resultBuffer = realpath(filename, pathBuffer)
if resultBuffer == nil: OSError()
result = $resultBuffer
else: else:
var res = realpath(filename, nil) var res = realpath(filename, nil)
if res == nil: OSError() if res == nil: OSError()