emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Place a temporary bandaid on the ls/du/df human-readable issue. This method is

Browse Source 
not going to scale up as well as I would like, and Matt Kraai and I have
discussed a better long term solution.  But for now this will at least make all
the human-readable apps give correct answers.

Please test the human readable/non-human readable options on your systems!!!
 -Erik
This commit is contained in:
Eric Andersen
2001-04-03 23:14:29 +00:00
parent 24073c7665
commit 91c9388715
3 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
coreutils/ls.c
View File

@@ -648,15 +648,18 @@ 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>>10,
(ls_disp_hr==TRUE)? 0: 1));
#else
if (ls_disp_hr==TRUE) {
fprintf(stdout, "%9s ", make_human_readable_str(
dn->dstat.st_size>>10, 0));
} else
#endif
{
#if _FILE_OFFSET_BITS == 64
printf("%9lld ", dn->dstat.st_size);
printf("%9lld ", dn->dstat.st_size);
#else
printf("%9ld ", dn->dstat.st_size);
#endif
printf("%9ld ", dn->dstat.st_size);
#endif
}
}
column += 10;
break;