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

Merge pull request #7122 from jfinkels/dd-error-iflag-directory

Browse source 
dd: error if iflag=directory and input is stdin
This commit is contained in:
Sylvestre Ledru 2025-01-13 14:11:32 +01:00 • committed by GitHub
commit 40511f6da0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ use nix::{
}; };
use uucore::display::Quotable; use uucore::display::Quotable;
#[cfg(unix)] #[cfg(unix)]
use uucore::error::set_exit_code; use uucore::error::{set_exit_code, USimpleError};
use uucore::error::{FromIo, UResult}; use uucore::error::{FromIo, UResult};
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
use uucore::show_if_err; use uucore::show_if_err;
@ -338,11 +338,11 @@ impl<'a> Input<'a> {
let mut src = Source::stdin_as_file(); let mut src = Source::stdin_as_file();
#[cfg(unix)] #[cfg(unix)]
if let Source::StdinFile(f) = &src { if let Source::StdinFile(f) = &src {
// GNU compatibility: if settings.iflags.directory && !f.metadata()?.is_dir() {
// this will check whether stdin points to a folder or not return Err(USimpleError::new(
if f.metadata()?.is_file() && settings.iflags.directory { 1,
show_error!("standard input: not a directory"); "setting flags for 'standard input': Not a directory",
return Err(1.into()); ));
} }
}; };
if settings.skip > 0 { if settings.skip > 0 {

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

@ -1728,7 +1728,26 @@ fn test_iflag_directory_fails_when_file_is_passed_via_std_in() {
.args(&["iflag=directory", "count=0"]) .args(&["iflag=directory", "count=0"])
.set_stdin(std::process::Stdio::from(File::open(filename).unwrap())) .set_stdin(std::process::Stdio::from(File::open(filename).unwrap()))
.fails() .fails()
.stderr_contains("standard input: not a directory"); .stderr_only("dd: setting flags for 'standard input': Not a directory\n");
}
#[test]
#[cfg(any(target_os = "linux", target_os = "android"))]
fn test_iflag_directory_passes_when_dir_is_redirected() {
new_ucmd!()
.args(&["iflag=directory", "count=0"])
.set_stdin(std::process::Stdio::from(File::open(".").unwrap()))
.succeeds();
}
#[test]
#[cfg(any(target_os = "linux", target_os = "android"))]
fn test_iflag_directory_fails_when_file_is_piped_via_std_in() {
new_ucmd!()
.arg("iflag=directory")
.pipe_in("")
.fails()
.stderr_only("dd: setting flags for 'standard input': Not a directory\n");
} }
#[test] #[test]