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

os.exec: on unix return error, when the command was not found, instead of os.Result

pull/6068/head
Delyan Angelov 2020-08-05 06:26:56 +03:00
parent c261408f54
commit ab7936f514
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/os/os_nix.c.v
View File

@ -148,9 +148,9 @@ pub fn exec(cmd string) ?Result {
soutput := res.str() soutput := res.str()
// res.free() // res.free()
exit_code := vpclose(f) exit_code := vpclose(f)
// if exit_code != 0 { if exit_code == 127 {
// return error(res) return error_with_code(soutput, 127)
// } }
return Result{ return Result{
exit_code: exit_code exit_code: exit_code
output: soutput output: soutput

12
vlib/os/os_windows.c.v
View File

@ -241,13 +241,15 @@ pub fn exec(cmd string) ?Result {
create_pipe_ok := C.CreatePipe(voidptr(&child_stdout_read), create_pipe_ok := C.CreatePipe(voidptr(&child_stdout_read),
voidptr(&child_stdout_write), voidptr(&sa), 0) voidptr(&child_stdout_write), voidptr(&sa), 0)
if !create_pipe_ok { if !create_pipe_ok {
error_msg := get_error_msg(int(C.GetLastError())) error_num := int(C.GetLastError())
return error('exec failed (CreatePipe): $error_msg') error_msg := get_error_msg(error_num)
return error_with_code('exec failed (CreatePipe): $error_msg', error_num)
} }
set_handle_info_ok := C.SetHandleInformation(child_stdout_read, C.HANDLE_FLAG_INHERIT, 0) set_handle_info_ok := C.SetHandleInformation(child_stdout_read, C.HANDLE_FLAG_INHERIT, 0)
if !set_handle_info_ok { if !set_handle_info_ok {
error_msg := get_error_msg(int(C.GetLastError())) error_num := int(C.GetLastError())
panic('exec failed (SetHandleInformation): $error_msg') error_msg := get_error_msg(error_num)
return error_with_code('exec failed (SetHandleInformation): $error_msg', error_num)
} }
proc_info := ProcessInformation{} proc_info := ProcessInformation{}
@ -267,7 +269,7 @@ pub fn exec(cmd string) ?Result {
if !create_process_ok { if !create_process_ok {
error_num := int(C.GetLastError()) error_num := int(C.GetLastError())
error_msg := get_error_msg(error_num) error_msg := get_error_msg(error_num)
return error('exec failed (CreateProcess) with code $error_num: $error_msg cmd: $cmd') return error_with_code('exec failed (CreateProcess) with code $error_num: $error_msg cmd: $cmd', error_num)
} }
C.CloseHandle(child_stdin) C.CloseHandle(child_stdin)
C.CloseHandle(child_stdout_write) C.CloseHandle(child_stdout_write)