Index: stable/2.2/usr.bin/jot/jot.1 =================================================================== --- stable/2.2/usr.bin/jot/jot.1 (revision 34253) +++ stable/2.2/usr.bin/jot/jot.1 (revision 34254) @@ -1,191 +1,192 @@ .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. All advertising materials mentioning features or use of this software .\" must display the following acknowledgement: .\" This product includes software developed by the University of .\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" @(#)jot.1 8.1 (Berkeley) 6/6/93 .\" .Dd June 6, 1993 .Dt JOT 1 .Os .Sh NAME .Nm jot .Nd print sequential or random data .Sh SYNOPSIS .Nm jot .Op Fl cnr .Op Fl b Ar word .Op Fl w Ar word .Op Fl s Ar string .Op Fl p Ar precision .Op reps Op begin Op end Op s .Sh DESCRIPTION .Nm Jot is used to print out increasing, decreasing, random, or redundant data, usually numbers, one per line. .Pp The following options are available: .Bl -tag -width indent .It Fl r -Generate random data instead of sequential data, the default. +Generate random data instead of the default sequential data. .It Fl b Ar word Just print .Ar word repetitively. .It Fl w Ar word Print .Ar word with the generated data appended to it. Octal, hexadecimal, exponential, .Tn ASCII , zero padded, and right-adjusted representations are possible by using the appropriate .Xr printf 3 conversion specification inside .Ar word , in which case the data are inserted rather than appended. .It Fl c This is an abbreviation for .Fl w Ar %c . .It Fl s Ar string Print data separated by .Ar string . Normally, newlines separate data. .It Fl n Do not print the final newline normally appended to the output. .It Fl p Ar precision Print only as many digits or characters of the data as indicated by the integer .Ar precision . In the absence of .Fl p , the precision is the greater of the precisions of .Ar begin and .Ar end . The .Fl p option is overridden by whatever appears in a .Xr printf 3 conversion following .Fl w . .El .Pp The last four arguments indicate, respectively, the number of data, the lower bound, the upper bound, and the step size or, for random data, the seed. While at least one of them must appear, any of the other three may be omitted, and will be considered as such if given as .Fl "" . Any three of these arguments determines the fourth. If four are specified and the given and computed values of .Ar reps conflict, the lower value is used. If fewer than three are specified, defaults are assigned left to right, except for .Ar s , which assumes its default unless both .Ar begin and .Ar end are given. .Pp Defaults for the four arguments are, respectively, 100, 1, 100, and 1, except that when random data are requested, -.Ar s -defaults to a seed depending upon the time of day. +the seed, +.Ar s , +is picked randomly. .Ar Reps is expected to be an unsigned integer, and if given as zero is taken to be infinite. .Ar Begin and .Ar end may be given as real numbers or as characters representing the corresponding value in .Tn ASCII . The last argument must be a real number. .Pp Random numbers are obtained through .Xr random 3 . The name .Nm derives in part from .Nm iota , a function in APL. .Sh EXAMPLES The command .Dl jot 21 -1 1.00 .Pp prints 21 evenly spaced numbers increasing from -1 to 1. The .Tn ASCII character set is generated with .Dl jot -c 128 0 .Pp and the strings xaa through xaz with .Dl jot -w xa%c 26 a .Pp while 20 random 8-letter strings are produced with .Dl "jot -r -c 160 a z | rs -g 0 8" .Pp Infinitely many .Em yes Ns 's may be obtained through .Dl jot -b yes 0 .Pp and thirty .Xr ed 1 substitution commands applying to lines 2, 7, 12, etc. is the result of .Dl jot -w %ds/old/new/ 30 2 - 5 .Pp The stuttering sequence 9, 9, 8, 8, 7, etc. can be produced by suitable choice of precision and step size, as in .Dl jot 0 9 - -.5 .Pp and a file containing exactly 1024 bytes is created with .Dl jot -b x 512 > block .Pp Finally, to set tabs four spaces apart starting from column 10 and ending in column 132, use .Dl expand -`jot -s, - 10 132 4` .Pp and to print all lines 80 characters or longer, .Dl grep `jot -s \&"\&" -b \&. 80` .Pp .Sh SEE ALSO .Xr ed 1 , .Xr expand 1 , .Xr rs 1 , .Xr yes 1 , .Xr printf 3 , .Xr random 3 Index: stable/2.2/usr.bin/jot/jot.c =================================================================== --- stable/2.2/usr.bin/jot/jot.c (revision 34253) +++ stable/2.2/usr.bin/jot/jot.c (revision 34254) @@ -1,387 +1,391 @@ /*- * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint #if 0 static char sccsid[] = "@(#)jot.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id: jot.c,v 1.2.2.2 1997/07/16 06:46:38 charnier Exp $"; + "$Id: jot.c,v 1.2.2.3 1997/12/23 07:20:16 charnier Exp $"; #endif /* not lint */ /* * jot - print sequential or random data * * Author: John Kunze, Office of Comp. Affairs, UCB */ #include #include #include #include #include #include #include #include #define REPS_DEF 100 #define BEGIN_DEF 1 #define ENDER_DEF 100 #define STEP_DEF 1 #define isdefault(s) (strcmp((s), "-") == 0) double begin; double ender; double s; long reps; int randomize; int infinity; int boring; int prec; int dox; int chardata; int nofinalnl; char *sepstring = "\n"; char format[BUFSIZ]; void getargs __P((int, char *[])); void getformat __P((void)); int getprec __P((char *)); void putdata __P((double, long)); static void usage __P((void)); int main(argc, argv) int argc; char *argv[]; { double xd, yd; long id; register double *x = &xd; register double *y = &yd; register long *i = &id; getargs(argc, argv); if (randomize) { *x = (ender - begin) * (ender > begin ? 1 : -1); - srandom((unsigned) s); + if (s == -1.0) + srandomdev(); + else + srandom((unsigned long) s); for (*i = 1; *i <= reps || infinity; (*i)++) { *y = (double) random() / LONG_MAX; putdata(*y * *x + begin, reps - *i); } } else for (*i = 1, *x = begin; *i <= reps || infinity; (*i)++, *x += s) putdata(*x, reps - *i); if (!nofinalnl) putchar('\n'); exit(0); } void getargs(ac, av) int ac; char *av[]; { register unsigned int mask = 0; register int n = 0; while (--ac && **++av == '-' && !isdefault(*av)) switch ((*av)[1]) { case 'r': randomize = 1; break; case 'c': chardata = 1; break; case 'n': nofinalnl = 1; break; case 'b': boring = 1; case 'w': if ((*av)[2]) strcpy(format, *av + 2); else if (!--ac) errx(1, "need context word after -w or -b"); else strcpy(format, *++av); break; case 's': if ((*av)[2]) sepstring = *av + 2; else if (!--ac) errx(1, "need string after -s"); else sepstring = *++av; break; case 'p': if ((*av)[2]) prec = atoi(*av + 2); else if (!--ac) errx(1, "need number after -p"); else prec = atoi(*++av); if (prec <= 0) errx(1, "bad precision value"); break; default: usage(); } switch (ac) { /* examine args right to left, falling thru cases */ case 4: if (!isdefault(av[3])) { if (!sscanf(av[3], "%lf", &s)) errx(1, "bad s value: %s", av[3]); mask |= 01; } case 3: if (!isdefault(av[2])) { if (!sscanf(av[2], "%lf", &ender)) ender = av[2][strlen(av[2])-1]; mask |= 02; if (!prec) n = getprec(av[2]); } case 2: if (!isdefault(av[1])) { if (!sscanf(av[1], "%lf", &begin)) begin = av[1][strlen(av[1])-1]; mask |= 04; if (!prec) prec = getprec(av[1]); if (n > prec) /* maximum precision */ prec = n; } case 1: if (!isdefault(av[0])) { if (!sscanf(av[0], "%ld", &reps)) errx(1, "bad reps value: %s", av[0]); mask |= 010; } break; case 0: usage(); default: errx(1, "too many arguments. What do you mean by %s?", av[4]); } getformat(); while (mask) /* 4 bit mask has 1's where last 4 args were given */ switch (mask) { /* fill in the 0's by default or computation */ case 001: reps = REPS_DEF; mask = 011; break; case 002: reps = REPS_DEF; mask = 012; break; case 003: reps = REPS_DEF; mask = 013; break; case 004: reps = REPS_DEF; mask = 014; break; case 005: reps = REPS_DEF; mask = 015; break; case 006: reps = REPS_DEF; mask = 016; break; case 007: if (randomize) { reps = REPS_DEF; mask = 0; break; } if (s == 0.0) { reps = 0; mask = 0; break; } reps = (ender - begin + s) / s; if (reps <= 0) errx(1, "impossible stepsize"); mask = 0; break; case 010: begin = BEGIN_DEF; mask = 014; break; case 011: begin = BEGIN_DEF; mask = 015; break; case 012: - s = (randomize ? time(NULL) ^ getpid() : STEP_DEF); + s = (randomize ? -1.0 : STEP_DEF); mask = 013; break; case 013: if (randomize) begin = BEGIN_DEF; else if (reps == 0) errx(1, "must specify begin if reps == 0"); - begin = ender - reps * s + s; + else + begin = ender - reps * s + s; mask = 0; break; case 014: - s = (randomize ? time(NULL) ^ getpid() : STEP_DEF); + s = (randomize ? -1.0 : STEP_DEF); mask = 015; break; case 015: if (randomize) ender = ENDER_DEF; else ender = begin + reps * s - s; mask = 0; break; case 016: if (randomize) - s = time(NULL) ^ getpid(); + s = -1.0; else if (reps == 0) errx(1, "infinite sequences cannot be bounded"); else if (reps == 1) s = 0.0; else s = (ender - begin) / (reps - 1); mask = 0; break; case 017: /* if reps given and implied, */ if (!randomize && s != 0.0) { long t = (ender - begin + s) / s; if (t <= 0) errx(1, "impossible stepsize"); if (t < reps) /* take lesser */ reps = t; } mask = 0; break; default: errx(1, "bad mask"); } if (reps == 0) infinity = 1; } void putdata(x, notlast) double x; long notlast; { long d = x; register long *dp = &d; if (boring) /* repeated word */ printf(format); else if (dox) /* scalar */ printf(format, *dp); else /* real */ printf(format, x); if (notlast != 0) fputs(sepstring, stdout); } static void usage() { fprintf(stderr, "%s\n%s\n", "usage: jot [-cnr] [-b word] [-w word] [-s string] [-p precision]", " [reps [begin [end [s]]]]"); exit(1); } int getprec(s) char *s; { register char *p; register char *q; for (p = s; *p; p++) if (*p == '.') break; if (!*p) return (0); for (q = ++p; *p; p++) if (!isdigit(*p)) break; return (p - q); } void getformat() { register char *p; if (boring) /* no need to bother */ return; for (p = format; *p; p++) /* look for '%' */ if (*p == '%' && *(p+1) != '%') /* leave %% alone */ break; if (!*p && !chardata) sprintf(p, "%%.%df", prec); else if (!*p && chardata) { strcpy(p, "%c"); dox = 1; } else if (!*(p+1)) strcat(format, "%"); /* cannot end in single '%' */ else { while (!isalpha(*p)) p++; switch (*p) { case 'f': case 'e': case 'g': case '%': break; case 's': errx(1, "cannot convert numeric data to strings"); break; /* case 'd': case 'o': case 'x': case 'D': case 'O': case 'X': case 'c': case 'u': */ default: dox = 1; break; } } }