Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-16 17:58:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3277 from jfinkels/split-line-bytes-no-trailing-newline

Browse source 
split: handle no final newline with --line-bytes
This commit is contained in:
Sylvestre Ledru 2022-03-20 09:09:58 +01:00 committed by GitHub
commit 07b0bc6bb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/uu/split/src/split.rs
View file

@ -886,7 +886,7 @@ impl<'a> Write for LineBytesChunkWriter<'a> {
// then move on to the next chunk if necessary. // then move on to the next chunk if necessary.
None => { None => {
let end = self.num_bytes_remaining_in_current_chunk; let end = self.num_bytes_remaining_in_current_chunk;
let num_bytes_written = self.inner.write(&buf[..end])?; let num_bytes_written = self.inner.write(&buf[..end.min(buf.len())])?;
self.num_bytes_remaining_in_current_chunk -= num_bytes_written; self.num_bytes_remaining_in_current_chunk -= num_bytes_written;
total_bytes_written += num_bytes_written; total_bytes_written += num_bytes_written;
buf = &buf[num_bytes_written..]; buf = &buf[num_bytes_written..];

16
tests/by-util/test_split.rs
View file

@ -618,3 +618,19 @@ fn test_line_bytes() {
assert_eq!(at.read("xac"), "cccc\ndd\n"); assert_eq!(at.read("xac"), "cccc\ndd\n");
assert_eq!(at.read("xad"), "ee\n"); assert_eq!(at.read("xad"), "ee\n");
} }
#[test]
fn test_line_bytes_no_final_newline() {
let (at, mut ucmd) = at_and_ucmd!();
ucmd.args(&["-C", "2"])
.pipe_in("1\n2222\n3\n4")
.succeeds()
.no_stdout()
.no_stderr();
assert_eq!(at.read("xaa"), "1\n");
assert_eq!(at.read("xab"), "22");
assert_eq!(at.read("xac"), "22");
assert_eq!(at.read("xad"), "\n");
assert_eq!(at.read("xae"), "3\n");
assert_eq!(at.read("xaf"), "4");
}