Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-16 17:58:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

du: capitalize input block size (e.g. turn 'kB' into 'KB')

Browse source
This commit is contained in:
Alex Lyon 2018-04-20 01:26:29 -07:00
parent b619e363db
commit da301be35c
No known key found for this signature in database
GPG key ID: B517F04B325131B1
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/du/du.rs
View file

@ -14,6 +14,8 @@ extern crate time;
#[macro_use]
extern crate uucore;
// XXX: remove when we no longer support 1.22.0
use std::ascii::AsciiExt;
use std::collections::HashSet;
use std::env;
use std::fs;
@ -37,7 +39,7 @@ const LONG_HELP: &'static str = "
";
// TODO: Suport Z & Y (currently limited by size of u64)
const UNITS: [(char, u32); 6] = [('E', 6), ('P', 5), ('T', 4), ('G', 3), ('M', 2), ('K', 1)];
const UNITS: [(char, u32); 6] = [('K', 1), ('M', 2), ('G', 3), ('T', 4), ('P', 5), ('E', 6)];
struct Options {
all: bool,
@ -89,14 +91,15 @@ fn unit_string_to_number(s: &str) -> Option<u64> {
ch = s_chars.next()?;
offset += 1;
}
ch = ch.to_ascii_uppercase();
let unit = UNITS
.iter()
.find(|(unit_ch, _)| *unit_ch == ch)
.map(|(_, val)| {
.find(|&&(unit_ch, _)| unit_ch == ch)
.map(|&(_, val)| {
// we found a match, so increment offset
offset += 1;
*val
val
})
.or_else(|| if multiple == 1024 { Some(0) } else { None })?;