RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Merge pull request #969 from robertclancy/tail-f-dev-stdin-bug

Browse source 
tail: fix bug when following /dev/stdin
This commit is contained in:
Jian Zeng 2016-08-20 20:25:08 +08:00 • committed by GitHub
commit 14a34b48bf
2 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/tail/tail.rs
View file

@ -146,8 +146,8 @@ pub fn uumain(args: Vec<String>) -> i32 {
let files = given_options.free; let files = given_options.free;
if files.is_empty() { if files.is_empty() {
let buffer = BufReader::new(stdin()); let mut buffer = BufReader::new(stdin());
unbounded_tail(buffer, &settings); unbounded_tail(&mut buffer, &settings);
} else { } else {
let mut multiple = false; let mut multiple = false;
let mut first_header = true; let mut first_header = true;
@ -168,12 +168,19 @@ pub fn uumain(args: Vec<String>) -> i32 {
if path.is_dir() { if path.is_dir() {
continue; continue;
} }
let file = File::open(&path).unwrap(); let mut file = File::open(&path).unwrap();
bounded_tail(&file, &settings); if is_seekable(&mut file) {
bounded_tail(&file, &settings);
if settings.follow { if settings.follow {
let reader = BufReader::new(file); let reader = BufReader::new(file);
readers.push(reader); readers.push(reader);
}
} else {
let mut reader = BufReader::new(file);
unbounded_tail(&mut reader, &settings);
if settings.follow {
readers.push(reader);
}
} }
} }
@ -419,7 +426,7 @@ fn bounded_tail(mut file: &File, settings: &Settings) {
} }
} }
fn unbounded_tail<T: Read>(mut reader: BufReader<T>, settings: &Settings) { fn unbounded_tail<T: Read>(reader: &mut BufReader<T>, settings: &Settings) {
// Read through each line/char and store them in a ringbuffer that always // Read through each line/char and store them in a ringbuffer that always
// contains count lines/chars. When reaching the end of file, output the // contains count lines/chars. When reaching the end of file, output the
// data in the ringbuf. // data in the ringbuf.
@ -487,10 +494,10 @@ fn unbounded_tail<T: Read>(mut reader: BufReader<T>, settings: &Settings) {
} }
} }
} }
}
if settings.follow { fn is_seekable<T: Seek>(file: &mut T) -> bool {
follow(&mut [reader], &["stdin".to_string()], settings); file.seek(SeekFrom::Current(0)).is_ok()
}
} }
#[inline] #[inline]

8
tests/test_tail.rs
View file

@ -80,13 +80,7 @@ fn test_follow_multiple() {
#[test] #[test]
fn test_follow_stdin() { fn test_follow_stdin() {
let (at, mut ucmd) = at_and_ucmd(); new_ucmd().arg("-f").pipe_in_fixture(FOOBAR_TXT).run().stdout_is_fixture("follow_stdin.expected");
let mut child = ucmd.arg("-f").pipe_in(at.read(FOOBAR_TXT)).run_no_wait();
let expected = at.read("follow_stdin.expected");
assert_eq!(read_size(&mut child, expected.len()), expected);
child.kill().unwrap();
} }
#[test] #[test]