summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-03-28 20:26:51 +0000
committerEric Andersen2001-03-28 20:26:51 +0000
commitc835567914388df8116626445f566443f50dfe1b (patch)
tree2dda46623fd7cdd94a3f8d6ad488d442ebd895ad
parentd98e574d4125d7b54516b9fd2f7394fa10dd6eb4 (diff)
downloadbusybox-c835567914388df8116626445f566443f50dfe1b.zip
busybox-c835567914388df8116626445f566443f50dfe1b.tar.gz
Fix ls so it uses make_human_readable_str() the same way already
used by 'du' and 'df'. Now we just need to fix make_human_readable_str so it behaves they way it used to before Matt fixed it.
-rw-r--r--coreutils/ls.c2
-rw-r--r--ls.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 2015092..86691fd 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -648,7 +648,7 @@ static int list_single(struct dnode *dn)
printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev));
} else {
#ifdef BB_FEATURE_HUMAN_READABLE
- fprintf(stdout, "%9s ", make_human_readable_str(dn->dstat.st_size,
+ fprintf(stdout, "%9s ", make_human_readable_str(dn->dstat.st_size>>10,
(ls_disp_hr==TRUE)? 0: 1));
#else
#if _FILE_OFFSET_BITS == 64
diff --git a/ls.c b/ls.c
index 2015092..86691fd 100644
--- a/ls.c
+++ b/ls.c
@@ -648,7 +648,7 @@ static int list_single(struct dnode *dn)
printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev));
} else {
#ifdef BB_FEATURE_HUMAN_READABLE
- fprintf(stdout, "%9s ", make_human_readable_str(dn->dstat.st_size,
+ fprintf(stdout, "%9s ", make_human_readable_str(dn->dstat.st_size>>10,
(ls_disp_hr==TRUE)? 0: 1));
#else
#if _FILE_OFFSET_BITS == 64