Merge busybox into merge

Fix merge conflicts in coreutils/ls.c and shell/ash.c.

Update config files to turn off SHA1_HWACCEL.  It uses non-portable
assembler.

1 files changed, 10 insertions, 3 deletions

diff --git a/coreutils/ls.c b/coreutils/ls.c
index 58b8fde75..d8cfe27d3 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -505,9 +505,16 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
 #else
                 column += printf("%19"LL_FMT"u ", (long long) dn->dn_ino);
 #endif
-//TODO: -h should affect -s too:
-        if (opt & OPT_s) /* show allocated blocks */
-                column += printf("%6"OFF_FMT"u ", (off_t) (dn->dn_blocks >> 1));
+        if (opt & OPT_s) { /* show allocated blocks */
+                if (opt & OPT_h) {
+                        column += printf("%"HUMAN_READABLE_MAX_WIDTH_STR"s ",
+                                /* print size, show one fractional, use suffixes */
+                                make_human_readable_str((off_t)dn->dn_blocks << 9, 1, 0)
+                        );
+                } else {
+                        column += printf("%6"OFF_FMT"u ", (off_t)(dn->dn_blocks >> 1));
+                }
+        }
         if (opt & OPT_l) {
                 /* long listing: show mode */
                 char modestr[12];