commit 45f7fde3c96b99d23f188bec7a269734bb1d0d35
author Kenny Root <kroot@google.com> Fri Jun 25 14:21:11 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 25 14:21:11 2010 -0700
tree 2c2bcf5bef251496d21c874c4e09deb2f698de43
parent 3de5dba5590d5f1c9b33da8463502905b0ebfc58
parent 0b1ff6be08844c541e36fd735b41990453582ec1

am 0b1ff6be: am eb42170e: Display file sizes larger than 2GB correctly

Merge commit '0b1ff6be08844c541e36fd735b41990453582ec1'

* commit '0b1ff6be08844c541e36fd735b41990453582ec1':
  Display file sizes larger than 2GB correctly

toolbox/ls.c

diff --git a/toolbox/ls.c b/toolbox/ls.c
index 6c8de7a..962bf47 100644
--- a/toolbox/ls.c
+++ b/toolbox/ls.c
@@ -297,8 +297,8 @@
                date, name);
         break;
     case S_IFREG:
-        printf("%s %-8s %-8s %8d %s %s\n",
-               mode, user, group, (int) s.st_size, date, name);
+        printf("%s %-8s %-8s %8lld %s %s\n",
+               mode, user, group, s.st_size, date, name);
         break;
     case S_IFLNK: {
         char linkto[256];