RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-30 04:27:45 +00:00
Code Issues Activity

Merge pull request #320 from Arcterus/nohup-fix

Browse source 
Couple of minor fixes
This commit is contained in:
Oly Mi 2014-06-29 06:49:59 +04:00
commit b8e200489e
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cut/cut.rs
View file

@ -14,7 +14,6 @@
extern crate getopts; extern crate getopts;
extern crate libc; extern crate libc;
use std::os;
use std::io::{File, BufferedWriter, BufferedReader, stdin, print}; use std::io::{File, BufferedWriter, BufferedReader, stdin, print};
use getopts::{optopt, optflag, getopts, usage}; use getopts::{optopt, optflag, getopts, usage};
@ -414,9 +413,6 @@ fn cut_files(mut filenames: Vec<String>, mode: Mode) -> int {
exit_code exit_code
} }
#[allow(dead_code)]
fn main() { os::set_exit_status(uumain(os::args())); }
pub fn uumain(args: Vec<String>) -> int { pub fn uumain(args: Vec<String>) -> int {
let opts = [ let opts = [
optopt("b", "bytes", "select only these bytes", "LIST"), optopt("b", "bytes", "select only these bytes", "LIST"),

10
nohup/nohup.rs
View file

@ -35,7 +35,10 @@ extern {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
fn rewind_stdout<T: std::rt::rtio::RtioFileStream>(s: &mut T) { fn rewind_stdout<T: std::rt::rtio::RtioFileStream>(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")] #[cfg(target_os = "linux")]
@ -46,9 +49,6 @@ fn _vprocmgr_detach_from_console(_: u32) -> *libc::c_int { std::ptr::null() }
#[cfg(target_os = "freebsd")] #[cfg(target_os = "freebsd")]
fn rewind_stdout<T: std::rt::rtio::RtioFileStream>(_: &mut T) {} fn rewind_stdout<T: std::rt::rtio::RtioFileStream>(_: &mut T) {}
#[allow(dead_code)]
fn main () { std::os::set_exit_status(uumain(std::os::args())); }
pub fn uumain(args: Vec<String>) -> int { pub fn uumain(args: Vec<String>) -> int {
let program = args.get(0); let program = args.get(0);
@ -78,7 +78,7 @@ pub fn uumain(args: Vec<String>) -> int {
unsafe { signal(SIGHUP, SIG_IGN) }; 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 { unsafe {
// we ignore the memory leak here because it doesn't matter anymore // we ignore the memory leak here because it doesn't matter anymore