diff --git a/du/du.rs b/du/du.rs index ca3f37d22..e2cb42fcf 100644 --- a/du/du.rs +++ b/du/du.rs @@ -200,11 +200,11 @@ ers of 1000).", match (max_depth_str, max_depth) { (Some(ref s), _) if summarize => { println!("{}: warning: summarizing conflicts with --max-depth={:s}", program, *s); - return 0; + return 1; } (Some(ref s), None) => { println!("{}: invalid maximum depth '{:s}'", program, *s); - return 0; + return 1; } (Some(_), Some(_)) | (None, _) => { /* valid */ } } @@ -239,7 +239,7 @@ ers of 1000).", for c in s.as_slice().chars() { if found_letter && c.is_digit() || !found_number && !c.is_digit() { println!("{}: invalid --block-size argument '{}'", program, s); - return 0; + return 1; } else if c.is_digit() { found_number = true; numbers.push(c as u8); @@ -261,7 +261,8 @@ ers of 1000).", "ZB" => 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 @@ -271,9 +272,9 @@ ers of 1000).", let convert_size = |size: u64| -> String { if matches.opt_present("human-readable") || matches.opt_present("si") { - if size > MB { + if size >= MB { format!("{:.1f}M", (size as f64) / (MB as f64)) - } else if size > KB { + } else if size >= KB { format!("{:.1f}K", (size as f64) / (KB as f64)) } else { format!("{}B", size) @@ -300,7 +301,7 @@ Valid arguments are: - 'long-iso' - 'iso' 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: - 'accessed', 'created', 'modified' Try '{program} --help' for more information.", program = program); - return 0; + return 1; } }, None => stat.fstat.modified @@ -350,11 +351,11 @@ Try '{program} --help' for more information.", s, program = program); time::at(time_spec).strftime(time_format_str) }; if !summarize || (summarize && index == len-1) { - print!("{:<10} {:<30} {}{}", convert_size(size), time_str, stat.path.display(), line_separator); + print!("{}\t{}\t{}{}", convert_size(size), time_str, stat.path.display(), line_separator); } } else { if !summarize || (summarize && index == len-1) { - print!("{:<10} {}{}", convert_size(size), stat.path.display(), line_separator); + print!("{}\t{}{}", convert_size(size), stat.path.display(), line_separator); } } if options_arc.total && index == (len - 1) { @@ -366,7 +367,7 @@ Try '{program} --help' for more information.", s, program = program); } if options_arc.total { - print!("{:<10} total", convert_size(grand_total)); + print!("{}\ttotal", convert_size(grand_total)); print!("{}", line_separator); }