Merge branch 'busybox' into merge

5 files changed, 92 insertions, 27 deletions

diff --git a/coreutils/readlink.c b/coreutils/readlink.c
index b2e867883..0a9aa957e 100644
--- a/coreutils/readlink.c
+++ b/coreutils/readlink.c
@@ -25,12 +25,14 @@
 //kbuild:lib-$(CONFIG_READLINK) += readlink.o
 
 //usage:#define readlink_trivial_usage
-//usage:        IF_FEATURE_READLINK_FOLLOW("[-fnv] ") "FILE"
+//usage:        IF_FEATURE_READLINK_FOLLOW("[-fnv] ")
+//usage:        IF_NOT_FEATURE_READLINK_FOLLOW("[-n] ")
+//usage:        "FILE"
 //usage:#define readlink_full_usage "\n\n"
-//usage:       "Display the value of a symlink"
-//usage:        IF_FEATURE_READLINK_FOLLOW( "\n"
-//usage:     "\n        -f      Canonicalize by following all symlinks"
+//usage:       "Display the value of a symlink" "\n"
 //usage:     "\n        -n      Don't add newline"
+//usage:        IF_FEATURE_READLINK_FOLLOW(
+//usage:     "\n        -f      Canonicalize by following all symlinks"
 //usage:     "\n        -v      Verbose"
 //usage:        )
 
