RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-31 21:17:46 +00:00
Code Issues Activity

Merge pull request #513 from dokaptur/stdbuf_fix

Browse source 
stdbuf - fix issue 512
This commit is contained in:
Heather 2015-01-25 19:36:49 +03:00
commit 3f251f3601
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/stdbuf/stdbuf.rs
View file

@ -13,7 +13,7 @@
extern crate getopts; extern crate getopts;
extern crate libc; extern crate libc;
use getopts::{optopt, optflag, getopts, usage, Matches, OptGroup}; use getopts::{optopt, optflag, getopts, usage, Matches, OptGroup};
use std::io::process::{Command, StdioContainer}; use std::io::process::{Command, StdioContainer, ProcessExit};
use std::io::fs::PathExtensions; use std::io::fs::PathExtensions;
use std::iter::range_inclusive; use std::iter::range_inclusive;
use std::num::Int; use std::num::Int;
@ -131,7 +131,7 @@ fn check_option(matches: &Matches, name: &str, modified: &mut bool) -> Option<Bu
match value.as_slice() { match value.as_slice() {
"L" => { "L" => {
if name == "input" { if name == "input" {
show_info!("stdbuf: line buffering stdin is meaningless"); show_info!("line buffering stdin is meaningless");
None None
} else { } else {
Some(BufferType::Line) Some(BufferType::Line)
@ -170,7 +170,7 @@ fn parse_options(args: &[String], options: &mut ProgramOptions, optgrps: &[OptGr
return Err(ErrMsg::Retry); return Err(ErrMsg::Retry);
} }
if !modified { if !modified {
show_error!("stdbuf: you must specify a buffering mode option"); show_error!("you must specify a buffering mode option");
return Err(ErrMsg::Fatal); return Err(ErrMsg::Fatal);
} }
Ok(OkMsg::Buffering) Ok(OkMsg::Buffering)
@ -244,8 +244,17 @@ pub fn uumain(args: Vec<String>) -> isize {
set_command_env(&mut command, "_STDBUF_I", options.stdin); set_command_env(&mut command, "_STDBUF_I", options.stdin);
set_command_env(&mut command, "_STDBUF_O", options.stdout); set_command_env(&mut command, "_STDBUF_O", options.stdout);
set_command_env(&mut command, "_STDBUF_E", options.stderr); set_command_env(&mut command, "_STDBUF_E", options.stderr);
if let Err(e) = command.spawn() { let mut process = match command.spawn() {
crash!(1, "failed to execute process: {}", e); Ok(p) => p,
} Err(e) => crash!(1, "failed to execute process: {}", e)
0 };
match process.wait() {
Ok(status) => {
match status {
ProcessExit::ExitStatus(i) => return i,
ProcessExit::ExitSignal(i) => crash!(1, "process killed by signal {}", i),
}
},
Err(e) => crash!(1, "{}", e)
};
} }