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

fixes conv=nocreat test failure

Browse source
This commit is contained in:
Tyler 2021-07-06 17:47:26 -07:00
parent 96f93488ef
commit 74e0071cfe
3 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/uu/dd/src/dd.rs
View file

@ -366,14 +366,12 @@ impl Output<File> {
.create_new(cflags.excl) .create_new(cflags.excl)
.append(oflags.append); .append(oflags.append);
if cfg!(unix) { #[cfg(target_os = "linux")]
if let Some(libc_flags) = make_unix_oflags(oflags) { if let Some(libc_flags) = make_unix_oflags(oflags) {
opts.custom_flags(libc_flags); opts.custom_flags(libc_flags);
}
} }
let dst = opts.open(path)?; let dst = opts.open(path)?;
Ok(dst) Ok(dst)
} }
let obs = parseargs::parse_obs(matches)?; let obs = parseargs::parse_obs(matches)?;
@ -777,10 +775,7 @@ fn print_xfer_stats(update: &ProgUpdate) {
} }
/// Generate a progress updater that tracks progress, receives updates, and responds to signals. /// Generate a progress updater that tracks progress, receives updates, and responds to signals.
fn gen_prog_updater( fn gen_prog_updater(rx: mpsc::Receiver<ProgUpdate>, xfer_stats: Option<StatusLevel>) -> impl Fn() {
rx: mpsc::Receiver<ProgUpdate>,
xfer_stats: Option<StatusLevel>,
) -> impl Fn() {
// -------------------------------------------------------------- // --------------------------------------------------------------
fn posixly_correct() -> bool { fn posixly_correct() -> bool {
env::var("POSIXLY_CORRECT").is_ok() env::var("POSIXLY_CORRECT").is_ok()

2
src/uu/dd/src/parseargs/unit_tests.rs
View file

@ -7,7 +7,7 @@ use crate::StatusLevel;
fn unimplemented_flags_should_error_non_unix() { fn unimplemented_flags_should_error_non_unix() {
let mut unfailed = Vec::new(); let mut unfailed = Vec::new();
// The following flags are only implemented in unix // The following flags are only implemented in linux
for flag in vec![ for flag in vec![
"direct", "direct",
"directory", "directory",

3
tests/by-util/test_dd.rs
View file

@ -268,11 +268,10 @@ fn test_nocreat_causes_failure_when_outfile_not_present() {
assert_fixture_not_exists!(&fname); assert_fixture_not_exists!(&fname);
let (fix, mut ucmd) = at_and_ucmd!(); let (fix, mut ucmd) = at_and_ucmd!();
ucmd.args(&["conv=nocreat", of!(&fname)]).pipe_in("").run(); ucmd.args(&["conv=nocreat", of!(&fname)]).pipe_in("").fails().stderr_is("dd Error: No such file or directory (os error 2)");
assert!(!fix.file_exists(&fname)); assert!(!fix.file_exists(&fname));
ucmd.fails();
} }
#[test] #[test]