4ae6c835cb
The way pipes work in windows is not the same as unix, though I'm not entirely clear on the differences. This patch changes the windows pipe method to return non-inheritable fds, and the windows rust_run_program method to duplicate them before spawning the new process. This allows make-check-pretty to work on windows.
98 lines
3.1 KiB
Rust
98 lines
3.1 KiB
Rust
|
|
import str::sbuf;
|
|
import vec::vbuf;
|
|
|
|
native "cdecl" mod libc = "" {
|
|
fn open(s: sbuf, flags: int, mode: uint) -> int = "_open";
|
|
fn read(fd: int, buf: vbuf, count: uint) -> int = "_read";
|
|
fn write(fd: int, buf: vbuf, count: uint) -> int = "_write";
|
|
fn close(fd: int) -> int = "_close";
|
|
type FILE;
|
|
fn fopen(path: sbuf, mode: sbuf) -> FILE;
|
|
fn _fdopen(fd: int, mode: sbuf) -> FILE;
|
|
fn fclose(f: FILE);
|
|
fn fgetc(f: FILE) -> int;
|
|
fn ungetc(c: int, f: FILE);
|
|
fn feof(f: FILE) -> int;
|
|
fn fread(buf: vbuf, size: uint, n: uint, f: FILE) -> uint;
|
|
fn fwrite(buf: vbuf, size: uint, n: uint, f: FILE) -> uint;
|
|
fn fseek(f: FILE, offset: int, whence: int) -> int;
|
|
fn ftell(f: FILE) -> int;
|
|
fn _pipe(fds: *mutable int, size: uint, mode: int) -> int;
|
|
}
|
|
|
|
native "cdecl" mod libc_ivec = "" {
|
|
fn read(fd: int, buf: *u8, count: uint) -> int;
|
|
fn write(fd: int, buf: *u8, count: uint) -> int;
|
|
fn fread(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
|
|
fn fwrite(buf: *u8, size: uint, n: uint, f: libc::FILE) -> uint;
|
|
}
|
|
|
|
mod libc_constants {
|
|
fn O_RDONLY() -> int { ret 0; }
|
|
fn O_WRONLY() -> int { ret 1; }
|
|
fn O_RDWR() -> int { ret 2; }
|
|
fn O_APPEND() -> int { ret 8; }
|
|
fn O_CREAT() -> int { ret 256; }
|
|
fn O_EXCL() -> int { ret 1024; }
|
|
fn O_TRUNC() -> int { ret 512; }
|
|
fn O_TEXT() -> int { ret 16384; }
|
|
fn O_BINARY() -> int { ret 32768; }
|
|
fn O_NOINHERIT() -> int { ret 0x0080; }
|
|
fn S_IRUSR() -> uint {
|
|
ret 256u; // really _S_IREAD in win32
|
|
|
|
}
|
|
fn S_IWUSR() -> uint {
|
|
ret 128u; // really _S_IWRITE in win32
|
|
|
|
}
|
|
}
|
|
|
|
native "x86stdcall" mod kernel32 {
|
|
fn GetEnvironmentVariableA(n: sbuf, v: sbuf, nsize: uint) -> uint;
|
|
fn SetEnvironmentVariableA(n: sbuf, v: sbuf) -> int;
|
|
}
|
|
|
|
fn exec_suffix() -> str { ret ".exe"; }
|
|
|
|
fn target_os() -> str { ret "win32"; }
|
|
|
|
fn dylib_filename(base: str) -> str { ret base + ".dll"; }
|
|
|
|
fn pipe() -> {in: int, out: int} {
|
|
// Windows pipes work subtly differently than unix pipes, and their
|
|
// inheritance has to be handled in a different way that I don't fully
|
|
// understand. Here we explicitly make the pipe non-inheritable,
|
|
// which means to pass it to a subprocess they need to be duplicated
|
|
// first, as in rust_run_program.
|
|
let fds = {mutable in: 0, mutable out: 0};
|
|
let res = os::libc::_pipe(ptr::addr_of(fds.in), 1024u,
|
|
libc_constants::O_BINARY()
|
|
| libc_constants::O_NOINHERIT());
|
|
assert res == 0;
|
|
assert fds.in != -1 && fds.in != 0;
|
|
assert fds.out != -1 && fds.in != 0;
|
|
ret {in: fds.in, out: fds.out};
|
|
}
|
|
|
|
fn fd_FILE(fd: int) -> libc::FILE { ret libc::_fdopen(fd, str::buf("r")); }
|
|
|
|
native "rust" mod rustrt {
|
|
fn rust_process_wait(handle: int) -> int;
|
|
fn rust_getcwd() -> str;
|
|
}
|
|
|
|
fn waitpid(pid: int) -> int { ret rustrt::rust_process_wait(pid); }
|
|
|
|
fn getcwd() -> str { ret rustrt::rust_getcwd(); }
|
|
|
|
// Local Variables:
|
|
// mode: rust;
|
|
// fill-column: 78;
|
|
// indent-tabs-mode: nil
|
|
// c-basic-offset: 4
|
|
// buffer-file-coding-system: utf-8-unix
|
|
// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
|
|
// End:
|