diff options
| -rwxr-xr-x | scripts/test/seq.test | 3 | ||||
| -rw-r--r-- | toys/lsb/seq.c | 25 |
2 files changed, 24 insertions, 4 deletions
diff --git a/scripts/test/seq.test b/scripts/test/seq.test index d255f82d..3f3b4099 100755 --- a/scripts/test/seq.test +++ b/scripts/test/seq.test @@ -22,4 +22,7 @@ testing "seq count wrong way #2" "seq 8 2 4" "" "" "" testing "seq count by .3" "seq 3 .3 4" "3\n3.3\n3.6\n3.9\n" "" "" testing "seq count by -.9" "seq .7 -.9 -2.2" "0.7\n-0.2\n-1.1\n-2\n" "" "" testing "seq count by zero" "seq 4 0 8 | head -n 10" "" "" "" +testing "seq separator -" "seq -s - 1 3" "1-2-3\n" "" "" +testing "seq format string" 'seq -f %+01g -10 5 10' "-10\n-5\n+0\n+5\n+10\n" "" "" +testing "seq separator and format string" "seq -f \%03g -s \; 5 -1 0" "005;004;003;002;001;000\n" "" "" diff --git a/toys/lsb/seq.c b/toys/lsb/seq.c index 7faea185..2aac4bbf 100644 --- a/toys/lsb/seq.c +++ b/toys/lsb/seq.c @@ -4,26 +4,36 @@ * * http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/seq.html -USE_SEQ(NEWTOY(seq, "<1>3?", TOYFLAG_USR|TOYFLAG_BIN)) +USE_SEQ(NEWTOY(seq, "<1>3?f:s:", TOYFLAG_USR|TOYFLAG_BIN)) config SEQ bool "seq" depends on TOYBOX_FLOAT default y help - usage: seq [first] [increment] last + usage: seq [-f fmt_str] [-s sep_str] [first] [increment] last Count from first to last, by increment. Omitted arguments default to 1. Two arguments are used as first and last. Arguments can be negative or floating point. + -f Use fmt_str as a floating point format string + -s Use sep_str as separator, default is a newline character */ +#define FOR_seq #include "toys.h" +GLOBALS( + char * sep; + char * fmt; +) + void seq_main(void) { double first, increment, last, dd; - + char * sep_str = "\n"; + char * fmt_str = "%g"; + int output = 0; // Parse command line arguments, with appropriate defaults. // Note that any non-numeric arguments are treated as zero. first = increment = 1; @@ -33,11 +43,18 @@ void seq_main(void) default: last = atof(toys.optargs[toys.optc-1]); } + if (toys.optflags & FLAG_f) fmt_str = TT.fmt; + if (toys.optflags & FLAG_s) sep_str = TT.sep; + // Yes, we're looping on a double. Yes rounding errors can accumulate if // you use a non-integer increment. Deal with it. for (dd=first; (increment>0 && dd<=last) || (increment<0 && dd>=last); dd+=increment) { - printf("%g\n", dd); + if (dd != first) printf("%s", sep_str); + printf(fmt_str, dd); + output = 1; } + + if (output) printf("\n"); } |