summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-02-15 18:59:02 +0000
committerEric Andersen2001-02-15 18:59:02 +0000
commit81bcc92c3222fe70116f010c7a8e3e578015022a (patch)
treec624a43575e2985274955d37569bf251a03bd3ee
parent8305006f7cc23c8eafcdbe757a44268c98cac5e2 (diff)
downloadbusybox-81bcc92c3222fe70116f010c7a8e3e578015022a.zip
busybox-81bcc92c3222fe70116f010c7a8e3e578015022a.tar.gz
Fixed 'ls -s' so it actually displays block sizes again.
-Erik
-rw-r--r--coreutils/ls.c6
-rw-r--r--ls.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 06e23e6..dd38dd5 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -610,7 +610,7 @@ int list_single(struct dnode *dn)
break;
case LIST_BLOCKS:
#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
#if _FILE_OFFSET_BITS == 64
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));
#else
#if _FILE_OFFSET_BITS == 64
- printf("%9lld ", dn->dstat.st_size);
+ printf("%9lld ", dn->dstat.st_size>>1);
#else
- printf("%9ld ", dn->dstat.st_size);
+ printf("%9ld ", dn->dstat.st_size>>1);
#endif
#endif
}
diff --git a/ls.c b/ls.c
index 06e23e6..dd38dd5 100644
--- a/ls.c
+++ b/ls.c
@@ -610,7 +610,7 @@ int list_single(struct dnode *dn)
break;
case LIST_BLOCKS:
#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
#if _FILE_OFFSET_BITS == 64
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));
#else
#if _FILE_OFFSET_BITS == 64
- printf("%9lld ", dn->dstat.st_size);
+ printf("%9lld ", dn->dstat.st_size>>1);
#else
- printf("%9ld ", dn->dstat.st_size);
+ printf("%9ld ", dn->dstat.st_size>>1);
#endif
#endif
}