Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-15 09:27:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

du: make error output more consistent with other utils

Browse source
This commit is contained in:
Arcterus 2014-06-19 09:17:59 -07:00
parent e8c12735e8
commit dba87f0131
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
du/du.rs
View file

@ -199,11 +199,11 @@ ers of 1000).",
let max_depth = max_depth_str.as_ref().and_then(|s| from_str::<uint>(s.as_slice())); let max_depth = max_depth_str.as_ref().and_then(|s| from_str::<uint>(s.as_slice()));
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); show_error!("summarizing conflicts with --max-depth={:s}", *s);
return 1; return 1;
} }
(Some(ref s), None) => { (Some(ref s), None) => {
println!("{}: invalid maximum depth '{:s}'", program, *s); show_error!("invalid maximum depth '{:s}'", *s);
return 1; return 1;
} }
(Some(_), Some(_)) | (None, _) => { /* valid */ } (Some(_), Some(_)) | (None, _) => { /* valid */ }
@ -238,7 +238,7 @@ ers of 1000).",
let mut letters = vec!(); let mut letters = vec!();
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); show_error!("invalid --block-size argument '{}'", s);
return 1; return 1;
} else if c.is_digit() { } else if c.is_digit() {
found_number = true; found_number = true;
@ -261,7 +261,7 @@ 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); show_error!("invalid --block-size argument '{}'", s);
return 1; return 1;
} }
}; };
@ -295,12 +295,12 @@ ers of 1000).",
"long-iso" => "%Y-%m-%d %H:%M", "long-iso" => "%Y-%m-%d %H:%M",
"iso" => "%Y-%m-%d", "iso" => "%Y-%m-%d",
_ => { _ => {
println!("{program}: invalid argument '{}' for 'time style' show_error!("invalid argument '{}' for 'time style'
Valid arguments are: Valid arguments are:
- 'full-iso' - 'full-iso'
- 'long-iso' - 'long-iso'
- 'iso' - 'iso'
Try '{program} --help' for more information.", s, program = program); Try '{} --help' for more information.", s, program);
return 1; return 1;
} }
} }
@ -336,10 +336,10 @@ Try '{program} --help' for more information.", s, program = program);
"created" => stat.fstat.created, "created" => stat.fstat.created,
"modified" => stat.fstat.modified, "modified" => stat.fstat.modified,
_ => { _ => {
println!("{program}: invalid argument 'modified' for '--time' show_error!("invalid argument 'modified' for '--time'
Valid arguments are: Valid arguments are:
- 'accessed', 'created', 'modified' - 'accessed', 'created', 'modified'
Try '{program} --help' for more information.", program = program); Try '{} --help' for more information.", program);
return 1; return 1;
} }
}, },