Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

native: Ignore SIGPIPE by default #13158

Merged
merged 1 commit into from Mar 28, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/libnative/lib.rs
Expand Up @@ -97,6 +97,24 @@ pub fn start(argc: int, argv: **u8, main: proc()) -> int {
// frames above our current position.
let my_stack_bottom = my_stack_top + 20000 - OS_DEFAULT_STACK_ESTIMATE;

// When using libgreen, one of the first things that we do is to turn off
// the SIGPIPE signal (set it to ignore). By default, some platforms will
// send a *signal* when a EPIPE error would otherwise be delivered. This
// runtime doesn't install a SIGPIPE handler, causing it to kill the
// program, which isn't exactly what we want!
//
// Hence, we set SIGPIPE to ignore when the program starts up in order to
// prevent this problem.
#[cfg(windows)] fn ignore_sigpipe() {}
#[cfg(unix)] fn ignore_sigpipe() {
use std::libc;
use std::libc::funcs::posix01::signal::signal;
unsafe {
assert!(signal(libc::SIGPIPE, libc::SIG_IGN) != -1);
}
}
ignore_sigpipe();

rt::init(argc, argv);
let mut exit_code = None;
let mut main = Some(main);
Expand Down
30 changes: 30 additions & 0 deletions src/libstd/libc.rs
Expand Up @@ -266,6 +266,8 @@ pub mod types {
}

pub enum timezone {}

pub type sighandler_t = size_t;
}
pub mod bsd44 {
use libc::types::os::arch::c95::{c_char, c_int, c_uint};
Expand Down Expand Up @@ -637,6 +639,8 @@ pub mod types {
}

pub enum timezone {}

pub type sighandler_t = size_t;
}
pub mod bsd44 {
use libc::types::os::arch::c95::{c_char, c_int, c_uint};
Expand Down Expand Up @@ -1206,6 +1210,8 @@ pub mod types {
}

pub enum timezone {}

pub type sighandler_t = size_t;
}

pub mod bsd44 {
Expand Down Expand Up @@ -2292,6 +2298,8 @@ pub mod consts {
use libc::types::os::arch::c95::{c_int, size_t};

pub static SIGTRAP : c_int = 5;
pub static SIGPIPE: c_int = 13;
pub static SIG_IGN: size_t = 1;

pub static GLOB_ERR : c_int = 1 << 0;
pub static GLOB_MARK : c_int = 1 << 1;
Expand Down Expand Up @@ -2741,6 +2749,8 @@ pub mod consts {
use libc::types::os::arch::c95::{c_int, size_t};

pub static SIGTRAP : c_int = 5;
pub static SIGPIPE: c_int = 13;
pub static SIG_IGN: size_t = 1;

pub static GLOB_APPEND : c_int = 0x0001;
pub static GLOB_DOOFFS : c_int = 0x0002;
Expand Down Expand Up @@ -3136,6 +3146,8 @@ pub mod consts {
use libc::types::os::arch::c95::{c_int, size_t};

pub static SIGTRAP : c_int = 5;
pub static SIGPIPE: c_int = 13;
pub static SIG_IGN: size_t = 1;

pub static GLOB_APPEND : c_int = 0x0001;
pub static GLOB_DOOFFS : c_int = 0x0002;
Expand Down Expand Up @@ -3838,6 +3850,24 @@ pub mod funcs {
}
}

pub mod signal {
use libc::types::os::arch::c95::c_int;
use libc::types::os::common::posix01::sighandler_t;

#[cfg(not(target_os = "android"))]
extern {
pub fn signal(signum: c_int,
handler: sighandler_t) -> sighandler_t;
}

#[cfg(target_os = "android")]
extern {
#[link_name = "bsd_signal"]
pub fn signal(signum: c_int,
handler: sighandler_t) -> sighandler_t;
}
}

pub mod wait {
use libc::types::os::arch::c95::{c_int};
use libc::types::os::arch::posix88::{pid_t};
Expand Down
36 changes: 36 additions & 0 deletions src/test/run-pass/sigpipe-should-be-ignored.rs
@@ -0,0 +1,36 @@
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-fast

// Be sure that when a SIGPIPE would have been received that the entire process
// doesn't die in a ball of fire, but rather it's gracefully handled.

use std::os;
use std::io::{PipeStream, Process};

fn test() {
let os::Pipe { input, out } = os::pipe();
let input = PipeStream::open(input);
let mut out = PipeStream::open(out);
drop(input);

let _ = out.write([1]);
}

fn main() {
let args = os::args();
if args.len() > 1 && args[1].as_slice() == "test" {
return test();
}

let mut p = Process::new(args[0], [~"test"]).unwrap();
assert!(p.wait().success());
}