@@ -67,25 +69,18 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
 {
         char *buf;
         char *fname;
+        unsigned opt;
 
-        IF_FEATURE_READLINK_FOLLOW(
-                unsigned opt;
-                /* We need exactly one non-option argument.  */
-                opt = getopt32(argv, "^" "fnvsq" "\0" "=1");
-                fname = argv[optind];
-        )
-        IF_NOT_FEATURE_READLINK_FOLLOW(
-                const unsigned opt = 0;
-                if (argc != 2) bb_show_usage();
-                fname = argv[1];
-        )
+        opt = getopt32(argv, "^" "n" IF_FEATURE_READLINK_FOLLOW("fvsq")
+                       "\0" "=1");
+        fname = argv[optind];
 
         /* compat: coreutils readlink reports errors silently via exit code */
         if (!(opt & 4)) /* not -v */
                 logmode = LOGMODE_NONE;
 
         /* NOFORK: only one alloc is allowed; must free */
-        if (opt & 1) { /* -f */
+        if (opt & 2) { /* -f */
                 buf = xmalloc_realpath_coreutils(fname);
         } else {
                 buf = xmalloc_readlink_or_warn(fname);
@@ -93,7 +88,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
 
         if (!buf)
                 return EXIT_FAILURE;
-        printf((opt & 2) ? "%s" : "%s\n", buf);
+        printf((opt & 1) ? "%s" : "%s\n", buf);
         free(buf);
 
         fflush_stdout_and_exit_SUCCESS();
diff --git a/coreutils/seq.c b/coreutils/seq.c
index beb339d1e..77a8aba8a 100644
--- a/coreutils/seq.c
+++ b/coreutils/seq.c
@@ -22,7 +22,7 @@
 //usage:#define seq_full_usage "\n\n"
 //usage:       "Print numbers from FIRST to LAST, in steps of INC.\n"
 //usage:       "FIRST, INC default to 1.\n"
-//usage:     "\n        -w      Pad to last with leading zeros"
+//usage:     "\n        -w      Pad with leading zeros"
 //usage:     "\n        -s SEP  String separator"
 
 #include "libbb.h"
@@ -41,6 +41,7 @@ int seq_main(int argc, char **argv)
         unsigned width;
         unsigned frac_part;
         const char *sep, *opt_s = "\n";
+        char *saved;
         unsigned opt;
 
 #if ENABLE_LOCALE_SUPPORT
@@ -49,7 +50,29 @@ int seq_main(int argc, char **argv)
         setlocale(LC_NUMERIC, "C");
 #endif
 
-        opt = getopt32(argv, "+ws:", &opt_s);
+        /* Cater for negative arguments: if we see one, truncate argv[] on it */
+        n = 0;
+        for (;;) {
+                char c;
+                saved = argv[++n];
+                if (!saved)
+                        break;
+                if (saved[0] != '-') {
+                        // break; // "seq -s : -1 1" won't be treated correctly
+                        continue;
+                }
+// "seq -s -1 1 9" is not treated correctly, but such usage
+// (delimiter string which looks like negative number) is very unlikely
+                c = saved[1];
+                if (c == '.' || (c >= '0' && c <= '9')) {
+                        argv[n] = NULL;
+                        break;
+                }
+        }
+        opt = getopt32(argv, "+ws:", &opt_s); /* "+": stop at first non-option */
+        /* Restore possibly truncated argv[] */
+        argv[n] = saved;
+
         argc -= optind;
         argv += optind;
         first = increment = 1;
diff --git a/coreutils/shuf.c b/coreutils/shuf.c
index 56ba03aad..466969745 100644
--- a/coreutils/shuf.c
+++ b/coreutils/shuf.c
@@ -66,6 +66,12 @@ static void shuffle_lines(char **lines, unsigned numlines, unsigned outlines)
         }
 }
 
+/* We can handle insanity like this:
+ * shuf -i 333333333333333333333333333333001-333333333333333333333333333333019
+ * but do we want to have +200 bytes of code (~40% code growth)?
+ */
+#define COMMON_PREFIX_HACK 0
+
 int shuf_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int shuf_main(int argc, char **argv)
 {
@@ -76,6 +82,11 @@ int shuf_main(int argc, char **argv)
         unsigned numlines, outlines;
         unsigned i;
         char eol;
+#if COMMON_PREFIX_HACK
+        unsigned pfx_len = 0;
+        unsigned padding_width = padding_width;
+        const char *pfx = pfx;
+#endif
 
         opts = getopt32(argv, "^"
                         OPT_STR
@@ -104,10 +115,40 @@ int shuf_main(int argc, char **argv)
                 if (!dash) {
                         bb_error_msg_and_die("bad range '%s'", opt_i_str);
                 }
-                *dash = '\0';
+                *dash++ = '\0';
+#if COMMON_PREFIX_HACK
+                {
+                        const char *a = opt_i_str;
+                        const char *b = dash;
+                        /* Skip leading zeros (they may mask that common prefix does exist) */
+                        while (*a == '0') a++;
+                        while (*b == '0') b++;
+                        /* Do we have a common prefix (long enough to bother)? */
+                        padding_width = strlen(a);
+                        if (padding_width > 5 && padding_width == strlen(b)) {
+                                /* How long is it? */
+                                pfx = a;
+                                while (isdigit(*a) && *a == *b
+                                 && a[1] /* "111111-111111" case: avoid xatoull("") */
+                                ) {
+                                        a++;
+                                        b++;
+                                }
+                                pfx_len = a - pfx; /* can end up being 0 */
+                                padding_width -= pfx_len;
+                        } else {
+                                /* Undo leading zero 'eating' (think "0-9") */
+                                a = opt_i_str;
+                                b = dash;
+                        }
+                        lo = xatoull(a);
+                        hi = xatoull(b);
+                }
+#else
                 lo = xatoull(opt_i_str);
-                hi = xatoull(dash + 1);
-                *dash = '-';
+                hi = xatoull(dash);
+#endif
+                dash[-1] = '-';
                 if (hi < lo)
                         bb_error_msg_and_die("bad range '%s'", opt_i_str);
                 hi -= lo;
@@ -165,9 +206,14 @@ int shuf_main(int argc, char **argv)
                 eol = '\0';
 
         for (i = numlines - outlines; i < numlines; i++) {
-                if (opts & OPT_i)
-                        printf("%"LL_FMT"u%c", lo + (uintptr_t)lines[i], eol);
-                else
+                if (opts & OPT_i) {
+#if COMMON_PREFIX_HACK
+                        if (pfx_len != 0)
+                                printf("%.*s%0*llu%c", pfx_len, pfx, padding_width, lo + (uintptr_t)lines[i], eol);
+                        else
+#endif
+                                printf("%llu%c", lo + (uintptr_t)lines[i], eol);
+                } else
                         printf("%s%c", lines[i], eol);
         }
 
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index 667db558d..a0cee5a4a 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -74,7 +74,8 @@ int sleep_main(int argc UNUSED_PARAM, char **argv)
         ++argv;
         if (!*argv) {
                 /* Without this, bare "sleep" in ash shows _ash_ --help */
-                if (ENABLE_ASH_SLEEP && applet_name[0] != 's') {
+                /* (ash can be the "sh" applet as well, so check 2nd char) */
+                if (ENABLE_ASH_SLEEP && applet_name[1] != 'l') {
                         bb_simple_error_msg("sleep: missing operand");
                         return EXIT_FAILURE;
                 }
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 1e402dfdb..7fe7f89d5 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -299,7 +299,7 @@ int tr_main(int argc UNUSED_PARAM, char **argv)
          */
 
         /* '+': stop at first non-option */
-        opts = getopt32(argv, "^+" "Ccds" "\0" "-1");
+        opts = getopt32(argv, "^+" "Ccds" "\0" "-1:?2");
         argv += optind;
 
         str1_length = expand(*argv++, &str1);