diff options
| author | Eric Andersen | 2001-06-13 08:02:45 +0000 |
|---|---|---|
| committer | Eric Andersen | 2001-06-13 08:02:45 +0000 |
| commit | f429baca868b7f62ffdeefbfce41abd677f97876 (patch) | |
| tree | 64925420925deb361a2024b9b362e5c987334124 /ls.c | |
| parent | 17822cd60aaf9333a9895494edcf03a0037de54c (diff) | |
| download | busybox-f429baca868b7f62ffdeefbfce41abd677f97876.zip busybox-f429baca868b7f62ffdeefbfce41abd677f97876.tar.gz | |
I reworked make_human_readable_str so it now has a sane interface,
and then fixed up df, du, and ls to use the new interface. I also
fixed up some formatting issues in ls while I was in there.
-Erik
Diffstat (limited to 'ls.c')
| -rw-r--r-- | ls.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -610,8 +610,8 @@ static int list_single(struct dnode *dn) break; case LIST_BLOCKS: #ifdef BB_FEATURE_HUMAN_READABLE - fprintf(stdout, "%5s ", make_human_readable_str(dn->dstat.st_blocks>>1, - (ls_disp_hr==TRUE)? 0: 1)); + fprintf(stdout, "%4s ", make_human_readable_str(dn->dstat.st_blocks>>1, + KILOBYTE, (ls_disp_hr==TRUE)? 0: 1)); #else #if _FILE_OFFSET_BITS == 64 printf("%4lld ", dn->dstat.st_blocks>>1); @@ -622,7 +622,7 @@ static int list_single(struct dnode *dn) column += 5; break; case LIST_MODEBITS: - printf("%10s", (char *)mode_string(dn->dstat.st_mode)); + printf("%-10s ", (char *)mode_string(dn->dstat.st_mode)); column += 10; break; case LIST_NLINKS: @@ -634,7 +634,7 @@ static int list_single(struct dnode *dn) my_getpwuid(scratch, dn->dstat.st_uid); printf("%-8.8s ", scratch); my_getgrgid(scratch, dn->dstat.st_gid); - printf("%-8.8s", scratch); + printf("%-8.8s ", scratch); column += 17; break; #endif @@ -649,8 +649,7 @@ static int list_single(struct dnode *dn) } else { #ifdef BB_FEATURE_HUMAN_READABLE if (ls_disp_hr==TRUE) { - fprintf(stdout, "%9s ", make_human_readable_str( - dn->dstat.st_size>>10, 0)); + fprintf(stdout, "%8s ", make_human_readable_str(dn->dstat.st_size, 1, 0)); } else #endif { |