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

re-write $if os { and fix GCC segfaults on compilation

Browse Source
This commit is contained in:
Alexander Medvednikov
2019-06-24 13:51:11 +02:00
parent e604d5e2c8
commit b13f233521
4 changed files with 58 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
os/os.v
View File

@ -288,15 +288,15 @@ pub fn system(cmd string) string {
fn system_into_lines(s string) []string {
mut res := []string
cmd := '$s 2>&1'
#ifdef windows
# FILE* f = _popen(cmd.str, "r");
#else
# FILE* f = popen(cmd.str, "r");
#endif
#define MAX 5000
// # char buf[MAX];
# char * buf = malloc(sizeof(char) * MAX);
# while (fgets(buf, MAX, f) != NULL)
max := 5000
$if windows {
# FILE* f = _popen(cmd.str, "r");
}
$else {
# FILE* f = popen(cmd.str, "r");
}
# char * buf = malloc(sizeof(char) * max);
# while (fgets(buf, max, f) != NULL)
{
val := ''
# buf[strlen(buf) - 1] = '\0'; // eat the newline fgets() stores
@ -323,11 +323,12 @@ fn exit(code int) {
pub fn file_exists(path string) bool {
// # return access( path.str, F_OK ) != -1 ;
res := false
#ifdef windows
# res = _access( path.str, 0 ) != -1 ;
#else
# res = access( path.str, 0 ) != -1 ;
#endif
$if windows {
# res = _access( path.str, 0 ) != -1 ;
}
$else {
# res = access( path.str, 0 ) != -1 ;
}
return res
}
@ -435,16 +436,16 @@ pub fn write_file(path, text string) {
}
fn on_segfault(f voidptr) {
#ifdef windows
return
#endif
#ifdef mac
# struct sigaction sa;
# memset(&sa, 0, sizeof(struct sigaction));
# sigemptyset(&sa.sa_mask);
# sa.sa_sigaction = f;
# sa.sa_flags = SA_SIGINFO;
# sigaction(SIGSEGV, &sa, 0);
#endif
$if windows {
return
}
$if mac {
# struct sigaction sa;
# memset(&sa, 0, sizeof(struct sigaction));
# sigemptyset(&sa.sa_mask);
# sa.sa_sigaction = f;
# sa.sa_flags = SA_SIGINFO;
# sigaction(SIGSEGV, &sa, 0);
}
}