aboutsummaryrefslogtreecommitdiffstats
path: root/toolbox/ls.c
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-06-25 14:21:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-25 14:21:11 -0700
commit45f7fde3c96b99d23f188bec7a269734bb1d0d35 (patch)
tree2c2bcf5bef251496d21c874c4e09deb2f698de43 /toolbox/ls.c
parent3de5dba5590d5f1c9b33da8463502905b0ebfc58 (diff)
parent0b1ff6be08844c541e36fd735b41990453582ec1 (diff)
downloadsystem_core-45f7fde3c96b99d23f188bec7a269734bb1d0d35.tar.gz
system_core-45f7fde3c96b99d23f188bec7a269734bb1d0d35.tar.bz2
system_core-45f7fde3c96b99d23f188bec7a269734bb1d0d35.zip
am 0b1ff6be: am eb42170e: Display file sizes larger than 2GB correctly
Merge commit '0b1ff6be08844c541e36fd735b41990453582ec1' * commit '0b1ff6be08844c541e36fd735b41990453582ec1': Display file sizes larger than 2GB correctly
Diffstat (limited to 'toolbox/ls.c')
-rw-r--r--toolbox/ls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolbox/ls.c b/toolbox/ls.c
index 6c8de7ad..962bf471 100644
--- a/toolbox/ls.c
+++ b/toolbox/ls.c
@@ -297,8 +297,8 @@ static int listfile_long(const char *path, int flags)
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];