mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

os: fix realpath on windows

Browse Source
This commit is contained in:
Alexander Medvednikov 2019-11-23 20:56:22 +03:00
parent 1bd8c465d3
commit 0aa2196eec
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vlib/os/os.v
View File

@ -869,9 +869,11 @@ pub fn realpath(fpath string) string {
mut fullpath := calloc( MAX_PATH ) mut fullpath := calloc( MAX_PATH )
mut res := 0 mut res := 0
$if windows { $if windows {
// here we want an int==0 if _fullpath failed , in which case ret := C._fullpath(fpath.str, fullpath)
// it would return NULL, and !isnil(NULL) would be false==0 if ret == 0 {
res = int( !isnil(C._fullpath( fullpath, fpath.str, MAX_PATH )) ) return fpath
}
return string(fullpath)
} }
$else{ $else{
ret := C.realpath(fpath.str, fullpath) ret := C.realpath(fpath.str, fullpath)
@ -880,9 +882,6 @@ pub fn realpath(fpath string) string {
} }
return string(fullpath) return string(fullpath)
} }
if res != 0 {
return string(fullpath, vstrlen(fullpath))
}
return fpath return fpath
} }