8fea5260c2
We can't just read all of stdout before stderr or it will cause deadlocks for children that want to write a lot to stderr I could not come up with an obvious cross-platform way to easily test this.
111 lines
2.7 KiB
Rust
111 lines
2.7 KiB
Rust
import run::spawn_process;
|
|
import io::writer_util;
|
|
import libc::{c_int, pid_t};
|
|
|
|
export run;
|
|
|
|
#[cfg(target_os = "win32")]
|
|
fn target_env(lib_path: str, prog: str) -> [(str,str)] {
|
|
|
|
let mut env = os::env();
|
|
|
|
// Make sure we include the aux directory in the path
|
|
assert prog.ends_with(".exe");
|
|
let aux_path = prog.slice(0u, prog.len() - 4u) + ".libaux";
|
|
|
|
env = vec::map(env) {|pair|
|
|
let (k,v) = pair;
|
|
if k == "PATH" { ("PATH", v + ";" + lib_path + ";" + aux_path) }
|
|
else { (k,v) }
|
|
};
|
|
if str::ends_with(prog, "rustc.exe") {
|
|
env += [("RUST_THREADS", "1")]
|
|
}
|
|
ret env;
|
|
}
|
|
|
|
#[cfg(target_os = "linux")]
|
|
#[cfg(target_os = "macos")]
|
|
#[cfg(target_os = "freebsd")]
|
|
fn target_env(_lib_path: str, _prog: str) -> [(str,str)] {
|
|
[]
|
|
}
|
|
|
|
|
|
// FIXME: This code is duplicated in core::run::program_output
|
|
fn run(lib_path: str,
|
|
prog: str,
|
|
args: [str],
|
|
env: [(str, str)],
|
|
input: option<str>) -> {status: int, out: str, err: str} {
|
|
|
|
let pipe_in = os::pipe();
|
|
let pipe_out = os::pipe();
|
|
let pipe_err = os::pipe();
|
|
let pid = spawn_process(prog, args,
|
|
some(env + target_env(lib_path, prog)),
|
|
none, pipe_in.in, pipe_out.out, pipe_err.out);
|
|
|
|
os::close(pipe_in.in);
|
|
os::close(pipe_out.out);
|
|
os::close(pipe_err.out);
|
|
if pid == -1i32 {
|
|
os::close(pipe_in.out);
|
|
os::close(pipe_out.in);
|
|
os::close(pipe_err.in);
|
|
fail;
|
|
}
|
|
|
|
|
|
writeclose(pipe_in.out, input);
|
|
let p = comm::port();
|
|
let ch = comm::chan(p);
|
|
task::spawn_sched(task::single_threaded) {||
|
|
let errput = readclose(pipe_err.in);
|
|
comm::send(ch, (2, errput));
|
|
};
|
|
task::spawn_sched(task::single_threaded) {||
|
|
let output = readclose(pipe_out.in);
|
|
comm::send(ch, (1, output));
|
|
};
|
|
let status = run::waitpid(pid);
|
|
let mut errs = "";
|
|
let mut outs = "";
|
|
let mut count = 2;
|
|
while count > 0 {
|
|
let stream = comm::recv(p);
|
|
alt check stream {
|
|
(1, s) {
|
|
outs = s;
|
|
}
|
|
(2, s) {
|
|
errs = s;
|
|
}
|
|
};
|
|
count -= 1;
|
|
};
|
|
ret {status: status, out: outs, err: errs};
|
|
}
|
|
|
|
fn writeclose(fd: c_int, s: option<str>) {
|
|
if option::is_some(s) {
|
|
let writer = io::fd_writer(fd, false);
|
|
writer.write_str(option::get(s));
|
|
}
|
|
|
|
os::close(fd);
|
|
}
|
|
|
|
fn readclose(fd: c_int) -> str {
|
|
// Copied from run::program_output
|
|
let file = os::fdopen(fd);
|
|
let reader = io::FILE_reader(file, false);
|
|
let mut buf = "";
|
|
while !reader.eof() {
|
|
let bytes = reader.read_bytes(4096u);
|
|
buf += str::from_bytes(bytes);
|
|
}
|
|
os::fclose(file);
|
|
ret buf;
|
|
}
|