11 files changed, 92 insertions, 48 deletions

diff --git a/coreutils/echo.c b/coreutils/echo.c
index 82f0358b6..44b2eb5d0 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -321,6 +321,8 @@ int echo_main(int argc, char **argv)
                                 if (*arg == '0' && (unsigned char)(arg[1] - '0') < 8) {
                                         arg++;
                                 }
+//FIXME? we also accept non-0 starting sequences (see echo-prints-slash_41 test)
+// echo -ne '-\41-' prints "-!-". bash 5.0.17 does not (prints "-\41-").
                                 /* bb_process_escape_sequence can handle nul correctly */
                                 c = bb_process_escape_sequence( (void*) &arg);
                         }
diff --git a/coreutils/env.c b/coreutils/env.c
index a0ea4dd27..6eafd06ef 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -100,7 +100,7 @@ int env_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 
-        fflush_stdout_and_exit(EXIT_SUCCESS);
+        fflush_stdout_and_exit_SUCCESS();
 }
 
 /*
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 4efa23061..3b389cb6b 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -151,10 +151,12 @@ static unsigned char *hash_bin_to_hex(unsigned char *hash_value,
         return (unsigned char *)hex_value;
 }
 
+#define BUFSZ (CONFIG_FEATURE_COPYBUF_KB < 4 ? 4096 : CONFIG_FEATURE_COPYBUF_KB * 1024)
+
 #if !ENABLE_SHA3SUM
-# define hash_file(f,w) hash_file(f)
+# define hash_file(b,f,w) hash_file(b,f)
 #endif
-static uint8_t *hash_file(const char *filename, unsigned sha3_width)
+static uint8_t *hash_file(unsigned char *in_buf, const char *filename, unsigned sha3_width)
 {
         int src_fd, hash_len, count;
         union _ctx_ {
@@ -227,8 +229,7 @@ static uint8_t *hash_file(const char *filename, unsigned sha3_width)
         }
 
         {
-                RESERVE_CONFIG_UBUFFER(in_buf, 4096);
-                while ((count = safe_read(src_fd, in_buf, 4096)) > 0) {
+                while ((count = safe_read(src_fd, in_buf, BUFSZ)) > 0) {
                         update(&context, in_buf, count);
                 }
                 hash_value = NULL;
@@ -238,7 +239,6 @@ static uint8_t *hash_file(const char *filename, unsigned sha3_width)
                         final(&context, in_buf);
                         hash_value = hash_bin_to_hex(in_buf, hash_len);
                 }
-                RELEASE_CONFIG_BUFFER(in_buf);
         }
 
         if (src_fd != STDIN_FILENO) {
@@ -251,6 +251,7 @@ static uint8_t *hash_file(const char *filename, unsigned sha3_width)
 int md5_sha1_sum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
 {
+        unsigned char *in_buf;
         int return_value = EXIT_SUCCESS;
         unsigned flags;
 #if ENABLE_SHA3SUM
@@ -279,6 +280,12 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
         if (!*argv)
                 *--argv = (char*)"-";
 
+        /* The buffer is not alloc/freed for each input file:
+         * for big values of COPYBUF_KB, this helps to keep its pages
+         * pre-faulted and possibly even fully cached on local CPU.
+         */
+        in_buf = xmalloc(BUFSZ);
+
         do {
                 if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK && (flags & FLAG_CHECK)) {
                         FILE *pre_computed_stream;
@@ -310,7 +317,7 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
                                 *filename_ptr = '\0';
                                 filename_ptr += 2;
 
-                                hash_value = hash_file(filename_ptr, sha3_width);
+                                hash_value = hash_file(in_buf, filename_ptr, sha3_width);
 
                                 if (hash_value && (strcmp((char*)hash_value, line) == 0)) {
                                         if (!(flags & FLAG_SILENT))
@@ -339,7 +346,7 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
                         }
                         fclose_if_not_stdin(pre_computed_stream);
                 } else {
-                        uint8_t *hash_value = hash_file(*argv, sha3_width);
+                        uint8_t *hash_value = hash_file(in_buf, *argv, sha3_width);
                         if (hash_value == NULL) {
                                 return_value = EXIT_FAILURE;
                         } else {
diff --git a/coreutils/nice.c b/coreutils/nice.c
index 28591ac61..e70da5d2b 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -33,7 +33,7 @@ int nice_main(int argc UNUSED_PARAM, char **argv)
 
         if (!*++argv) { /* No args, so (GNU) output current nice value. */
                 printf("%d\n", old_priority);
-                fflush_stdout_and_exit(EXIT_SUCCESS);
+                fflush_stdout_and_exit_SUCCESS();
         }
 
         adjustment = 10;  /* Set default adjustment. */
diff --git a/coreutils/readlink.c b/coreutils/readlink.c
index 09d69df2b..b2e867883 100644
--- a/coreutils/readlink.c
+++ b/coreutils/readlink.c
@@ -96,5 +96,5 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
         printf((opt & 2) ? "%s" : "%s\n", buf);
         free(buf);
 
-        fflush_stdout_and_exit(EXIT_SUCCESS);
+        fflush_stdout_and_exit_SUCCESS();
 }
diff --git a/coreutils/shuf.c b/coreutils/shuf.c
index 81b0df453..56ba03aad 100644
--- a/coreutils/shuf.c
+++ b/coreutils/shuf.c
@@ -171,5 +171,5 @@ int shuf_main(int argc, char **argv)
                         printf("%s%c", lines[i], eol);
         }
 
