RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-30 04:27:45 +00:00
Code Issues Activity

du: exit with status 1 on invalid arguments

Browse source
This commit is contained in:
Michael Gehring 2014-06-19 15:16:27 +02:00
parent 69b5429e6a
commit 52c8e8daba
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
du/du.rs
View file

@ -200,11 +200,11 @@ ers of 1000).",
match (max_depth_str, max_depth) { match (max_depth_str, max_depth) {
(Some(ref s), _) if summarize => { (Some(ref s), _) if summarize => {
println!("{}: warning: summarizing conflicts with --max-depth={:s}", program, *s); println!("{}: warning: summarizing conflicts with --max-depth={:s}", program, *s);
return 0; return 1;
} }
(Some(ref s), None) => { (Some(ref s), None) => {
println!("{}: invalid maximum depth '{:s}'", program, *s); println!("{}: invalid maximum depth '{:s}'", program, *s);
return 0; return 1;
} }
(Some(_), Some(_)) | (None, _) => { /* valid */ } (Some(_), Some(_)) | (None, _) => { /* valid */ }
} }
@ -239,7 +239,7 @@ ers of 1000).",
for c in s.as_slice().chars() { for c in s.as_slice().chars() {
if found_letter && c.is_digit() || !found_number && !c.is_digit() { if found_letter && c.is_digit() || !found_number && !c.is_digit() {
println!("{}: invalid --block-size argument '{}'", program, s); println!("{}: invalid --block-size argument '{}'", program, s);
return 0; return 1;
} else if c.is_digit() { } else if c.is_digit() {
found_number = true; found_number = true;
numbers.push(c as u8); numbers.push(c as u8);
@ -261,7 +261,8 @@ ers of 1000).",
"ZB" => 1000 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000, "ZB" => 1000 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000,
"YB" => 1000 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000, "YB" => 1000 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000,
_ => { _ => {
println!("{}: invalid --block-size argument '{}'", program, s); return 0; println!("{}: invalid --block-size argument '{}'", program, s);
return 1;
} }
}; };
number * multiple number * multiple
@ -300,7 +301,7 @@ Valid arguments are:
- 'long-iso' - 'long-iso'
- 'iso' - 'iso'
Try '{program} --help' for more information.", s, program = program); Try '{program} --help' for more information.", s, program = program);
return 0; return 1;
} }
} }
}, },
@ -339,7 +340,7 @@ Try '{program} --help' for more information.", s, program = program);
Valid arguments are: Valid arguments are:
- 'accessed', 'created', 'modified' - 'accessed', 'created', 'modified'
Try '{program} --help' for more information.", program = program); Try '{program} --help' for more information.", program = program);
return 0; return 1;
} }
}, },
None => stat.fstat.modified None => stat.fstat.modified