From 4a0f3b31ab4ea7b8e95729d19a299b0224caec7b Mon Sep 17 00:00:00 2001
From: E5ten <ethancsommer@gmail.com>
Date: Sun, 30 Sep 2018 22:24:01 -0400
Subject: [PATCH 1/2] Fix -b flag

Fixes #1295 , making -b act like `du --block-size=1 --apparent-size`, the reason it uses `stat.size` instead of `stat.nlink * stat.size` is explained in #1292 and the fix for that issue #1294 is mirrored by the use of `stat.size` here.
---
 src/du/du.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/du/du.rs b/src/du/du.rs
index 269d726e1..87923246a 100644
--- a/src/du/du.rs
+++ b/src/du/du.rs
@@ -219,6 +219,10 @@ fn convert_size_human(size: u64, multiplier: u64, _block_size: u64) -> String {
     format!("{}B", size)
 }
 
+fn convert_size_b(size: u64, _multiplier: u64, _block_size: u64) -> String {
+    format!("{}", ((size as f64) / ((1) as f64)).ceil())
+}
+
 fn convert_size_k(size: u64, multiplier: u64, _block_size: u64) -> String {
     format!("{}", ((size as f64) / (multiplier as f64)).ceil())
 }
@@ -339,7 +343,9 @@ pub fn uumain(args: Vec<String>) -> i32 {
     };
     let convert_size_fn = {
         if matches.opt_present("human-readable") || matches.opt_present("si") {
-            convert_size_human
+            convert_size_human        
+        } else if matches.opt_present("b") {
+            convert_size_b
         } else if matches.opt_present("k") {
             convert_size_k
         } else if matches.opt_present("m") {
@@ -389,6 +395,8 @@ Try '{} --help' for more information.",
                 for (index, stat) in iter.enumerate() {
                     let size = if matches.opt_present("apparent-size") {
                         stat.nlink * stat.size
+                    } else if matches.opt_present("b") {
+                        stat.size
                     } else {
                         // C's stat is such that each block is assume to be 512 bytes
                         // See: http://linux.die.net/man/2/stat

From 9ff5d4f1f9e96082ec70400f4fe639582b6baf2c Mon Sep 17 00:00:00 2001
From: E5ten <ethancsommer@gmail.com>
Date: Tue, 9 Oct 2018 21:35:13 -0400
Subject: [PATCH 2/2] Update du.rs

Remove extra parentheses around 1
---
 src/du/du.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/du/du.rs b/src/du/du.rs
index 87923246a..371cc4aa8 100644
--- a/src/du/du.rs
+++ b/src/du/du.rs
@@ -220,7 +220,7 @@ fn convert_size_human(size: u64, multiplier: u64, _block_size: u64) -> String {
 }
 
 fn convert_size_b(size: u64, _multiplier: u64, _block_size: u64) -> String {
-    format!("{}", ((size as f64) / ((1) as f64)).ceil())
+    format!("{}", ((size as f64) / (1 as f64)).ceil())
 }
 
 fn convert_size_k(size: u64, multiplier: u64, _block_size: u64) -> String {