-        fflush_stdout_and_exit(EXIT_SUCCESS);
+        fflush_stdout_and_exit_SUCCESS();
 }
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 32a06e40a..9aac656fe 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -18,7 +18,7 @@
 //config:       sort is used to sort lines of text in specified files.
 //config:
 //config:config FEATURE_SORT_BIG
-//config:       bool "Full SuSv3 compliant sort (support -ktcbdfiogM)"
+//config:       bool "Full SuSv3 compliant sort (support -ktcbdfioghM)"
 //config:       default y
 //config:       depends on SORT
 //config:       help
@@ -43,7 +43,7 @@
 
 //usage:#define sort_trivial_usage
 //usage:       "[-nru"
-//usage:        IF_FEATURE_SORT_BIG("gMcszbdfiokt] [-o FILE] [-k START[.OFS][OPTS][,END[.OFS][OPTS]] [-t CHAR")
+//usage:        IF_FEATURE_SORT_BIG("ghMcszbdfiokt] [-o FILE] [-k START[.OFS][OPTS][,END[.OFS][OPTS]] [-t CHAR")
 //usage:       "] [FILE]..."
 //usage:#define sort_full_usage "\n\n"
 //usage:       "Sort lines of text\n"
@@ -59,6 +59,7 @@
 //usage:     "\n        -n      Sort numbers"
 //usage:        IF_FEATURE_SORT_BIG(
 //usage:     "\n        -g      General numerical sort"
+//usage:     "\n        -h      Sort human readable numbers (2K 1G)"
 //usage:     "\n        -M      Sort month"
 //usage:     "\n        -V      Sort version"
 //usage:     "\n        -t CHAR Field separator"
