Skip to content

Commit

Permalink
Merge pull request #5990 from BenWiederhake/dev-shuf-head-null
Browse files Browse the repository at this point in the history
shuf: Do not read input when -n0 is given
  • Loading branch information
cakebaker authored Feb 23, 2024
2 parents 208b2db + a29f68b commit 5a2e0c7
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/uu/shuf/src/shuf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,16 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
},
};

if options.head_count == 0 {
// Do not attempt to read the random source or the input file.
// However, we must touch the output file, if given:
if let Some(s) = options.output {
File::create(&s[..])
.map_err_context(|| format!("failed to open {} for writing", s.quote()))?;
}
return Ok(());
}

match mode {
Mode::Echo(args) => {
let mut evec = args.iter().map(String::as_bytes).collect::<Vec<_>>();
Expand Down
75 changes: 75 additions & 0 deletions tests/by-util/test_shuf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
//
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.

// spell-checker:ignore (ToDO) unwritable
use crate::common::util::TestScenario;

#[test]
Expand Down Expand Up @@ -199,6 +201,79 @@ fn test_head_count() {
);
}

#[test]
fn test_zero_head_count_pipe() {
let result = new_ucmd!().arg("-n0").pipe_in(vec![]).succeeds();
// Output must be completely empty, not even a newline!
result.no_output();
}

#[test]
fn test_zero_head_count_pipe_explicit() {
let result = new_ucmd!().arg("-n0").arg("-").pipe_in(vec![]).succeeds();
result.no_output();
}

#[test]
fn test_zero_head_count_file_unreadable() {
new_ucmd!()
.arg("-n0")
.arg("/invalid/unreadable")
.pipe_in(vec![])
.succeeds()
.no_output();
}

#[test]
fn test_zero_head_count_file_touch_output_negative() {
new_ucmd!()
.arg("-n0")
.arg("-o")
.arg("/invalid/unwritable")
.pipe_in(vec![])
.fails()
.stderr_contains("failed to open '/invalid/unwritable' for writing:");
}

#[test]
fn test_zero_head_count_file_touch_output_positive_new() {
let (at, mut ucmd) = at_and_ucmd!();
ucmd.args(&["-n0", "-o", "file"]).succeeds().no_output();
assert_eq!(
at.read_bytes("file"),
Vec::new(),
"Output file must exist and be completely empty"
);
}

#[test]
fn test_zero_head_count_file_touch_output_positive_existing() {
let (at, mut ucmd) = at_and_ucmd!();
at.touch("file");
ucmd.args(&["-n0", "-o", "file"]).succeeds().no_output();
assert_eq!(
at.read_bytes("file"),
Vec::new(),
"Output file must exist and be completely empty"
);
}

#[test]
fn test_zero_head_count_echo() {
new_ucmd!()
.arg("-n0")
.arg("-e")
.arg("hello")
.pipe_in(vec![])
.succeeds()
.no_output();
}

#[test]
fn test_zero_head_count_range() {
new_ucmd!().arg("-n0").arg("-i4-8").succeeds().no_output();
}

#[test]
fn test_head_count_multi_big_then_small() {
let repeat_limit = 5;
Expand Down

0 comments on commit 5a2e0c7

Please sign in to comment.