mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

add windows os code

Browse Source
This commit is contained in:
Andrew Kelley 2016-02-16 19:42:46 -07:00
parent 0e92b44043
commit 194e93a582
2 changed files with 116 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/Findclang.cmake
View File

@ -6,11 +6,17 @@
# CLANG_INCLUDE_DIRS # CLANG_INCLUDE_DIRS
# CLANG_LIBRARIES # CLANG_LIBRARIES
find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h PATHS /usr/lib/llvm-3.7/include) find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
PATHS
/usr/lib/llvm-3.7/include
/mingw64/include)
macro(FIND_AND_ADD_CLANG_LIB _libname_) macro(FIND_AND_ADD_CLANG_LIB _libname_)
string(TOUPPER ${_libname_} _prettylibname_) string(TOUPPER ${_libname_} _prettylibname_)
find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} PATHS /usr/lib/llvm-3.7/lib) find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
PATHS
/usr/lib/llvm-3.7/lib
/mingw64/lib)
if(CLANG_${_prettylibname_}_LIB) if(CLANG_${_prettylibname_}_LIB)
set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_${_prettylibname_}_LIB}) set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_${_prettylibname_}_LIB})
endif() endif()

143
src/os.cpp
View File

@ -9,6 +9,30 @@
#include "util.hpp" #include "util.hpp"
#include "error.hpp" #include "error.hpp"
#if defined(_WIN32)
#define ZIG_OS_WINDOWS
#if !defined(NOMINMAX)
#define NOMINMAX
#endif
#if !defined(VC_EXTRALEAN)
#define VC_EXTRALEAN
#endif
#if !defined(WIN32_LEAN_AND_MEAN)
#define WIN32_LEAN_AND_MEAN
#endif
#if !defined(UNICODE)
#define UNICODE
#endif
#include <windows.h>
#include <io.h>
#else
#define ZIG_OS_POSIX
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
@ -17,7 +41,10 @@
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
void os_spawn_process(const char *exe, ZigList<const char *> &args, int *return_code) { #endif
static void os_spawn_process_posix(const char *exe, ZigList<const char *> &args, int *return_code) {
pid_t pid = fork(); pid_t pid = fork();
if (pid == -1) if (pid == -1)
zig_panic("fork failed"); zig_panic("fork failed");
@ -37,24 +64,20 @@ void os_spawn_process(const char *exe, ZigList<const char *> &args, int *return_
} }
} }
static int read_all_fd_stream(int fd, Buf *out_buf) { #if defined(ZIG_OS_WINDOWS)
static const ssize_t buf_size = 0x2000; static void os_spawn_process_windows(const char *exe, ZigList<const char *> &args, int *return_code) {
buf_resize(out_buf, buf_size); zig_panic("TODO os_spawn_process_windows");
ssize_t actual_buf_len = 0; }
for (;;) { #endif
ssize_t amt_read = read(fd, buf_ptr(out_buf) + actual_buf_len, buf_size);
if (amt_read < 0) {
return ErrorFileSystem;
}
actual_buf_len += amt_read;
if (amt_read == 0) {
buf_resize(out_buf, actual_buf_len);
return 0;
}
buf_resize(out_buf, actual_buf_len + buf_size); void os_spawn_process(const char *exe, ZigList<const char *> &args, int *return_code) {
} #if defined(ZIG_OS_WINDOWS)
zig_unreachable(); os_spawn_process_windows(exe, args, return_code);
#elif defined(ZIG_OS_POSIX)
os_spawn_process_posix(exe, args, return_code);
#else
#error "missing os_spawn_process implementation"
#endif
} }
void os_path_split(Buf *full_path, Buf *out_dirname, Buf *out_basename) { void os_path_split(Buf *full_path, Buf *out_dirname, Buf *out_basename) {
@ -101,7 +124,30 @@ int os_path_real(Buf *rel_path, Buf *out_abs_path) {
return ErrorNone; return ErrorNone;
} }
void os_exec_process(const char *exe, ZigList<const char *> &args, int os_fetch_file(FILE *f, Buf *out_buf) {
static const ssize_t buf_size = 0x2000;
buf_resize(out_buf, buf_size);
ssize_t actual_buf_len = 0;
for (;;) {
size_t amt_read = fread(buf_ptr(out_buf) + actual_buf_len, 1, buf_size, f);
actual_buf_len += amt_read;
if (amt_read != buf_size) {
if (feof(f)) {
buf_resize(out_buf, actual_buf_len);
return 0;
} else {
return ErrorFileSystem;
}
}
buf_resize(out_buf, actual_buf_len + buf_size);
}
zig_unreachable();
}
#if defined(ZIG_OS_POSIX)
static void os_exec_process_posix(const char *exe, ZigList<const char *> &args,
int *return_code, Buf *out_stderr, Buf *out_stdout) int *return_code, Buf *out_stderr, Buf *out_stdout)
{ {
int stdin_pipe[2]; int stdin_pipe[2];
@ -146,25 +192,35 @@ void os_exec_process(const char *exe, ZigList<const char *> &args,
waitpid(pid, return_code, 0); waitpid(pid, return_code, 0);
read_all_fd_stream(stdout_pipe[0], out_stdout); os_fetch_file(fdopen(stdout_pipe[0], "rb"), out_stdout);
read_all_fd_stream(stderr_pipe[0], out_stderr); os_fetch_file(fdopen(stderr_pipe[0], "rb"), out_stderr);
} }
} }
#endif
void os_write_file(Buf *full_path, Buf *contents) { void os_exec_process(const char *exe, ZigList<const char *> &args,
int fd; int *return_code, Buf *out_stderr, Buf *out_stdout)
if ((fd = open(buf_ptr(full_path), O_CREAT|O_CLOEXEC|O_WRONLY|O_TRUNC, S_IRWXU)) == -1) {
zig_panic("open failed"); #if defined(ZIG_OS_WINDOWS)
ssize_t amt_written = write(fd, buf_ptr(contents), buf_len(contents)); return os_exec_process_windows(exe, args, return_code, out_stderr, out_stdout);
if (amt_written != buf_len(contents)) #elif defined(ZIG_OS_POSIX)
zig_panic("write failed: %s", strerror(errno)); return os_exec_process_posix(exe, args, return_code, out_stderr, out_stdout);
if (close(fd) == -1) #else
zig_panic("close failed"); #error "missing os_exec_process implementation"
#endif
} }
int os_fetch_file(FILE *f, Buf *out_contents) { void os_write_file(Buf *full_path, Buf *contents) {
return read_all_fd_stream(fileno(f), out_contents); FILE *f = fopen(buf_ptr(full_path), "wb");
if (!f) {
zig_panic("open failed");
}
size_t amt_written = fwrite(buf_ptr(contents), 1, buf_len(contents), f);
if (amt_written != buf_len(contents))
zig_panic("write failed: %s", strerror(errno));
if (fclose(f))
zig_panic("close failed");
} }
int os_fetch_file_path(Buf *full_path, Buf *out_contents) { int os_fetch_file_path(Buf *full_path, Buf *out_contents) {
@ -192,6 +248,9 @@ int os_fetch_file_path(Buf *full_path, Buf *out_contents) {
} }
int os_get_cwd(Buf *out_cwd) { int os_get_cwd(Buf *out_cwd) {
#if defined(ZIG_OS_WINDOWS)
zig_panic("TODO os_get_cwd for windows");
#elif defined(ZIG_OS_POSIX)
int err = ERANGE; int err = ERANGE;
buf_resize(out_cwd, 512); buf_resize(out_cwd, 512);
while (err == ERANGE) { while (err == ERANGE) {
@ -202,10 +261,19 @@ int os_get_cwd(Buf *out_cwd) {
zig_panic("unable to get cwd: %s", strerror(err)); zig_panic("unable to get cwd: %s", strerror(err));
return 0; return 0;
#else
#error "missing os_get_cwd implementation"
#endif
} }
bool os_stderr_tty(void) { bool os_stderr_tty(void) {
return isatty(STDERR_FILENO); #if defined(ZIG_OS_WINDOWS)
return _isatty(STDERR_FILENO) != 0;
#elif defined(ZIG_OS_POSIX)
return isatty(STDERR_FILENO) != 0;
#else
#error "missing os_stderr_tty implementation"
#endif
} }
int os_buf_to_tmp_file(Buf *contents, Buf *suffix, Buf *out_tmp_path) { int os_buf_to_tmp_file(Buf *contents, Buf *suffix, Buf *out_tmp_path) {
@ -217,10 +285,15 @@ int os_buf_to_tmp_file(Buf *contents, Buf *suffix, Buf *out_tmp_path) {
return ErrorFileSystem; return ErrorFileSystem;
} }
ssize_t amt_written = write(fd, buf_ptr(contents), buf_len(contents)); FILE *f = fdopen(fd, "wb");
if (!f) {
zig_panic("fdopen failed");
}
size_t amt_written = fwrite(buf_ptr(contents), 1, buf_len(contents), f);
if (amt_written != buf_len(contents)) if (amt_written != buf_len(contents))
zig_panic("write failed: %s", strerror(errno)); zig_panic("write failed: %s", strerror(errno));
if (close(fd) == -1) if (fclose(f))
zig_panic("close failed"); zig_panic("close failed");
return 0; return 0;