commit 81bcc92c3222fe70116f010c7a8e3e578015022a
author Eric Andersen <andersen@codepoet.org> Thu Feb 15 18:59:02 2001 +0000
committer Eric Andersen <andersen@codepoet.org> Thu Feb 15 18:59:02 2001 +0000
tree c624a43575e2985274955d37569bf251a03bd3ee
parent 8305006f7cc23c8eafcdbe757a44268c98cac5e2

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

coreutils/ls.c

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 @@
 				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 @@
 					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
 				}

ls.c

diff --git a/ls.c b/ls.c
index 06e23e6..dd38dd5 100644
--- a/ls.c
+++ b/ls.c
@@ -610,7 +610,7 @@
 				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 @@
 					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
 				}