mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 11:37:44 +00:00
Merge pull request #2943 from jfinkels/truncate-no-such-dir
truncate: better error msg when dir does not exist
This commit is contained in:
commit
1dcd3b2c24
2 changed files with 18 additions and 3 deletions
|
@ -239,7 +239,8 @@ fn truncate_reference_and_size(
|
||||||
let fsize = metadata.len() as usize;
|
let fsize = metadata.len() as usize;
|
||||||
let tsize = mode.to_size(fsize);
|
let tsize = mode.to_size(fsize);
|
||||||
for filename in &filenames {
|
for filename in &filenames {
|
||||||
file_truncate(filename, create, tsize).map_err_context(String::new)?;
|
file_truncate(filename, create, tsize)
|
||||||
|
.map_err_context(|| format!("cannot open {} for writing", filename.quote()))?;
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
@ -272,7 +273,8 @@ fn truncate_reference_file_only(
|
||||||
})?;
|
})?;
|
||||||
let tsize = metadata.len() as usize;
|
let tsize = metadata.len() as usize;
|
||||||
for filename in &filenames {
|
for filename in &filenames {
|
||||||
file_truncate(filename, create, tsize).map_err_context(String::new)?;
|
file_truncate(filename, create, tsize)
|
||||||
|
.map_err_context(|| format!("cannot open {} for writing", filename.quote()))?;
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
@ -307,7 +309,11 @@ fn truncate_size_only(size_string: &str, filenames: Vec<String>, create: bool) -
|
||||||
match file_truncate(filename, create, tsize) {
|
match file_truncate(filename, create, tsize) {
|
||||||
Ok(_) => continue,
|
Ok(_) => continue,
|
||||||
Err(e) if e.kind() == ErrorKind::NotFound && !create => continue,
|
Err(e) if e.kind() == ErrorKind::NotFound && !create => continue,
|
||||||
Err(e) => return Err(e.map_err_context(String::new)),
|
Err(e) => {
|
||||||
|
return Err(
|
||||||
|
e.map_err_context(|| format!("cannot open {} for writing", filename.quote()))
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
|
@ -378,6 +378,15 @@ fn test_division_by_zero_reference_and_size() {
|
||||||
.stderr_contains("division by zero");
|
.stderr_contains("division by zero");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_no_such_dir() {
|
||||||
|
new_ucmd!()
|
||||||
|
.args(&["-s", "0", "a/b"])
|
||||||
|
.fails()
|
||||||
|
.no_stdout()
|
||||||
|
.stderr_contains("cannot open 'a/b' for writing: No such file or directory");
|
||||||
|
}
|
||||||
|
|
||||||
/// Test that truncate with a relative size less than 0 is not an error.
|
/// Test that truncate with a relative size less than 0 is not an error.
|
||||||
#[test]
|
#[test]
|
||||||
fn test_underflow_relative_size() {
|
fn test_underflow_relative_size() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue