2 files changed, 14 insertions, 9 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 */
-        if (opt & OPT_s) /* show allocated blocks */
+                if (opt & OPT_h) {
-                column += printf("%6"OFF_FMT"u ", (off_t) (dn->dn_blocks >> 1));
+                        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];
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 3b389cb6b..0e57673f1 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -300,12 +300,10 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
                                char *filename_ptr;
                                count_total++;
-                                filename_ptr = strstr(line, "  ");
+                                filename_ptr = strchr(line, ' ');
-                                /* handle format for binary checksums */
+                                if (filename_ptr == NULL
-                                if (filename_ptr == NULL) {
+                                 || (filename_ptr[1] != ' ' && filename_ptr[1] != '*')
-                                        filename_ptr = strstr(line, " *");
+                                ) {
-                                }
-                                if (filename_ptr == NULL) {
                                        if (flags & FLAG_WARN) {
                                                bb_simple_error_msg("invalid format");
                                        }