@@ -94,31 +95,32 @@
 enum {
         FLAG_n  = 1 << 0,       /* Numeric sort */
         FLAG_g  = 1 << 1,       /* Sort using strtod() */
-        FLAG_M  = 1 << 2,       /* Sort date */
-        FLAG_V  = 1 << 3,       /* Sort version */
+        FLAG_h  = 1 << 2,       /* Sort using strtod(), plus KMGT suffixes */
+        FLAG_M  = 1 << 3,       /* Sort date */
+        FLAG_V  = 1 << 4,       /* Sort version */
 /* ucsz apply to root level only, not keys.  b at root level implies bb */
-        FLAG_u  = 1 << 4,       /* Unique */
-        FLAG_c  = 1 << 5,       /* Check: no output, exit(!ordered) */
-        FLAG_s  = 1 << 6,       /* Stable sort, no ascii fallback at end */
-        FLAG_z  = 1 << 7,       /* Input and output is NUL terminated, not \n */
+        FLAG_u  = 1 << 5,       /* Unique */
+        FLAG_c  = 1 << 6,       /* Check: no output, exit(!ordered) */
+        FLAG_s  = 1 << 7,       /* Stable sort, no ascii fallback at end */
+        FLAG_z  = 1 << 8,       /* Input and output is NUL terminated, not \n */
 /* These can be applied to search keys, the previous four can't */
-        FLAG_b  = 1 << 8,       /* Ignore leading blanks */
-        FLAG_r  = 1 << 9,       /* Reverse */
-        FLAG_d  = 1 << 10,      /* Ignore !(isalnum()|isspace()) */
-        FLAG_f  = 1 << 11,      /* Force uppercase */
-        FLAG_i  = 1 << 12,      /* Ignore !isprint() */
-        FLAG_m  = 1 << 13,      /* ignored: merge already sorted files; do not sort */
-        FLAG_S  = 1 << 14,      /* ignored: -S, --buffer-size=SIZE */
-        FLAG_T  = 1 << 15,      /* ignored: -T, --temporary-directory=DIR */
-        FLAG_o  = 1 << 16,
-        FLAG_k  = 1 << 17,
-        FLAG_t  = 1 << 18,
+        FLAG_b  = 1 << 9,       /* Ignore leading blanks */
+        FLAG_r  = 1 << 10,      /* Reverse */
+        FLAG_d  = 1 << 11,      /* Ignore !(isalnum()|isspace()) */
+        FLAG_f  = 1 << 12,      /* Force uppercase */
+        FLAG_i  = 1 << 13,      /* Ignore !isprint() */
+        FLAG_m  = 1 << 14,      /* ignored: merge already sorted files; do not sort */
+        FLAG_S  = 1 << 15,      /* ignored: -S, --buffer-size=SIZE */
+        FLAG_T  = 1 << 16,      /* ignored: -T, --temporary-directory=DIR */
+        FLAG_o  = 1 << 17,
+        FLAG_k  = 1 << 18,
+        FLAG_t  = 1 << 19,
         FLAG_bb = 0x80000000,   /* Ignore trailing blanks  */
         FLAG_no_tie_break = 0x40000000,
 };
 
 static const char sort_opt_str[] ALIGN1 = "^"
