du: 32 bit systems were maxing out at 2GB when they should max out at 2TB (1<<32 blocks * 512 bytes, done with unsigned 64 bit math). am: a801c5019bandroid-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-dev

am: ee023b2c4a

Change-Id: Ie3fd057fa00d3df82193e96927e7e561e81bc642

2 files changed, 13 insertions, 6 deletions

diff --git a/generated/globals.h b/generated/globals.h
index 66be64b0..218792f0 100644
--- a/generated/globals.h
+++ b/generated/globals.h
@@ -987,7 +987,7 @@ struct df_data {
 struct du_data {
   long maxdepth;
 
-  long depth, total;
+  unsigned long depth, total;
   dev_t st_dev;
   void *inodes;
 };
diff --git a/toys/posix/du.c b/toys/posix/du.c
index 77c7b6e2..115de52b 100644
--- a/toys/posix/du.c
+++ b/toys/posix/du.c
@@ -39,7 +39,7 @@ config DU
 GLOBALS(
   long maxdepth;
 
-  long depth, total;
+  unsigned long depth, total;
   dev_t st_dev;
   void *inodes;
 )
@@ -103,9 +103,11 @@ static int seen_inode(void **list, struct stat *st)
   return 0;
 }
 
-// dirtree callback, comput/display size of node
+// dirtree callback, compute/display size of node
 static int do_du(struct dirtree *node)
 {
+  unsigned long blocks;
+
   if (!node->parent) TT.st_dev = node->st.st_dev;
   else if (!dirtree_notdotdot(node)) return 0;
 
@@ -134,14 +136,19 @@ static int do_du(struct dirtree *node)
     } else TT.depth--;
   }
 
-  node->extra += node->st.st_blocks;
-  if (node->parent) node->parent->extra += node->extra;
+  // Modern compilers' optimizers are insane and think signed overflow
+  // behaves differently than unsigned overflow. Sigh. Big hammer.
+  blocks = node->st.st_blocks + (unsigned long)node->extra;
+  node->extra = blocks;
+  if (node->parent)
+    node->parent->extra = (unsigned long)node->parent->extra+blocks;
   else TT.total += node->extra;
 
   if ((toys.optflags & FLAG_a) || !node->parent
       || (S_ISDIR(node->st.st_mode) && !(toys.optflags & FLAG_s)))
   {
-    print(node->extra*512, node);
+    blocks = node->extra;
+    print(blocks*512LL, node);
   }
 
   return 0;