Skip to content

Du size_format flag override #10743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChrisDryden merged 6 commits into from
Feb 7, 2026
Merged

Du size_format flag override #10743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2fba27b
du: Extend size_format flag override tests
cerdelen Feb 5, 2026
43d9dd8
du: Extend size_override implementation for '-h' '--si' '-h' '--block…
cerdelen Feb 5, 2026
edf51cc
du: Extend size_format flag override tests
cerdelen Feb 5, 2026
1f5f612
du: Extend size_format override tests for correct error return with i…
cerdelen Feb 6, 2026
e06d1fe
du: Refactor size-format parsing code
cerdelen Feb 6, 2026
7ede99a
Merge branch 'main' into du_flag_override
sylvestre Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 33 additions & 24 deletions src/uu/du/src/du.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,38 +963,61 @@ fn read_files_from(file_name: &OsStr) -> Result<Vec<PathBuf>, std::io::Error> {
Ok(paths)
}

fn get_block_size_arg_index_if_present(matches: &ArgMatches, flag: &str) -> Option<usize> {
if matches.get_flag(flag) {
// Indices of returns index even if flag is not present, thats why we need to if guard it
fn get_size_format_flag_arg_index_if_present(matches: &ArgMatches, arg: &str) -> Option<usize> {
if let Some(clap::parser::ValueSource::CommandLine) = matches.value_source(arg) {
matches
.indices_of(flag)
.indices_of(arg)
.and_then(|mut indices| indices.next_back())
} else {
None
}
}

fn handle_block_size_arg_override(matches: &ArgMatches) -> Option<SizeFormat> {
fn parse_block_size_arg_or_default_fallback(matches: &ArgMatches) -> UResult<SizeFormat> {
let block_size_str = matches.get_one::<String>(options::BLOCK_SIZE);
let block_size = read_block_size(block_size_str.map(AsRef::as_ref))?;
if block_size == 0 {
return Err(std::io::Error::other(translate!("du-error-invalid-block-size-argument", "option" => options::BLOCK_SIZE, "value" => block_size_str.map_or("???BUG", |v| v).quote()))
.into());
}
Ok(SizeFormat::BlockSize(block_size))
}

fn parse_size_format(matches: &ArgMatches) -> UResult<SizeFormat> {
let block_size_value_or_default_fallback = parse_block_size_arg_or_default_fallback(matches)?;
let candidates = [
(
SizeFormat::BlockSize(1),
get_block_size_arg_index_if_present(matches, options::BYTES),
get_size_format_flag_arg_index_if_present(matches, options::BYTES),
),
(
SizeFormat::BlockSize(1024),
get_block_size_arg_index_if_present(matches, options::BLOCK_SIZE_1K),
get_size_format_flag_arg_index_if_present(matches, options::BLOCK_SIZE_1K),
),
(
SizeFormat::BlockSize(1024 * 1024),
get_block_size_arg_index_if_present(matches, options::BLOCK_SIZE_1M),
get_size_format_flag_arg_index_if_present(matches, options::BLOCK_SIZE_1M),
),
(
SizeFormat::HumanBinary,
get_size_format_flag_arg_index_if_present(matches, options::HUMAN_READABLE),
),
(
SizeFormat::HumanDecimal,
get_size_format_flag_arg_index_if_present(matches, options::SI),
),
(
block_size_value_or_default_fallback.clone(),
get_size_format_flag_arg_index_if_present(matches, options::BLOCK_SIZE),
),
];

candidates
Ok(candidates
.into_iter()
.filter(|(_, idx)| idx.is_some())
.max_by_key(|&(_, idx)| idx.unwrap_or(0))
.map(|(size_format, _)| size_format)
.unwrap_or(block_size_value_or_default_fallback))
}

#[uucore::main]
Expand Down Expand Up @@ -1048,21 +1071,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
.map_or(MetadataTimeField::Modification, |s| s.as_str().into())
});

let size_format = if matches.get_flag(options::HUMAN_READABLE) {
SizeFormat::HumanBinary
} else if matches.get_flag(options::SI) {
SizeFormat::HumanDecimal
} else if let Some(size_format) = handle_block_size_arg_override(&matches) {
size_format
} else {
let block_size_str = matches.get_one::<String>(options::BLOCK_SIZE);
let block_size = read_block_size(block_size_str.map(AsRef::as_ref))?;
if block_size == 0 {
return Err(std::io::Error::other(translate!("du-error-invalid-block-size-argument", "option" => options::BLOCK_SIZE, "value" => block_size_str.map_or("???BUG", |v| v).quote()))
.into());
}
SizeFormat::BlockSize(block_size)
};
let size_format = parse_size_format(&matches)?;

let traversal_options = TraversalOptions {
all: matches.get_flag(options::ALL),
Expand Down
76 changes: 64 additions & 12 deletions tests/by-util/test_du.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2064,24 +2064,45 @@ fn test_block_size_args_override() {
let ts = TestScenario::new(util_name!());
let at = &ts.fixtures;
let dir = "override_args_dir";
let nested_dir = "override_args_dir/nested_dir";
let nested_dir_2 = "override_args_dir/nested_dir_2";

at.mkdir(dir);
let fpath = at.plus(format!("{dir}/file"));
at.mkdir_all(nested_dir);
at.mkdir_all(nested_dir_2);
let fpath = at.plus(format!("{nested_dir}/file"));
std::fs::File::create(fpath)
.expect("cannot create test file")
.set_len(100_000_000)
.expect("cannot set file size");

let fpath2 = at.plus(format!("{dir}/file_2"));
let fpath2 = at.plus(format!("{nested_dir}/file_2"));
std::fs::File::create(fpath2)
.expect("cannot create test file")
.set_len(100_000_000)
.expect("cannot set file size");

let fpath = at.plus(format!("{nested_dir_2}/file_3"));
std::fs::File::create(fpath)
.expect("cannot create test file")
.set_len(100_000)
.expect("cannot set file size");

let fpath2 = at.plus(format!("{nested_dir_2}/file_4"));
std::fs::File::create(fpath2)
.expect("cannot create test file")
.set_len(100)
.expect("cannot set file size");

let test_cases = [
(["-sk", "-m"], "-sm"),
(["-sk", "-b"], "-sb"),
(["-sm", "-k"], "-sk"),
(["-sk", "-m"], vec!["-sm"]),
(["-sk", "-b"], vec!["-sb"]),
(["-sm", "-k"], vec!["-sk"]),
(["-sk", "--si"], vec!["-s", "--si"]),
(["-sk", "-h"], vec!["-s", "-h"]),
(["-sm", "--block-size=128"], vec!["-s", "--block-size=128"]),
(["--block-size=128", "-b"], vec!["-b"]),
(["--si", "-b"], vec!["-b"]),
(["-h", "-b"], vec!["-b"]),
];

for (idx, (overwriting_args, expected)) in test_cases.into_iter().enumerate() {
Expand All @@ -2095,7 +2116,7 @@ fn test_block_size_args_override() {
let single_args = ts
.ucmd()
.arg(dir)
.arg(expected)
.args(&expected)
.succeeds()
.stdout_move_str();

Expand All @@ -2111,23 +2132,30 @@ fn test_block_override_b_still_has_apparent_size() {
let ts = TestScenario::new(util_name!());
let at = &ts.fixtures;
let dir = "override_args_dir";
let nested_dir = "override_args_dir/nested_dir";

at.mkdir(dir);
let fpath = at.plus(format!("{dir}/file"));
at.mkdir_all(nested_dir);
let fpath = at.plus(format!("{nested_dir}/file"));
std::fs::File::create(fpath)
.expect("cannot create test file")
.set_len(100_000_000)
.expect("cannot set file size");

let fpath2 = at.plus(format!("{dir}/file_2"));
let fpath2 = at.plus(format!("{nested_dir}/file_2"));
std::fs::File::create(fpath2)
.expect("cannot create test file")
.set_len(100_000_000)
.expect("cannot set file size");

let test_cases = [
(["-sb", "-m"], ["-sm", "--apparent-size"]),
(["-sb", "-k"], ["-sk", "--apparent-size"]),
(["-b", "-m"], ["-m", "--apparent-size"]),
(["-b", "-k"], ["-k", "--apparent-size"]),
(["-b", "--si"], ["--si", "--apparent-size"]),
(["-b", "-h"], ["-h", "--apparent-size"]),
(
["-b", "--block-size=128"],
["--block-size=128", "--apparent-size"],
),
];

for (idx, (overwriting_args, expected)) in test_cases.into_iter().enumerate() {
Expand All @@ -2151,3 +2179,27 @@ fn test_block_override_b_still_has_apparent_size() {
);
}
}

#[test]
fn test_overriding_block_size_arg_with_invalid_value_still_errors() {
new_ucmd!()
.args(&["--block-size=abc", "-m"])
.fails_with_code(1)
.stderr_contains("invalid --block-size argument 'abc'");
new_ucmd!()
.args(&["--block-size=abc", "-k"])
.fails_with_code(1)
.stderr_contains("invalid --block-size argument 'abc'");
new_ucmd!()
.args(&["--block-size=abc", "-b"])
.fails_with_code(1)
.stderr_contains("invalid --block-size argument 'abc'");
new_ucmd!()
.args(&["--block-size=abc", "-h"])
.fails_with_code(1)
.stderr_contains("invalid --block-size argument 'abc'");
new_ucmd!()
.args(&["--block-size=abc", "--si"])
.fails_with_code(1)
.stderr_contains("invalid --block-size argument 'abc'");
}
Loading