-                        "ngMVucszbrdfimS:T:o:k:*t:"
+                        "nghMVucszbrdfimS:T:o:k:*t:"
                         "\0" "o--o:t--t"/*-t, -o: at most one of each*/;
 /*
  * OPT_STR must not be string literal, needs to have stable address:
@@ -253,6 +255,25 @@ static struct sort_key *add_key(void)
 #define GET_LINE(fp) xmalloc_fgetline(fp)
 #endif
 
+#if ENABLE_FEATURE_SORT_BIG
+static int scale_suffix(const char *tail)
+{
+        static const char suffix[] ALIGN1 = "kmgtpezy";
+        const char *s;
+        int n;
+
+        if (!tail[0])
+                return -1;
+        s = strchr(suffix, tail[0] | 0x20);
+        if (!s)
+                return -1;
+        n = s - suffix;
+        if (n != 0 && tail[0] >= 'a')
+                return -1; /* mg... not accepted, only MG... */
+        return n;
+}
+#endif
+
 /* Iterate through keys list and perform comparisons */
 static int compare_keys(const void *xarg, const void *yarg)
 {
@@ -275,7 +296,7 @@ static int compare_keys(const void *xarg, const void *yarg)
                 y = *(char **)yarg;
 #endif
                 /* Perform actual comparison */
-                switch (flags & (FLAG_n | FLAG_g | FLAG_M | FLAG_V)) {
+                switch (flags & (FLAG_n | FLAG_g | FLAG_h | FLAG_M | FLAG_V)) {
                 default:
                         bb_simple_error_msg_and_die("unknown sort type");
                         break;
@@ -293,7 +314,8 @@ static int compare_keys(const void *xarg, const void *yarg)
 #endif
                         break;
 #if ENABLE_FEATURE_SORT_BIG
-                case FLAG_g: {
+                case FLAG_g:
+                case FLAG_h: {
                         char *xx, *yy;
 //TODO: needs setlocale(LC_NUMERIC, "C")?
                         double dx = strtod(x, &xx);
@@ -308,16 +330,26 @@ static int compare_keys(const void *xarg, const void *yarg)
                                 retval = (dy != dy) ? 0 : -1;
                         else if (dy != dy)
                                 retval = 1;
-                        /* Check for infinity.  Could underflow, but it avoids libm. */
-                        else if (1.0 / dx == 0.0) {
-                                if (dx < 0)
-                                        retval = (1.0 / dy == 0.0 && dy < 0) ? 0 : -1;
+                        else {
+                                if (flags & FLAG_h) {
+                                        int xs = scale_suffix(xx);
+                                        int ys = scale_suffix(yy);
+                                        if (xs != ys) {
+                                                retval = xs - ys;
+                                                break;
+                                        }
+                                }
+                                /* Check for infinity.  Could underflow, but it avoids libm. */
+                                if (1.0 / dx == 0.0) {
+                                        if (dx < 0)
+                                                retval = (1.0 / dy == 0.0 && dy < 0) ? 0 : -1;
+                                        else
+                                                retval = (1.0 / dy == 0.0 && dy > 0) ? 0 : 1;
+                                } else if (1.0 / dy == 0.0)
+                                        retval = (dy < 0) ? 1 : -1;
                                 else
-                                        retval = (1.0 / dy == 0.0 && dy > 0) ? 0 : 1;
-                        } else if (1.0 / dy == 0.0)
-                                retval = (dy < 0) ? 1 : -1;
-                        else
-                                retval = (dx > dy) ? 1 : ((dx < dy) ? -1 : 0);
+                                        retval = (dx > dy) ? 1 : ((dx < dy) ? -1 : 0);
+                        }
                         break;
                 }
                 case FLAG_M: {
@@ -380,7 +412,9 @@ static int compare_keys(const void *xarg, const void *yarg)
 
                         /* If x > y, 1, else -1 */
                         retval = (x32 > y32) * 2 - 1;
-                } else
+                        /* Here, -r has no effect! */
+                        return retval;
+                }
                 if (!(option_mask32 & FLAG_no_tie_break)) {
                         /* fallback sort */
                         flags = option_mask32;
@@ -474,6 +508,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
                         FLAG_allowed_for_k =
                                 FLAG_n | /* Numeric sort */
                                 FLAG_g | /* Sort using strtod() */
+                                FLAG_h | /* Sort using strtod(), plus KMGT suffixes */
                                 FLAG_M | /* Sort date */
                                 FLAG_b | /* Ignore leading blanks */
                                 FLAG_r | /* Reverse */
@@ -644,5 +679,5 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
                         printf("%s%c", lines[i], ch);
         }
 
-        fflush_stdout_and_exit(EXIT_SUCCESS);
+        fflush_stdout_and_exit_SUCCESS();
 }
diff --git a/coreutils/uname.c b/coreutils/uname.c
index da785ab4c..6c0bdf096 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -209,5 +209,5 @@ int uname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 #endif
         }
 
-        fflush_stdout_and_exit(EXIT_SUCCESS); /* coreutils-6.9 compat */
+        fflush_stdout_and_exit_SUCCESS(); /* coreutils-6.9 compat */
 }
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index a3058ac07..06c57f750 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -139,5 +139,5 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
 
         die_if_ferror(stdin, input_filename);
 
-        fflush_stdout_and_exit(EXIT_SUCCESS);
+        fflush_stdout_and_exit_SUCCESS();
 }
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index e90902f52..63a8d4d48 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -352,7 +352,7 @@ int baseNUM_main(int argc UNUSED_PARAM, char **argv)
 #undef src_buf
         }
 
-        fflush_stdout_and_exit(EXIT_SUCCESS);
+        fflush_stdout_and_exit_SUCCESS();
 }
 #endif
 
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index db49ec80a..f096e3122 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -78,5 +78,5 @@ int uuencode_main(int argc UNUSED_PARAM, char **argv)
         }
         printf(tbl == bb_uuenc_tbl_std ? "\n`\nend\n" : "\n====\n");
 
-        fflush_stdout_and_exit(EXIT_SUCCESS);
+        fflush_stdout_and_exit_SUCCESS();
 }