RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues 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
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] #[macro_use]
extern crate uucore; extern crate uucore;
// XXX: remove when we no longer support 1.22.0
use std::ascii::AsciiExt;
use std::collections::HashSet; use std::collections::HashSet;
use std::env; use std::env;
use std::fs; use std::fs;
@ -37,7 +39,7 @@ const LONG_HELP: &'static str = "
"; ";
// TODO: Suport Z & Y (currently limited by size of u64) // 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 { struct Options {
all: bool, all: bool,
@ -89,14 +91,15 @@ fn unit_string_to_number(s: &str) -> Option<u64> {
ch = s_chars.next()?; ch = s_chars.next()?;
offset += 1; offset += 1;
} }
ch = ch.to_ascii_uppercase();
let unit = UNITS let unit = UNITS
.iter() .iter()
.find(|(unit_ch, _)| *unit_ch == ch) .find(|&&(unit_ch, _)| unit_ch == ch)
.map(|(_, val)| { .map(|&(_, val)| {
// we found a match, so increment offset // we found a match, so increment offset
offset += 1; offset += 1;
*val val
}) })
.or_else(|| if multiple == 1024 { Some(0) } else { None })?; .or_else(|| if multiple == 1024 { Some(0) } else { None })?;