diff --git a/cut/cut.rs b/cut/cut.rs index 16cc56636..b5ef40a12 100644 --- a/cut/cut.rs +++ b/cut/cut.rs @@ -14,7 +14,6 @@ extern crate getopts; extern crate libc; -use std::os; use std::io::{File, BufferedWriter, BufferedReader, stdin, print}; use getopts::{optopt, optflag, getopts, usage}; @@ -414,9 +413,6 @@ fn cut_files(mut filenames: Vec, mode: Mode) -> int { exit_code } -#[allow(dead_code)] -fn main() { os::set_exit_status(uumain(os::args())); } - pub fn uumain(args: Vec) -> int { let opts = [ optopt("b", "bytes", "select only these bytes", "LIST"), diff --git a/nohup/nohup.rs b/nohup/nohup.rs index 4c7c493c3..492503eee 100644 --- a/nohup/nohup.rs +++ b/nohup/nohup.rs @@ -35,7 +35,10 @@ extern { #[cfg(target_os = "macos")] fn rewind_stdout(s: &mut T) { - s.seek(0, std::rt::rtio::SeekEnd); + match s.seek(0, std::rt::rtio::SeekEnd) { + Ok(_) => {} + Err(f) => crash!(1, "{}", f.detail.unwrap()) + } } #[cfg(target_os = "linux")] @@ -46,9 +49,6 @@ fn _vprocmgr_detach_from_console(_: u32) -> *libc::c_int { std::ptr::null() } #[cfg(target_os = "freebsd")] fn rewind_stdout(_: &mut T) {} -#[allow(dead_code)] -fn main () { std::os::set_exit_status(uumain(std::os::args())); } - pub fn uumain(args: Vec) -> int { let program = args.get(0); @@ -78,7 +78,7 @@ pub fn uumain(args: Vec) -> int { unsafe { signal(SIGHUP, SIG_IGN) }; - if _vprocmgr_detach_from_console(0) != std::ptr::null() { crash!(2, "Cannot detach from console")}; + if unsafe { _vprocmgr_detach_from_console(0) } != std::ptr::null() { crash!(2, "Cannot detach from console")}; unsafe { // we ignore the memory leak here because it doesn't matter anymore