diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-03-28 20:26:51 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-03-28 20:26:51 +0000 |
| commit | c835567914388df8116626445f566443f50dfe1b (patch) | |
| tree | 2dda46623fd7cdd94a3f8d6ad488d442ebd895ad | |
| parent | d98e574d4125d7b54516b9fd2f7394fa10dd6eb4 (diff) | |
| download | busybox-w32-c835567914388df8116626445f566443f50dfe1b.tar.gz busybox-w32-c835567914388df8116626445f566443f50dfe1b.tar.bz2 busybox-w32-c835567914388df8116626445f566443f50dfe1b.zip | |
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.c | 2 | ||||
| -rw-r--r-- | ls.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index 201509210..86691fdaf 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
| @@ -648,7 +648,7 @@ static int list_single(struct dnode *dn) | |||
| 648 | printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev)); | 648 | printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev)); |
| 649 | } else { | 649 | } else { |
| 650 | #ifdef BB_FEATURE_HUMAN_READABLE | 650 | #ifdef BB_FEATURE_HUMAN_READABLE |
| 651 | fprintf(stdout, "%9s ", make_human_readable_str(dn->dstat.st_size, | 651 | fprintf(stdout, "%9s ", make_human_readable_str(dn->dstat.st_size>>10, |
| 652 | (ls_disp_hr==TRUE)? 0: 1)); | 652 | (ls_disp_hr==TRUE)? 0: 1)); |
| 653 | #else | 653 | #else |
| 654 | #if _FILE_OFFSET_BITS == 64 | 654 | #if _FILE_OFFSET_BITS == 64 |
| @@ -648,7 +648,7 @@ static int list_single(struct dnode *dn) | |||
| 648 | printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev)); | 648 | printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev)); |
| 649 | } else { | 649 | } else { |
| 650 | #ifdef BB_FEATURE_HUMAN_READABLE | 650 | #ifdef BB_FEATURE_HUMAN_READABLE |
| 651 | fprintf(stdout, "%9s ", make_human_readable_str(dn->dstat.st_size, | 651 | fprintf(stdout, "%9s ", make_human_readable_str(dn->dstat.st_size>>10, |
| 652 | (ls_disp_hr==TRUE)? 0: 1)); | 652 | (ls_disp_hr==TRUE)? 0: 1)); |
| 653 | #else | 653 | #else |
| 654 | #if _FILE_OFFSET_BITS == 64 | 654 | #if _FILE_OFFSET_BITS == 64 |