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

fold: preserve blank lines

Browse source
This commit is contained in:
Daniel Rocco 2021-04-02 09:13:25 -04:00
parent de6aa69259
commit d12f96d9ca
2 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/uu/fold/src/fold.rs
View file

@ -100,7 +100,10 @@ fn fold(filenames: Vec<String>, bytes: bool, spaces: bool, width: usize) {
fn fold_file<T: Read>(file: BufReader<T>, bytes: bool, spaces: bool, width: usize) { fn fold_file<T: Read>(file: BufReader<T>, bytes: bool, spaces: bool, width: usize) {
for line_result in file.lines() { for line_result in file.lines() {
let mut line = safe_unwrap!(line_result); let mut line = safe_unwrap!(line_result);
if bytes {
if line.is_empty() {
println!();
} else if bytes {
let len = line.len(); let len = line.len();
let mut i = 0; let mut i = 0;
while i < len { while i < len {

28
tests/by-util/test_fold.rs
View file

@ -25,9 +25,35 @@ fn test_40_column_word_boundary() {
} }
#[test] #[test]
fn test_default_warp_with_newlines() { fn test_default_wrap_with_newlines() {
new_ucmd!() new_ucmd!()
.arg("lorem_ipsum_new_line.txt") .arg("lorem_ipsum_new_line.txt")
.run() .run()
.stdout_is_fixture("lorem_ipsum_new_line_80_column.expected"); .stdout_is_fixture("lorem_ipsum_new_line_80_column.expected");
} }
#[test]
fn test_should_preserve_empty_lines() {
new_ucmd!().pipe_in("\n").succeeds().stdout_is("\n");
new_ucmd!()
.arg("-w1")
.pipe_in("0\n1\n\n2\n\n\n")
.succeeds()
.stdout_is("0\n1\n\n2\n\n\n");
}
#[test]
fn test_word_boundary_split_should_preserve_empty_lines() {
new_ucmd!()
.arg("-s")
.pipe_in("\n")
.succeeds()
.stdout_is("\n");
new_ucmd!()
.args(&["-w1", "-s"])
.pipe_in("0\n1\n\n2\n\n\n")
.succeeds()
.stdout_is("0\n1\n\n2\n\n\n");
}