mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 11:37:44 +00:00
split: fix error msg shown if file doesn't exist
This commit is contained in:
parent
cc1142cee6
commit
c619dbc99c
2 changed files with 11 additions and 6 deletions
|
@ -1635,12 +1635,8 @@ fn split(settings: &Settings) -> UResult<()> {
|
||||||
let r_box = if settings.input == "-" {
|
let r_box = if settings.input == "-" {
|
||||||
Box::new(stdin()) as Box<dyn Read>
|
Box::new(stdin()) as Box<dyn Read>
|
||||||
} else {
|
} else {
|
||||||
let r = File::open(Path::new(&settings.input)).map_err_context(|| {
|
let r = File::open(Path::new(&settings.input))
|
||||||
format!(
|
.map_err_context(|| format!("cannot open {} for reading", settings.input.quote()))?;
|
||||||
"cannot open {} for reading: No such file or directory",
|
|
||||||
settings.input.quote()
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
Box::new(r) as Box<dyn Read>
|
Box::new(r) as Box<dyn Read>
|
||||||
};
|
};
|
||||||
let mut reader = if let Some(c) = settings.io_blksize {
|
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);
|
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]
|
#[test]
|
||||||
fn test_split_default() {
|
fn test_split_default() {
|
||||||
let (at, mut ucmd) = at_and_ucmd!();
|
let (at, mut ucmd) = at_and_ucmd!();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue