du: 32 bit systems were maxing out at 2GB when they should max out at 2TBandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1nougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-release

(1<<32 blocks * 512 bytes, done with unsigned 64 bit math).

(cherry picked from commit 8d0f0b6ba864155914f88e39076213b4486efee4)

Bug: http://b/32331571
Test: du -sh /data/local/tmp after filling that directory
Change-Id: I8c8ad146f4c1c1daa6c2cf276ec01aa6e390cc91

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;