BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed 'ls -s' so it actually displays block sizes again. 

-Erik
1_00_stable_10817
Eric Andersen 2001-02-15 18:59:02 +00:00
parent 8305006f7c
commit 81bcc92c32
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
coreutils/ls.c
View File

@ -610,7 +610,7 @@ int list_single(struct dnode *dn)
break; break;
case LIST_BLOCKS: case LIST_BLOCKS:
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
fprintf(stdout, "%5s ", format(dn->dstat.st_size, ls_disp_hr)); fprintf(stdout, "%5s ", format(dn->dstat.st_blocks>>1, 1));
#else #else
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
printf("%4lld ", dn->dstat.st_blocks>>1); printf("%4lld ", dn->dstat.st_blocks>>1);
@ -650,9 +650,9 @@ int list_single(struct dnode *dn)
fprintf(stdout, "%9s ", format(dn->dstat.st_size, ls_disp_hr)); fprintf(stdout, "%9s ", format(dn->dstat.st_size, ls_disp_hr));
#else #else
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
printf("%9lld ", dn->dstat.st_size); printf("%9lld ", dn->dstat.st_size>>1);
#else #else
printf("%9ld ", dn->dstat.st_size); printf("%9ld ", dn->dstat.st_size>>1);
#endif #endif
#endif #endif
} }

6
ls.c
View File

@ -610,7 +610,7 @@ int list_single(struct dnode *dn)
break; break;
case LIST_BLOCKS: case LIST_BLOCKS:
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
fprintf(stdout, "%5s ", format(dn->dstat.st_size, ls_disp_hr)); fprintf(stdout, "%5s ", format(dn->dstat.st_blocks>>1, 1));
#else #else
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
printf("%4lld ", dn->dstat.st_blocks>>1); printf("%4lld ", dn->dstat.st_blocks>>1);
@ -650,9 +650,9 @@ int list_single(struct dnode *dn)
fprintf(stdout, "%9s ", format(dn->dstat.st_size, ls_disp_hr)); fprintf(stdout, "%9s ", format(dn->dstat.st_size, ls_disp_hr));
#else #else
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
printf("%9lld ", dn->dstat.st_size); printf("%9lld ", dn->dstat.st_size>>1);
#else #else
printf("%9ld ", dn->dstat.st_size); printf("%9ld ", dn->dstat.st_size>>1);
#endif #endif
#endif #endif
} }