mirror of
https://github.com/uutils/coreutils
synced 2024-09-06 07:54:05 +00:00
Merge pull request #5909 from cakebaker/split_fix_error_message_if_file_doesnt_exist
split: fix error message shown if file doesn't exist
This commit is contained in:
commit
62a3fb8d3f
|
@ -1635,12 +1635,8 @@ fn split(settings: &Settings) -> UResult<()> {
|
|||
let r_box = if settings.input == "-" {
|
||||
Box::new(stdin()) as Box<dyn Read>
|
||||
} else {
|
||||
let r = File::open(Path::new(&settings.input)).map_err_context(|| {
|
||||
format!(
|
||||
"cannot open {} for reading: No such file or directory",
|
||||
settings.input.quote()
|
||||
)
|
||||
})?;
|
||||
let r = File::open(Path::new(&settings.input))
|
||||
.map_err_context(|| format!("cannot open {} for reading", settings.input.quote()))?;
|
||||
Box::new(r) as Box<dyn Read>
|
||||
};
|
||||
let mut reader = if let Some(c) = settings.io_blksize {
|
||||
|
|
|
@ -123,6 +123,15 @@ fn test_invalid_arg() {
|
|||
new_ucmd!().arg("--definitely-invalid").fails().code_is(1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_split_non_existing_file() {
|
||||
new_ucmd!()
|
||||
.arg("non-existing")
|
||||
.fails()
|
||||
.code_is(1)
|
||||
.stderr_is("split: cannot open 'non-existing' for reading: No such file or directory\n");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_split_default() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
|
|
Loading…
Reference in a new issue