Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/seq.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/seq.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/coreutils/seq.c

@@ -5 +5 @@
  * Copyright (C) 2004, Glenn McGrath
  *
- * Licensed under the GPL v2, see the file LICENSE in this tarball.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 #include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
-
-int seq_main(int argc, char **argv);
+int seq_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int seq_main(int argc, char **argv)
 {
-    double last, increment, i;
+    enum {
+        OPT_w = (1 << 0),
+        OPT_s = (1 << 1),
+    };
+    double first, last, increment, v;
+    unsigned n;
+    unsigned width;
+    unsigned frac_part;
+    const char *sep, *opt_s = "\n";
+    unsigned opt;
 
-    i = increment = 1;
+#if ENABLE_LOCALE_SUPPORT
+    /* Undo busybox.c: on input, we want to use dot
+     * as fractional separator, regardless of current locale */
+    setlocale(LC_NUMERIC, "C");
+#endif
+
+    opt = getopt32(argv, "+ws:", &opt_s);
+    argc -= optind;
+    argv += optind;
+    first = increment = 1;
+    errno = 0;
     switch (argc) {
-        case 4:
-            increment = atof(argv[2]);
+            char *pp;
         case 3:
-            i = atof(argv[1]);
+            increment = strtod(argv[1], &pp);
+            errno |= *pp;
         case 2:
-            last = atof(argv[argc-1]);
-            break;
+            first = strtod(argv[0], &pp);
+            errno |= *pp;
+        case 1:
+            last = strtod(argv[argc-1], &pp);
+            if (!errno && *pp == '\0')
+                break;
         default:
             bb_show_usage();
     }
 
-    /* You should note that this is pos-5.0.91 semantics, -- FK. */
-    while ((increment > 0 && i <= last) || (increment < 0 && i >= last)) {
-        printf("%g\n", i);
-        i += increment;
+#if ENABLE_LOCALE_SUPPORT
+    setlocale(LC_NUMERIC, "");
+#endif
+
+    /* Last checked to be compatible with: coreutils-6.10 */
+    width = 0;
+    frac_part = 0;
+    while (1) {
+        char *dot = strchrnul(*argv, '.');
+        int w = (dot - *argv);
+        int f = strlen(dot);
+        if (width < w)
+            width = w;
+        argv++;
+        if (!*argv)
+            break;
+        /* Why do the above _before_ frac check below?
+         * Try "seq 1 2.0" and "seq 1.0 2.0":
+         * coreutils never pay attention to the number
+         * of fractional digits in last arg. */
+        if (frac_part < f)
+            frac_part = f;
     }
+    if (frac_part) {
+        frac_part--;
+        if (frac_part)
+            width += frac_part + 1;
+    }
+    if (!(opt & OPT_w))
+        width = 0;
 
-    return fflush(stdout);
+    sep = "";
+    v = first;
+    n = 0;
+    while (increment >= 0 ? v <= last : v >= last) {
+        if (printf("%s%0*.*f", sep, width, frac_part, v) < 0)
+            break; /* I/O error, bail out (yes, this really happens) */
+        sep = opt_s;
+        /* v += increment; - would accumulate floating point errors */
+        n++;
+        v = first + n * increment;
+    }
+    if (n) /* if while loop executed at least once */
+        bb_putchar('\n');
+
+    return fflush_all();
 }