Merge branch 'busybox' into merge

5 files changed, 18 insertions, 13 deletions

diff --git a/coreutils/cut.c b/coreutils/cut.c
index 7009e74cf..55bdd9386 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -167,7 +167,7 @@ static void cut_file(FILE *file, const char *delim, const char *odelim,
                                         if (!cl_pos && !dcount && !shoe) {
                                                 if (option_mask32 & CUT_OPT_SUPPRESS_FLGS)
                                                         goto next_line;
-                                        } else if (dcount<cut_lists[cl_pos].startpos)
+                                        } else if (dcount < cut_lists[cl_pos].startpos)
                                                 start = linelen;
                                         end = linelen;
                                 } else {
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 0e57673f1..b4bdc262c 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -301,9 +301,7 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
 
                                 count_total++;
                                 filename_ptr = strchr(line, ' ');
-                                if (filename_ptr == NULL
-                                 || (filename_ptr[1] != ' ' && filename_ptr[1] != '*')
-                                ) {
+                                if (!filename_ptr) {
                                         if (flags & FLAG_WARN) {
                                                 bb_simple_error_msg("invalid format");
                                         }
@@ -312,8 +310,13 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
                                         free(line);
                                         continue;
                                 }
-                                *filename_ptr = '\0';
-                                filename_ptr += 2;
+                                *filename_ptr++ = '\0';
+                                /* coreutils 9.1 allows "HASH FILENAME" format,
+                                 * with only one space. Skip the 'correct'
+                                 * "  " or " *" delimiter if it is there:
+                                 */
+                                if (*filename_ptr == ' ' || *filename_ptr == '*')
+                                        filename_ptr++;
 
                                 hash_value = hash_file(in_buf, filename_ptr, sha3_width);
 
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index 2658e84df..442841210 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -37,6 +37,7 @@
 //applet:IF_SLEEP(APPLET(sleep, BB_DIR_BIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_SLEEP) += sleep.o
+//kbuild:lib-$(CONFIG_ASH_SLEEP) += sleep.o
 
 /* BB_AUDIT SUSv3 compliant */
 /* BB_AUDIT GNU issues -- fancy version matches except args must be ints. */
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 9aac656fe..01b7c44e5 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -357,9 +357,9 @@ static int compare_keys(const void *xarg, const void *yarg)
                         int dx;
                         char *xx, *yy;
 
-                        xx = strptime(x, "%b", &thyme);
+                        xx = strptime(skip_whitespace(x), "%b", &thyme);
                         dx = thyme.tm_mon;
-                        yy = strptime(y, "%b", &thyme);
+                        yy = strptime(skip_whitespace(y), "%b", &thyme);
                         if (!xx)
                                 retval = (!yy) ? 0 : -1;
                         else if (!yy)
@@ -652,11 +652,12 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
         /* Handle -u */
         if (option_mask32 & FLAG_u) {
                 int j = 0;
-                /* coreutils 6.3 drop lines for which only key is the same
-                 * -- disabling last-resort compare, or else compare_keys()
-                 * will be the same only for completely identical lines.
+                /* coreutils 6.3 drop lines for which only key is the same:
+                 * - disabling last-resort compare, or else compare_keys()
+                 * will be the same only for completely identical lines
+                 * - disabling -s (same reasons)
                  */
-                option_mask32 |= FLAG_no_tie_break;
+                option_mask32 = (option_mask32 | FLAG_no_tie_break) & (~FLAG_s);
                 for (i = 1; i < linecount; i++) {
                         if (compare_keys(&lines[j], &lines[i]) == 0)
                                 free(lines[i]);
diff --git a/coreutils/test.c b/coreutils/test.c
index 840a0daaf..1d1e6d18b 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -859,7 +859,7 @@ static number_t primary(enum token n)
         if (check_operator(args[1]) != EOI) { /* if args[1] != NULL */
                 if (args[2]) {
                         // coreutils also does this:
-                        // if (args[3] && args[0]="-l" && args[2] is BINOP)
+                        // if (args[3] && args[0] = "-l" && args[2] is BINOP)
                         //      return binop(1 /* prepended by -l */);
                         if (last_operator->op_type == BINOP)
                                 unnest_msg_and_return(binop(), "<primary: binop:%lld\n");