Remove debugging statement.

[oweals/busybox.git] / ls.c

diff --git a/ls.c b/ls.c
index c13b225fafb5363d2dfb5acc296d9fc037e478f2..bd79cc9404e2749d778d3a64d7f44ef5bbe49104 100644 (file)
--- a/ls.c
+++ b/ls.c
@@ -21,7 +21,7 @@
 /*
  * To achieve a small memory footprint, this version of 'ls' doesn't do any
  * file sorting, and only has the most essential command line switches
- * (i.e. the ones I couldn't live without :-) All features which involve
+ * (i.e., the ones I couldn't live without :-) All features which involve
  * linking in substantial chunks of libc can be disabled.
  *
  * Although I don't really want to add new features to this program to
@@ -605,13 +605,13 @@ static int list_single(struct dnode *dn)
        for (i=0; i<=31; i++) {
                switch (list_fmt & (1<<i)) {
                        case LIST_INO:
-                               printf("%7ld ", dn->dstat.st_ino);
+                               printf("%7ld ", (long int)dn->dstat.st_ino);
                                column += 8;
                                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, "%6s ", make_human_readable_str(dn->dstat.st_blocks>>1, 
+                                                       KILOBYTE, (ls_disp_hr==TRUE)? 0: KILOBYTE));
 #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 
                                        {