vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

better os.executable on macos

pull/1170/head
Alexander Medvednikov 2019-07-15 23:22:29 +02:00
parent b20d7ad086
commit 24a1e0e24a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vlib/os/os.v
View File

@ -507,8 +507,8 @@ fn on_segfault(f voidptr) {
} }
} }
pub fn getexepath() string { pub fn executable() string {
mut result := [4096]byte // [MAX_PATH]byte --> error byte undefined mut result := malloc(MAX_PATH)
$if linux { $if linux {
count := int(C.readlink('/proc/self/exe', result, MAX_PATH )) count := int(C.readlink('/proc/self/exe', result, MAX_PATH ))
if(count < 0) { if(count < 0) {
@ -523,11 +523,22 @@ pub fn getexepath() string {
} }
$if mac { $if mac {
buf := malloc(MAX_PATH)
pid := C.getpid()
ret := C.proc_pidpath (pid, buf, MAX_PATH)
if ret <= 0 {
println('executable() failed')
return ''
}
return string(buf)
/*
// This doesn't work with symlinks
mut bufsize := MAX_PATH // if buffer is too small this will be updated with size needed mut bufsize := MAX_PATH // if buffer is too small this will be updated with size needed
if C._NSGetExecutablePath(result, &bufsize) == -1 { if C._NSGetExecutablePath(result, &bufsize) == -1 {
panic('Could not get executable path, buffer too small (need: $bufsize).') panic('Could not get executable path, buffer too small (need: $bufsize).')
} }
return tos(result, strlen(result)) return string(result)
*/
} }
} }