Merge branch 'busybox' into merge

1 files changed, 49 insertions, 27 deletions

diff --git a/coreutils/shuf.c b/coreutils/shuf.c
index fdbd3e9b2..77f8a8ff9 100644
--- a/coreutils/shuf.c
+++ b/coreutils/shuf.c
@@ -17,14 +17,14 @@
 //kbuild:lib-$(CONFIG_SHUF) += shuf.o
 
 //usage:#define shuf_trivial_usage
-//usage:       "[-e|-i L-H] [-n NUM] [-o FILE] [-z] [FILE|ARG...]"
+//usage:       "[-n NUM] [-o FILE] [-z] [FILE | -e [ARG...] | -i L-H]"
 //usage:#define shuf_full_usage "\n\n"
 //usage:       "Randomly permute lines\n"
-//usage:     "\n        -e      Treat ARGs as lines"
-//usage:     "\n        -i L-H  Treat numbers L-H as lines"
 //usage:     "\n        -n NUM  Output at most NUM lines"
 //usage:     "\n        -o FILE Write to FILE, not standard output"
-//usage:     "\n        -z      End lines with zero byte, not newline"
+//usage:     "\n        -z      NUL terminated output"
+//usage:     "\n        -e      Treat ARGs as lines"
+//usage:     "\n        -i L-H  Treat numbers L-H as lines"
 
 #include "libbb.h"
 
@@ -39,8 +39,10 @@
 
 /*
  * Use the Fisher-Yates shuffle algorithm on an array of lines.
+ * If the required number of output lines is less than the total
+ * we can stop shuffling early.
  */
-static void shuffle_lines(char **lines, unsigned numlines)
+static void shuffle_lines(char **lines, unsigned numlines, unsigned outlines)
 {
         unsigned i;
         unsigned r;
@@ -48,7 +50,7 @@ static void shuffle_lines(char **lines, unsigned numlines)
 
         srand(monotonic_us());
 
-        for (i = numlines-1; i > 0; i--) {
+        for (i = numlines - 1; outlines > 0; i--, outlines--) {
                 r = rand();
                 /* RAND_MAX can be as small as 32767 */
                 if (i > RAND_MAX)
@@ -67,7 +69,7 @@ int shuf_main(int argc, char **argv)
         char *opt_i_str, *opt_n_str, *opt_o_str;
         unsigned i;
         char **lines;
-        unsigned numlines;
+        unsigned numlines, outlines;
         char eol;
 
         opts = getopt32(argv, "^"
@@ -88,15 +90,27 @@ int shuf_main(int argc, char **argv)
         if (opts & OPT_i) {
                 /* create a range of numbers */
                 char *dash;
-                unsigned lo, hi;
+                uintptr_t lo, hi;
+
+                if (argv[0])
+                        bb_show_usage();
 
                 dash = strchr(opt_i_str, '-');
                 if (!dash) {
                         bb_error_msg_and_die("bad range '%s'", opt_i_str);
                 }
                 *dash = '\0';
-                lo = xatou(opt_i_str);
-                hi = xatou(dash + 1);
+                if (sizeof(lo) == sizeof(int)) {
+                        lo = xatou(opt_i_str);
+                        hi = xatou(dash + 1);
+                } else
+                if (sizeof(lo) == sizeof(long)) {
+                        lo = xatoul(opt_i_str);
+                        hi = xatoul(dash + 1);
+                } else {
+                        lo = xatoull(opt_i_str);
+                        hi = xatoull(dash + 1);
+                }
                 *dash = '-';
                 if (hi < lo) {
                         bb_error_msg_and_die("bad range '%s'", opt_i_str);
@@ -105,17 +119,21 @@ int shuf_main(int argc, char **argv)
                 numlines = (hi+1) - lo;
                 lines = xmalloc(numlines * sizeof(lines[0]));
                 for (i = 0; i < numlines; i++) {
-                        lines[i] = (char*)(uintptr_t)lo;
+                        lines[i] = (char*)lo;
                         lo++;
                 }
         } else {
                 /* default - read lines from stdin or the input file */
                 FILE *fp;
+                const char *fname = "-";
 
-                if (argc > 1)
-                        bb_show_usage();
+                if (argv[0]) {
+                        if (argv[1])
+                                bb_show_usage();
+                        fname = argv[0];
+                }
 
-                fp = xfopen_stdin(argv[0] ? argv[0] : "-");
+                fp = xfopen_stdin(fname);
                 lines = NULL;
                 numlines = 0;
                 for (;;) {
@@ -128,27 +146,31 @@ int shuf_main(int argc, char **argv)
                 fclose_if_not_stdin(fp);
         }
 
-        if (numlines != 0)
-                shuffle_lines(lines, numlines);
+        outlines = numlines;
+        if (opts & OPT_n) {
+                outlines = xatou(opt_n_str);
+                if (outlines > numlines)
+                        outlines = numlines;
+        }
+
+        shuffle_lines(lines, numlines, outlines);
 
         if (opts & OPT_o)
                 xmove_fd(xopen(opt_o_str, O_WRONLY|O_CREAT|O_TRUNC), STDOUT_FILENO);
 
-        if (opts & OPT_n) {
-                unsigned maxlines;
-                maxlines = xatou(opt_n_str);
-                if (numlines > maxlines)
-                        numlines = maxlines;
-        }
-
         eol = '\n';
         if (opts & OPT_z)
                 eol = '\0';
 
-        for (i = 0; i < numlines; i++) {
-                if (opts & OPT_i)
-                        printf("%u%c", (unsigned)(uintptr_t)lines[i], eol);
-                else
+        for (i = numlines - outlines; i < numlines; i++) {
+                if (opts & OPT_i) {
+                        if (sizeof(lines[0]) == sizeof(int))
+                                printf("%u%c", (unsigned)(uintptr_t)lines[i], eol);
+                        else if (sizeof(lines[0]) == sizeof(long))
+                                printf("%lu%c", (unsigned long)(uintptr_t)lines[i], eol);
+                        else
+                                printf("%llu%c", (unsigned long long)(uintptr_t)lines[i], eol);
+                } else
                         printf("%s%c", lines[i], eol);
         }