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

ci: fix windows-tcc job

pull/9611/head
Delyan Angelov 2021-04-05 23:35:00 +03:00
parent 3617ce0539
commit 19b915b105
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/net/address.v
View File

@ -31,7 +31,7 @@ fn new_addr(addr C.sockaddr) ?Addr {
// Convert to string representation // Convert to string representation
buf := []byte{len: net.max_ipv4_addr_len, init: 0} buf := []byte{len: net.max_ipv4_addr_len, init: 0}
$if windows { $if windows {
res := C.WSAAddressToStringA(&addr, addr_len, C.NULL, buf.data, &buf.len) res := C.WSAAddressToStringA(&addr, addr_len, C.NULL, buf.data, unsafe { &u32(&buf.len) })
if res != 0 { if res != 0 {
socket_error(-1) ? socket_error(-1) ?
} }

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

@ -170,19 +170,20 @@ pub fn execute(cmd string) Result {
output: 'exec("$cmd") failed' output: 'exec("$cmd") failed'
} }
} }
buf := [4096]byte{} buf := unsafe { &char(malloc(4096)) }
mut res := strings.new_builder(1024) mut res := strings.new_builder(1024)
defer { defer {
unsafe { res.free() } unsafe { res.free() }
} }
unsafe { unsafe {
bufbp := &buf[0] bufbp := buf
for C.fgets(&char(bufbp), 4096, f) != 0 { for C.fgets(bufbp, 4096, f) != 0 {
res.write_ptr(bufbp, vstrlen(bufbp)) res.write_ptr(bufbp, vstrlen(bufbp))
} }
} }
soutput := res.str() soutput := res.str()
exit_code := vpclose(f) exit_code := vpclose(f)
unsafe { free(buf) }
return Result{ return Result{
exit_code: exit_code exit_code: exit_code
output: soutput output: soutput

10
vlib/v/util/diff.v
View File

@ -69,14 +69,14 @@ pub fn color_compare_files(diff_cmd string, file1 string, file2 string) string {
} }
pub fn color_compare_strings(diff_cmd string, unique_prefix string, expected string, found string) string { pub fn color_compare_strings(diff_cmd string, unique_prefix string, expected string, found string) string {
cdir := os.cache_dir() cdir := os.join_path(os.cache_dir(), unique_prefix)
os.mkdir(cdir) or {}
ctime := time.sys_mono_now() ctime := time.sys_mono_now()
e_file := os.join_path(cdir, '${unique_prefix}_${ctime}.expected.txt') e_file := os.join_path(cdir, '${ctime}.expected.txt')
f_file := os.join_path(cdir, '${unique_prefix}_${ctime}.found.txt') f_file := os.join_path(cdir, '${ctime}.found.txt')
os.write_file(e_file, expected) or { panic(err) } os.write_file(e_file, expected) or { panic(err) }
os.write_file(f_file, found) or { panic(err) } os.write_file(f_file, found) or { panic(err) }
res := color_compare_files(diff_cmd, e_file, f_file) res := color_compare_files(diff_cmd, e_file, f_file)
os.rm(e_file) or { panic(err) } os.rmdir_all(cdir) or {}
os.rm(f_file) or { panic(err) }
return res return res
} }